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

Master server



查看合并请求 !1388

@@ -77,7 +77,7 @@ class AiBlogTask extends Command
                 if($route != $result['data']['url']){
                 if($route != $result['data']['url']){
                     $aiBlogService->updateDetail(['route'=>$route,'task_id'=>$item['task_id']]);
                     $aiBlogService->updateDetail(['route'=>$route,'task_id'=>$item['task_id']]);
                 }
                 }
-                $aiBlogModel->edit(['new_title'=>$result['data']['title'], 'image'=>$result['data']['thumb'], 'text'=>$result['data']['section'], 'author_id'=>$result['data']['author_id'], 'route'=>$route ,'status'=>2], ['task_id'=>$item['task_id']]);
+                $aiBlogModel->edit(['new_title'=>$result['data']['title'], 'image'=>$result['data']['thumb'], 'text'=>$result['data']['section'], 'author_id'=>$result['data']['author_id'],'seo_title'=>$result['data']['title'],'seo_keyword'=>$result['data']['keyword'],'seo_description'=>$result['data']['description'], 'route'=>$route ,'status'=>2], ['task_id'=>$item['task_id']]);
                 DB::disconnect('custom_mysql');
                 DB::disconnect('custom_mysql');
                 $aiBlogTaskModel->edit(['status'=>2],['id'=>$item['id']]);
                 $aiBlogTaskModel->edit(['status'=>2],['id'=>$item['id']]);
             }
             }

@@ -54,8 +54,10 @@ class WebSettingTextLogic extends BaseLogic
      */
      */
     public function setting_text_save(){
     public function setting_text_save(){
         $web_setting = new WebSetting();
         $web_setting = new WebSetting();
-        if(count($this->param['data']) > $this->param['anchor_num']){
-            $this->fail('超过最大设置限制');
+        if(isset($this->param['data']) && !empty($this->param['data'])){
+            if(count($this->param['data']) > $this->param['anchor_num']){
+                $this->fail('超过最大设置限制');
+            }
         }
         }
         //更新描文本设置
         //更新描文本设置
         if($this->param['anchor_is_enable'] == 0){
         if($this->param['anchor_is_enable'] == 0){