作者 刘锟

update

@@ -1173,24 +1173,26 @@ class ProjectController extends BaseController @@ -1173,24 +1173,26 @@ class ProjectController extends BaseController
1173 1173
1174 //创建更新站点证书任务 1174 //创建更新站点证书任务
1175 $domainCreateTaskModel = new DomainCreateTask(); 1175 $domainCreateTaskModel = new DomainCreateTask();
1176 - $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']); 1176 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'is_open' => DomainCreateTask::IS_OPEN, 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
1177 if (!$task_info) { 1177 if (!$task_info) {
1178 $domainCreateTaskModel->add([ 1178 $domainCreateTaskModel->add([
1179 'server_id' => $serversIpInfo['servers_id'], 1179 'server_id' => $serversIpInfo['servers_id'],
1180 'project_id' => $this->param['id'], 1180 'project_id' => $this->param['id'],
1181 'domain_id' => $domainInfo['id'], 1181 'domain_id' => $domainInfo['id'],
1182 - 'type' => $type 1182 + 'type' => $type,
  1183 + 'is_open' => DomainCreateTask::IS_OPEN
1183 ]); 1184 ]);
1184 } 1185 }
1185 1186
1186 if($domainInfo['amp_status']){ 1187 if($domainInfo['amp_status']){
1187 - $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']); 1188 + $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'is_open' => DomainCreateTask::IS_OPEN, 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
1188 if (!$task_info_amp) { 1189 if (!$task_info_amp) {
1189 $domainCreateTaskModel->add([ 1190 $domainCreateTaskModel->add([
1190 'server_id' => $serversIpInfo['servers_id'], 1191 'server_id' => $serversIpInfo['servers_id'],
1191 'project_id' => $this->param['id'], 1192 'project_id' => $this->param['id'],
1192 'domain_id' => $domainInfo['id'], 1193 'domain_id' => $domainInfo['id'],
1193 - 'type' => DomainCreateTask::TYPE_AMP 1194 + 'type' => DomainCreateTask::TYPE_AMP,
  1195 + 'is_open' => DomainCreateTask::IS_OPEN
1194 ]); 1196 ]);
1195 } 1197 }
1196 } 1198 }
@@ -17,4 +17,6 @@ class DomainCreateTask extends Base @@ -17,4 +17,6 @@ class DomainCreateTask extends Base
17 const TYPE_AMP = 2; 17 const TYPE_AMP = 2;
18 const TYPE_CUSTOM = 3; 18 const TYPE_CUSTOM = 3;
19 const TYPE_BLOG = 4; 19 const TYPE_BLOG = 4;
  20 +
  21 + const IS_OPEN = 1;
20 } 22 }