gx

@@ -263,7 +263,9 @@ class DomainInfoLogic extends BaseLogic
         if($server_info === false){
         if($server_info === false){
             $this->fail('获取服务器数据失败');
             $this->fail('获取服务器数据失败');
         }
         }
-
+        if($project_info['serve_id'] == 9){
+            $this->fail('请切换服务器,生成站点不能使用测试服务器');
+        }
         //域名是否都已经解析
         //域名是否都已经解析
         if(!empty($info['domain']) && !$this->check_cname($info['domain'], $server_info)){
         if(!empty($info['domain']) && !$this->check_cname($info['domain'], $server_info)){
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');

@@ -191,6 +191,9 @@ class ProjectLogic extends BaseLogic
             $param['extend_type'] = Project::TYPE_FIVE;
             $param['extend_type'] = Project::TYPE_FIVE;
             unset($param['type']);
             unset($param['type']);
         }
         }
+        if($param['type'] == Project::TYPE_ONE){
+            $param['serve_id'] = 9;
+        }
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
             $param['uptime'] = date('Y-m-d H:i:s');
             $param['uptime'] = date('Y-m-d H:i:s');
         }
         }

@@ -32,15 +32,12 @@ class SyncService
             $url = 'https://form.globalso.com/api/globalsov6';
             $url = 'https://form.globalso.com/api/globalsov6';
             // 项目信息
             // 项目信息
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
-
             // 不满足条件 不同步到表单系统
             // 不满足条件 不同步到表单系统
             if (empty($project->deploy_optimize->domain)) {
             if (empty($project->deploy_optimize->domain)) {
                 return false;
                 return false;
             }
             }
-
             // 生产域名
             // 生产域名
             $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
             $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
-
             // 收件设置信息
             // 收件设置信息
             ProjectServer::useProject($project_id);
             ProjectServer::useProject($project_id);
             $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();
             $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();