周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 17f38d59c05eb195aaf996c9291bb03bfc7ac2a7 1 个父辈 8f3d4242

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 16 行增加 和 4 行删除
@@ -68,9 +68,10 @@ class DomainInfo extends Command @@ -68,9 +68,10 @@ class DomainInfo extends Command
68 $domainModel = new DomainInfoModel(); 68 $domainModel = new DomainInfoModel();
69 $projectModel = new Project(); 69 $projectModel = new Project();
70 $serverIpModel = new ServersIp(); 70 $serverIpModel = new ServersIp();
  71 + $domainCreateTaskModel = new DomainCreateTask();
71 $list = $domainModel->where('status', '=', 1)->get(); 72 $list = $domainModel->where('status', '=', 1)->get();
72 foreach ($list as $v) { 73 foreach ($list as $v) {
73 - $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']); 74 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
74 if (!$project_info) { 75 if (!$project_info) {
75 continue; 76 continue;
76 } 77 }
@@ -89,6 +90,17 @@ class DomainInfo extends Command @@ -89,6 +90,17 @@ class DomainInfo extends Command
89 } 90 }
90 } 91 }
91 92
  93 + //判断是否已经建站
  94 + if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
  95 + $type = DomainCreateTask::TYPE_BLOG;
  96 + } else {
  97 + $type = DomainCreateTask::TYPE_MAIN;
  98 + }
  99 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
  100 + if (!$task_info) {
  101 + continue;
  102 + }
  103 +
92 //获取主站证书有效期并更新 104 //获取主站证书有效期并更新
93 $ssl_time = $this->getDomainSslTime($v['domain']); 105 $ssl_time = $this->getDomainSslTime($v['domain']);
94 if ($ssl_time['from'] && $ssl_time['to']) { 106 if ($ssl_time['from'] && $ssl_time['to']) {
@@ -168,7 +180,7 @@ class DomainInfo extends Command @@ -168,7 +180,7 @@ class DomainInfo extends Command
168 } 180 }
169 181
170 //创建更新站点证书任务 182 //创建更新站点证书任务
171 - $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]); 183 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
172 if (!$task_info) { 184 if (!$task_info) {
173 $domainCreateTaskModel->add([ 185 $domainCreateTaskModel->add([
174 'server_id' => $servers_ip_info['servers_id'], 186 'server_id' => $servers_ip_info['servers_id'],
@@ -225,7 +237,7 @@ class DomainInfo extends Command @@ -225,7 +237,7 @@ class DomainInfo extends Command
225 } 237 }
226 238
227 //创建更新站点证书任务 239 //创建更新站点证书任务
228 - $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]); 240 + $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
229 if (!$task_info) { 241 if (!$task_info) {
230 $domainCreateTaskModel->add([ 242 $domainCreateTaskModel->add([
231 'server_id' => $servers_ip_info['servers_id'], 243 'server_id' => $servers_ip_info['servers_id'],
@@ -273,7 +285,7 @@ class DomainInfo extends Command @@ -273,7 +285,7 @@ class DomainInfo extends Command
273 } 285 }
274 286
275 //创建更新站点证书任务 287 //创建更新站点证书任务
276 - $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_CUSTOM, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]); 288 + $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_CUSTOM, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
277 if (!$task_info) { 289 if (!$task_info) {
278 $domainCreateTaskModel->add([ 290 $domainCreateTaskModel->add([
279 'server_id' => $servers_ip_info['servers_id'], 291 'server_id' => $servers_ip_info['servers_id'],