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

@@ -63,6 +63,10 @@ class AiBlogAutoPublish extends Command
 
         foreach ($projects as $project) {
             $this->output("项目{$project->id}开始自动发布");
+            if(!$project->deploy_optimize['is_ai_blog_send']){
+                $this->output("项目{$project->id}未开启自动发布" . $project->deploy_optimize['start_date']);
+                continue;
+            }
             if(($project->deploy_optimize['start_date'] > date('Y-m-d')) || !$project->deploy_optimize['start_date']){
                 $this->output("项目{$project->id}未到推广时间" . $project->deploy_optimize['start_date']);
                 continue;
@@ -159,6 +163,11 @@ class AiBlogAutoPublish extends Command
                 if (!AiBlogOpenLog::isOpened($project->id)) {
                     //开启
                     $project->is_ai_blog = 1;
+
+                    //开启自动发布
+                    $project->deploy_optimize->is_ai_blog_send = 1;
+                    $project->deploy_optimize->save();
+
                     $project->save();
                     //创建AI博客项目
                     $deploy_optimize = $project->deploy_optimize;

@@ -286,6 +286,10 @@ class DomainInfoLogic extends BaseLogic
                 'domain_id' => $this->param['id'],
                 'type' => DomainCreateTask::TYPE_MAIN
             ]);
+        }else{
+            if($task_info['status'] == DomainCreateTask::STATUS_UN){
+                $task_model->edit(['sort'=>0],['id'=>$task_info['id']]);
+            }
         }
         if($data['amp_status']){
             $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);