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

Lyh server



查看合并请求 !2890

@@ -1590,7 +1590,7 @@ if (!function_exists('httpGetSsl')) {
     }
 
     /**
-     * @remark :截取自付出啊
+     * @remark :截取字符串
      * @name   :truncate_words
      * @author :lyh
      * @method :post

@@ -58,6 +58,9 @@ class AiBlogLogic extends BaseLogic
             if(!empty($this->param['image'])){
                 $this->param['image'] = str_replace_url($this->param['image']);
             }
+            if(!isset($this->param['seo_title']) || empty($this->param['seo_title'])){
+                $this->param['seo_title'] = truncate_text($this->param['new_title'],70);
+            }
             $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_AI_BLOG, $this->param['id'], $this->user['project_id']);
             $anchor = $this->param['anchor'] ?? [];
             $this->param['anchor'] = json_encode($anchor,true);

@@ -30,6 +30,9 @@ class BlogCategoryLogic extends BaseLogic
     public function categorySave(){
         //验证名称是否存在
         $this->verifyParamName($this->param['name']);
+        if(!isset($this->param['seo_title']) || empty($this->param['seo_title'])){
+            $this->param['seo_title'] = truncate_text($this->param['name'],70);
+        }
         DB::beginTransaction();
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){

@@ -201,6 +201,9 @@ class BlogLogic extends BaseLogic
                 $this->fail('发布时间需大于当天');
             }
         }
+        if(!isset($param['seo_title']) || empty($param['seo_title'])){
+            $param['seo_title'] = truncate_text($param['name'],70);
+        }
         return $this->success($param);
     }
 

@@ -234,6 +234,9 @@ class CustomModuleContentLogic extends BaseLogic
             $param['video']['video_image'] = str_replace_url($param['video']['video_image']);
             $param['video'] = Arr::a2s($param['video'] ?? []);
         }
+        if(!isset($param['seo_title']) || empty($param['seo_title'])){
+            $param['seo_title'] = truncate_text($param['name'],70);
+        }
         return $this->success($param);
     }
 

@@ -49,6 +49,9 @@ class NewsCategoryLogic extends BaseLogic
         if(isset($param['image']) && !empty($param['image'])){
             $param['image'] = str_replace_url($param['image']);
         }
+        if(!isset($param['seo_title']) || empty($param['seo_title'])){
+            $param['seo_title'] = truncate_text($param['name'],70);
+        }
         return $this->success($param);
     }
     /**

@@ -225,6 +225,9 @@ class NewsLogic extends BaseLogic
         if(isset($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);
+        }
         return $this->success($param);
     }
 

@@ -157,6 +157,9 @@ class CategoryLogic extends  BaseLogic
         }else{
             $param['cate_tak'] = json_encode([]);;
         }
+        if(!isset($param['seo_title']) || empty($param['seo_title'])){
+            $param['seo_title'] = truncate_text($param['title'],70);
+        }
         return $this->success($param);
     }
 

@@ -123,6 +123,8 @@ class KeywordLogic extends  BaseLogic
         }
         if(!empty($param['seo_title'])){
             $param['seo_title'] = ucfirst($param['seo_title']);
+        }else{
+            $param['seo_title'] = truncate_text($param['title'],70);
         }
         $param['first_word'] = $this->model->first_word($param['title']);
         return $param;

@@ -392,6 +392,9 @@ class ProductLogic extends  BaseLogic
         $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
         $param['describe'] = Arr::a2s($param['describe'] ?? []);
         $param['describe_id'] = Arr::arrToSet($param['describe_id'] ?? '');
+        if(!isset($param['seo_mate']['seo_title']) || empty($param['seo_mate']['seo_title'])){
+            $param['seo_mate']['seo_title'] = truncate_text($param['title'],70);
+        }
         $param['seo_mate'] = Arr::a2s($param['seo_mate'] ?? []);
         $param['related_product_id'] = Arr::arrToSet($param['related_product_id'] ?? '');
         if(isset($param['icon'])){

@@ -27,7 +27,7 @@ class BlogCategoryRequest extends FormRequest
             'name'=>'required|max:200',
 //            'seo_title'=>'max:70',
             'seo_keywords'=>'max:300',
-            'seo_description'=>'max:200',
+            'seo_des'=>'max:200',
         ];
     }
 
@@ -38,7 +38,7 @@ class BlogCategoryRequest extends FormRequest
             'name.max'=>'名称最大200字',
 //            'seo_title.max' => 'SEO标题不能超过70个字符',
             'seo_keywords.max' => 'SEO关键词不能超过300个字符',
-            'seo_description.max' => 'SEO描述不能超过200个字符',
+            'seo_des.max' => 'SEO描述不能超过200个字符',
         ];
     }
 }

@@ -27,7 +27,7 @@ class NewsCategoryRequest extends FormRequest
             'name'=>'required|max:200',
 //            'seo_title'=>'max:70',
             'seo_keywords'=>'max:300',
-            'seo_description'=>'max:200',
+            'seo_des'=>'max:200',
         ];
     }
 
@@ -38,7 +38,7 @@ class NewsCategoryRequest extends FormRequest
             'name.max'=>'名称最大100字',
 //            'seo_title.max' => 'SEO标题不能超过70个字符',
             'seo_keywords.max' => 'SEO关键词不能超过300个字符',
-            'seo_description.max' => 'SEO描述不能超过200个字符',
+            'seo_des.max' => 'SEO描述不能超过200个字符',
         ];
     }
 }

@@ -33,7 +33,7 @@ class CategoryRequest extends FormRequest
             'title'=>'required|max:200',
             'route'=>'required',
             'seo_keywords'=>'max:300',
-            'seo_description'=>'max:200',
+            'seo_des'=>'max:200',
         ];
     }
 
@@ -44,7 +44,7 @@ class CategoryRequest extends FormRequest
             'title.max' => '分类名称不能超过200个字符',
             'route.required' => '路由不能为空',
             'seo_keywords.max' => 'SEO关键词不能超过300个字符',
-            'seo_description.max' => 'SEO描述不能超过200个字符',
+            'seo_des.max' => 'SEO描述不能超过200个字符',
         ];
     }