合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3032

@@ -68,16 +68,4 @@ class GeoController extends BaseController
         $data = $this->logic->saveConfig($this->param);
         $data = $this->logic->saveConfig($this->param);
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
-
-
-
-    /**
-     * OA后台管理员，保存确认数据
-     * 客户可以进行确认， OA后台也可以进行确认，以及修改
-     * @param Request $request
-     */
-    public function saveConfirmData(Request $request)
-    {
-
-    }
 }
 }

@@ -9,10 +9,8 @@
 
 
 namespace App\Http\Logic\Aside\Geo;
 namespace App\Http\Logic\Aside\Geo;
 
 
-use App\Enums\Common\Code;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Geo\GeoConf;
 use App\Models\Geo\GeoConf;
-use App\Models\Geo\GeoQuestion;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\Project;
 use App\Models\Project\Project;

@@ -225,9 +225,7 @@ class NewsLogic extends BaseLogic
         if(isset($param['related_product_id'])){
         if(isset($param['related_product_id'])){
             $param['related_product_id'] = implode(',',$param['related_product_id']);
             $param['related_product_id'] = implode(',',$param['related_product_id']);
         }
         }
-        if(!isset($param['seo_title']) || empty($param['seo_title'])){
-            $param['seo_title'] = truncate_text($param['name'],70);
-        }
+        $param['seo_title'] = truncate_text($param['seo_title'] ?? $param['name'],70);
         return $this->success($param);
         return $this->success($param);
     }
     }
 
 

@@ -84,7 +84,7 @@ class RouteMap extends Base
         }
         }
         $length = strlen($sign);
         $length = strlen($sign);
         if($length > $route_len){
         if($length > $route_len){
-            $sign = trim(mb_substr($sign, 0, $route_len, 'UTF-8'),'-');
+            $sign = truncate_text($sign,$route_len);
         }
         }
         $i=1;//路由重复时拼接
         $i=1;//路由重复时拼接
         $route = $sign.$suffix;
         $route = $sign.$suffix;