作者 lyh

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

@@ -63,6 +63,10 @@ class AiBlogAutoPublish extends Command @@ -63,6 +63,10 @@ class AiBlogAutoPublish extends Command
63 63
64 foreach ($projects as $project) { 64 foreach ($projects as $project) {
65 $this->output("项目{$project->id}开始自动发布"); 65 $this->output("项目{$project->id}开始自动发布");
  66 + if(!$project->deploy_optimize['is_ai_blog_send']){
  67 + $this->output("项目{$project->id}未开启自动发布" . $project->deploy_optimize['start_date']);
  68 + continue;
  69 + }
66 if(($project->deploy_optimize['start_date'] > date('Y-m-d')) || !$project->deploy_optimize['start_date']){ 70 if(($project->deploy_optimize['start_date'] > date('Y-m-d')) || !$project->deploy_optimize['start_date']){
67 $this->output("项目{$project->id}未到推广时间" . $project->deploy_optimize['start_date']); 71 $this->output("项目{$project->id}未到推广时间" . $project->deploy_optimize['start_date']);
68 continue; 72 continue;
@@ -159,6 +163,11 @@ class AiBlogAutoPublish extends Command @@ -159,6 +163,11 @@ class AiBlogAutoPublish extends Command
159 if (!AiBlogOpenLog::isOpened($project->id)) { 163 if (!AiBlogOpenLog::isOpened($project->id)) {
160 //开启 164 //开启
161 $project->is_ai_blog = 1; 165 $project->is_ai_blog = 1;
  166 +
  167 + //开启自动发布
  168 + $project->deploy_optimize->is_ai_blog_send = 1;
  169 + $project->deploy_optimize->save();
  170 +
162 $project->save(); 171 $project->save();
163 //创建AI博客项目 172 //创建AI博客项目
164 $deploy_optimize = $project->deploy_optimize; 173 $deploy_optimize = $project->deploy_optimize;
@@ -286,6 +286,10 @@ class DomainInfoLogic extends BaseLogic @@ -286,6 +286,10 @@ class DomainInfoLogic extends BaseLogic
286 'domain_id' => $this->param['id'], 286 'domain_id' => $this->param['id'],
287 'type' => DomainCreateTask::TYPE_MAIN 287 'type' => DomainCreateTask::TYPE_MAIN
288 ]); 288 ]);
  289 + }else{
  290 + if($task_info['status'] == DomainCreateTask::STATUS_UN){
  291 + $task_model->edit(['sort'=>0],['id'=>$task_info['id']]);
  292 + }
289 } 293 }
290 if($data['amp_status']){ 294 if($data['amp_status']){
291 $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]); 295 $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);