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

@@ -86,6 +86,23 @@ class DomainInfo extends Command
                 continue;
                 continue;
             }
             }
 
 
+            $domain_array = parse_url($v['domain']);
+            $host = $domain_array['host'] ?? $domain_array['path'];
+            $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);
+            if (check_domain_record(str_replace('*', $rand_str, $any_domain), $servers_ip_info)) {
+                $projectModel->edit(['is_analysis' => 1], ['id' => $v['project_id']]);
+            }
+
             if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
             if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
                 //自建站项目，直接获取主站证书有效期并更新
                 //自建站项目，直接获取主站证书有效期并更新
                 $ssl_time = $this->getDomainSslTime($v['domain']);
                 $ssl_time = $this->getDomainSslTime($v['domain']);
@@ -153,15 +170,13 @@ class DomainInfo extends Command
                 }
                 }
 
 
                 if ($v['amp_status'] == 1) {
                 if ($v['amp_status'] == 1) {
-                    $domain_array = parse_url($v['domain']);
-                    $host = $domain_array['host'] ?? $domain_array['path'];
-                    $host_array = explode('.', $host);
-                    if (count($host_array) <= 2) {
-                        array_unshift($host_array, 'm');
+                    $host_array_amp = $host_array;
+                    if (count($host_array_amp) <= 2) {
+                        array_unshift($host_array_amp, 'm');
                     } else {
                     } else {
-                        $host_array[0] = 'm';
+                        $host_array_amp[0] = 'm';
                     }
                     }
-                    $amp_domain = implode('.', $host_array);
+                    $amp_domain = implode('.', $host_array_amp);
 
 
                     if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                     if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                         //过滤已解析到别的ip的AMP域名
                         //过滤已解析到别的ip的AMP域名

@@ -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 . '未解析至目标服务器');
             }
             }
 
 

@@ -228,12 +228,12 @@ class RankDataLogic extends BaseLogic
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
         }
         }
 
 
-//        if(!$api_no || Str::endsWith($api_no, '_bmseo')){
+        if(!$api_no || Str::endsWith($api_no, '_bmseo')){
             $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
             $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
             if($bm_api_no){
             if($bm_api_no){
                 $api_no = $bm_api_no;
                 $api_no = $bm_api_no;
             }
             }
-//        }
+        }
 
 
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);
         $domain_arr = parse_url($domain);