Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -123,6 +123,9 @@ class UpdateSeoTdk extends Command
                 if(empty($v['seo_description'])){
                 if(empty($v['seo_description'])){
                     $data['seo_description'] = $this->ai_send('news_seo_description',$v['name']);
                     $data['seo_description'] = $this->ai_send('news_seo_description',$v['name']);
                 }
                 }
+                if(!$data){
+                    continue;
+                }
                 DB::connection('custom_mysql')->table('gl_news')->where(['id'=>$v['id']])->update($data);
                 DB::connection('custom_mysql')->table('gl_news')->where(['id'=>$v['id']])->update($data);
             }
             }
         }
         }
@@ -151,6 +154,9 @@ class UpdateSeoTdk extends Command
                 if(empty($v['seo_description'])){
                 if(empty($v['seo_description'])){
                     $data['seo_description'] = $this->ai_send('blog_seo_description',$v['name']);
                     $data['seo_description'] = $this->ai_send('blog_seo_description',$v['name']);
                 }
                 }
+                if(!$data){
+                    continue;
+                }
                 DB::connection('custom_mysql')->table('gl_blog')->where(['id'=>$v['id']])->update($data);
                 DB::connection('custom_mysql')->table('gl_blog')->where(['id'=>$v['id']])->update($data);
             }
             }
         }
         }

@@ -24,7 +24,7 @@ class NewsRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'name'=>'required|max:100',
+            'name'=>'required|max:200',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -33,7 +33,7 @@ class NewsRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
-            'name.max'=>'名称最大100字',
+            'name.max'=>'名称最大200字',
             'url.required'=>'新闻链接不能为空'
             'url.required'=>'新闻链接不能为空'
         ];
         ];
     }
     }