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

@@ -1173,24 +1173,26 @@ class ProjectController extends BaseController
 
             //创建更新站点证书任务
             $domainCreateTaskModel = new DomainCreateTask();
-            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'is_open' => DomainCreateTask::IS_OPEN, 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $serversIpInfo['servers_id'],
                     'project_id' => $this->param['id'],
                     'domain_id' => $domainInfo['id'],
-                    'type' => $type
+                    'type' => $type,
+                    'is_open' => DomainCreateTask::IS_OPEN
                 ]);
             }
 
             if($domainInfo['amp_status']){
-                $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
+                $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'is_open' => DomainCreateTask::IS_OPEN, 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
                 if (!$task_info_amp) {
                     $domainCreateTaskModel->add([
                         'server_id' => $serversIpInfo['servers_id'],
                         'project_id' => $this->param['id'],
                         'domain_id' => $domainInfo['id'],
-                        'type' => DomainCreateTask::TYPE_AMP
+                        'type' => DomainCreateTask::TYPE_AMP,
+                        'is_open' => DomainCreateTask::IS_OPEN
                     ]);
                 }
             }

@@ -17,4 +17,6 @@ class DomainCreateTask extends Base
     const TYPE_AMP = 2;
     const TYPE_CUSTOM = 3;
     const TYPE_BLOG = 4;
+
+    const IS_OPEN = 1;
 }