Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -215,11 +215,11 @@ class DomainInfoLogic extends BaseLogic
         }
 
         //域名是否都已经解析
-        if(!$this->check_cname($info['domain'], $server_info)){
+        if($info['domain'] && !$this->check_cname($info['domain'], $server_info)){
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
         }
         foreach ($this->param['other_domain']??[] as $other_domain){
-            if(!$this->check_cname($other_domain, $server_info)){
+            if($other_domain && !$this->check_cname($other_domain, $server_info)){
                 $this->fail('域名' . $other_domain . '未解析至目标服务器');
             }
         }

@@ -529,9 +529,8 @@ class ProjectLogic extends BaseLogic
             $domain_info = $domain_model->read(['id'=>$param['deploy_optimize']['domain']],'domain');
 
             if($server_info && $domain_info){
-
                 //验证解析
-                if (!DomainInfoLogic::instance()->check_cname($domain_info['domain'], $server_info)) {
+                if ($domain_info['domain'] && !DomainInfoLogic::instance()->check_cname($domain_info['domain'], $server_info)) {
                     throw new AsideGlobalException(Code::SYSTEM_ERROR,'域名' . $domain_info['domain'] . '未解析至目标服务器');
                 }
                 $api_url = 'http://'.$server_info['init_domain'].'/api/createSite';