合并分支 'akun' 到 'master'

Akun



查看合并请求 !2742

@@ -195,19 +195,25 @@ class DomainInfoLogic extends BaseLogic
         $host = $domain_array['host'] ?? $domain_array['path'];
         $host = $domain_array['host'] ?? $domain_array['path'];
         $host_array = explode('.',$host);
         $host_array = explode('.',$host);
 
 
+        //已经解析泛域名的项目，更改项目解析状态
+        $host_array_any = $host_array;
+        if (count($host_array_any) <= 2) {
+            array_unshift($host_array_any, '*');
+        } else {
+            $host_array_any[0] = '*';
+        }
+        $any_domain = implode('.',$host_array_any);
+        $rand_str = generateRandomString(3);
+        $any_check_status = check_domain_record(str_replace('*',$rand_str,$any_domain), $serversIpInfo);
+        if($any_check_status){
+            $project_model->edit(['is_analysis'=>1],['id'=>$info['project_id']]);
+        }
+
         if($this->param['type'] == 3){
         if($this->param['type'] == 3){
             //需要申请通配符证书
             //需要申请通配符证书
 
 
-            //判断*是否已经解析
-            $host_array_any = $host_array;
-            if (count($host_array_any) <= 2) {
-                array_unshift($host_array_any, '*');
-            } else {
-                $host_array_any[0] = '*';
-            }
-            $any_domain = implode('.',$host_array_any);
-            $rand_str = generateRandomString(3);
-            if(!check_domain_record(str_replace('*',$rand_str,$any_domain), $serversIpInfo)){
+            //判断是否已经解析泛域名
+            if(!$any_check_status){
                 $this->fail('域名' . $any_domain . '未解析至目标服务器');
                 $this->fail('域名' . $any_domain . '未解析至目标服务器');
             }
             }