合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1150

@@ -161,10 +161,10 @@ class ProjectLogic extends BaseLogic
                 $this->createProjectData($this->param);
                 $this->createProjectData($this->param);
                 //双向绑定服务器,需放到保存项目的上方
                 //双向绑定服务器,需放到保存项目的上方
                 $this->setServers($this->param['serve_id'],$this->param['id']);
                 $this->setServers($this->param['serve_id'],$this->param['id']);
-                //保存项目信息
-                $this->saveProject($this->param);
                 //ai_blog
                 //ai_blog
                 $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'],$this->param['title']);
                 $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'],$this->param['title']);
+                //保存项目信息
+                $this->saveProject($this->param);
                 //保存建站部署信息
                 //保存建站部署信息
                 $this->saveProjectDeployBuild($this->param['deploy_build']);
                 $this->saveProjectDeployBuild($this->param['deploy_build']);
                 //保存付费信息
                 //保存付费信息
@@ -770,7 +770,6 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/9/4 14:29
      * @time   :2023/9/4 14:29
      */
      */
     public function editDomainStatus($domain,$project_id){
     public function editDomainStatus($domain,$project_id){
-
         $projectOptimize = new DeployOptimize();
         $projectOptimize = new DeployOptimize();
         $optimizeInfo = $projectOptimize->read(['project_id'=>$project_id],['domain']);
         $optimizeInfo = $projectOptimize->read(['project_id'=>$project_id],['domain']);
         if($optimizeInfo['domain'] == $domain){
         if($optimizeInfo['domain'] == $domain){
@@ -977,9 +976,7 @@ class ProjectLogic extends BaseLogic
     public function saveWebTrafficConfig($config){
     public function saveWebTrafficConfig($config){
         $config['main_countries'] = textareaToArr($config['main_countries']);
         $config['main_countries'] = textareaToArr($config['main_countries']);
         $config['filter_countries'] = textareaToArr($config['filter_countries']);
         $config['filter_countries'] = textareaToArr($config['filter_countries']);
-
         $ip_area = InquiryIP::getIpAreas();
         $ip_area = InquiryIP::getIpAreas();
-
         foreach ($config['main_countries'] as $v) {
         foreach ($config['main_countries'] as $v) {
             if (!in_array($v, $ip_area)) {
             if (!in_array($v, $ip_area)) {
                 throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
                 throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
@@ -990,11 +987,8 @@ class ProjectLogic extends BaseLogic
                 throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
                 throw new AsideGlobalException(Code::SYSTEM_ERROR, '[' . $v . ']不存在，请检查后再次提交');
             }
             }
         }
         }
-
-
         $config['main_countries'] = json_encode($config['main_countries']);
         $config['main_countries'] = json_encode($config['main_countries']);
         $config['filter_countries'] = json_encode($config['filter_countries']);
         $config['filter_countries'] = json_encode($config['filter_countries']);
-
         $model = WebTrafficConfig::where('project_id', $config['project_id'])->first();
         $model = WebTrafficConfig::where('project_id', $config['project_id'])->first();
         if (!$model) {
         if (!$model) {
             $model = new WebTrafficConfig();
             $model = new WebTrafficConfig();
@@ -1002,9 +996,7 @@ class ProjectLogic extends BaseLogic
         } else {
         } else {
             $model->edit($config, ['project_id' => $config['project_id']]);
             $model->edit($config, ['project_id' => $config['project_id']]);
         }
         }
-
         Cache::forget(WebTrafficConfig::cacheKey($config['project_id']));
         Cache::forget(WebTrafficConfig::cacheKey($config['project_id']));
-
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -1086,6 +1078,4 @@ class ProjectLogic extends BaseLogic
         }
         }
         return true;
         return true;
     }
     }
-
-
 }
 }