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

修改域名是增加验证



查看合并请求 !638

@@ -59,7 +59,7 @@ class ProductController extends BaseController
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
             $userModel = new User();
             $userModel = new User();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
-                $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);;
+                $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);
                 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
                 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);

@@ -658,7 +658,18 @@ 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();
+        $optimizeInfo = $projectOptimize->read(['project_id'=>$project_id],['domain']);
+        if($optimizeInfo['domain'] == $domain){
+            return $this->success();
+        }
         $domainModel = new DomainInfo();
         $domainModel = new DomainInfo();
+        //查看当前域名是否已使用
+        $domainInfo = $domainModel->read(['id'=>$domain,'project_id'=>['!=',0]]);
+        if($domainInfo !== false){
+            $this->fail('当前域名已被其他服务器使用');
+        }
         //先清空上一次所绑定的域名
         //先清空上一次所绑定的域名
         $info = $domainModel->read(['project_id'=>$project_id]);
         $info = $domainModel->read(['project_id'=>$project_id]);
         if($info !== false){
         if($info !== false){