合并分支 'akun' 到 'master'

Akun



查看合并请求 !2118

@@ -1136,7 +1136,7 @@ class ProjectController extends BaseController
 
 
         //获取项目数据
         //获取项目数据
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['id'=>$this->param['id']],['project_type','serve_id','site_status']);
+        $projectInfo = $projectModel->read(['id'=>$this->param['id']],['project_type','serve_id','site_status','site_token']);
         if(!$projectInfo){
         if(!$projectInfo){
             $this->fail('获取项目数据失败');
             $this->fail('获取项目数据失败');
         }
         }
@@ -1144,61 +1144,75 @@ class ProjectController extends BaseController
             $this->response('success');
             $this->response('success');
         }
         }
 
 
-        //获取域名数据
-        $domainModel = new DomainInfoModel();
-        $domainInfo = $domainModel->read(['project_id'=>$this->param['id']],['id','domain','amp_status']);
-        if(!$domainInfo){
-            $this->fail('获取域名数据失败');
-        }
-
-        if($this->param['site_status'] == 1){
-            //关闭站点：通知C端
-            $re = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website');
-            if(isset($re['status']) && $re['status'] !== 200){
-                $this->fail($re['message']);
+        if($projectInfo['serve_id'] == 8){
+            //自建站项目
+            if($this->param['site_status'] == 1){
+                //关闭站点
+                $site_token = $projectInfo['site_token'] ? $projectInfo['site_token'].'_expired' : '';
+            }else{
+                //开启站点
+                $site_token = str_replace('_expired','',$projectInfo['site_token']);
             }
             }
+
+            $projectModel->edit(['site_status'=>$this->param['site_status'],'site_token'=>$site_token],['id'=>$this->param['id']]);
         }else{
         }else{
-            //开启站点：创建建站任务
-            $serverIpModel = new ServersIp();
-            $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
-            if(!$serversIpInfo){
-                $this->fail('获取项目所属服务器失败');
+            //普通项目
+            //获取域名数据
+            $domainModel = new DomainInfoModel();
+            $domainInfo = $domainModel->read(['project_id'=>$this->param['id']],['id','domain','amp_status']);
+            if(!$domainInfo){
+                $this->fail('获取域名数据失败');
             }
             }
 
 
-            if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
-                $type = DomainCreateTask::TYPE_BLOG;
-            } else {
-                $type = DomainCreateTask::TYPE_MAIN;
-            }
+            if($this->param['site_status'] == 1){
+                //关闭站点：通知C端
+                $re = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website');
+                if(isset($re['status']) && $re['status'] !== 200){
+                    $this->fail($re['message']);
+                }
+            }else{
+                //开启站点：创建建站任务
+                $serverIpModel = new ServersIp();
+                $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
+                if(!$serversIpInfo){
+                    $this->fail('获取项目所属服务器失败');
+                }
 
 
-            //创建更新站点证书任务
-            $domainCreateTaskModel = new DomainCreateTask();
-            $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,
-                    'is_open' => DomainCreateTask::IS_OPEN
-                ]);
-            }
+                if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
+                    $type = DomainCreateTask::TYPE_BLOG;
+                } else {
+                    $type = DomainCreateTask::TYPE_MAIN;
+                }
 
 
-            if($domainInfo['amp_status']){
-                $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 = new DomainCreateTask();
+                $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([
                     $domainCreateTaskModel->add([
                         'server_id' => $serversIpInfo['servers_id'],
                         'server_id' => $serversIpInfo['servers_id'],
                         'project_id' => $this->param['id'],
                         'project_id' => $this->param['id'],
                         'domain_id' => $domainInfo['id'],
                         'domain_id' => $domainInfo['id'],
-                        'type' => DomainCreateTask::TYPE_AMP,
+                        'type' => $type,
                         'is_open' => DomainCreateTask::IS_OPEN
                         'is_open' => DomainCreateTask::IS_OPEN
                     ]);
                     ]);
                 }
                 }
+
+                if($domainInfo['amp_status']){
+                    $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,
+                            'is_open' => DomainCreateTask::IS_OPEN
+                        ]);
+                    }
+                }
             }
             }
-        }
 
 
-        $projectModel->edit(['site_status'=>$this->param['site_status']],['id'=>$this->param['id']]);
+            $projectModel->edit(['site_status'=>$this->param['site_status']],['id'=>$this->param['id']]);
+        }
 
 
         $this->response('success');
         $this->response('success');
     }
     }