合并分支 'akun' 到 'master'

Akun



查看合并请求 !1880

@@ -141,7 +141,7 @@ class DomainInfo extends Command
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $domainModel->where('status', '=', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
-            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
+            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
             if (!$project_info) {
                 continue;
             }
@@ -161,14 +161,20 @@ class DomainInfo extends Command
                 continue;
             }
 
+            if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
+                $type = DomainCreateTask::TYPE_BLOG;
+            } else {
+                $type = DomainCreateTask::TYPE_MAIN;
+            }
+
             //创建更新站点证书任务
-            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_MAIN, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $servers_ip_info['servers_id'],
                     'project_id' => $v['project_id'],
                     'domain_id' => $v['id'],
-                    'type' => DomainCreateTask::TYPE_MAIN
+                    'type' => $type
                 ]);
             }
         }