合并分支 'akun' 到 'master'

Akun



查看合并请求 !2756

@@ -86,23 +86,6 @@ 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']);
@@ -170,13 +153,15 @@ class DomainInfo extends Command
                 }
                 }
 
 
                 if ($v['amp_status'] == 1) {
                 if ($v['amp_status'] == 1) {
-                    $host_array_amp = $host_array;
-                    if (count($host_array_amp) <= 2) {
-                        array_unshift($host_array_amp, 'm');
+                    $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');
                     } else {
                     } else {
-                        $host_array_amp[0] = 'm';
+                        $host_array[0] = 'm';
                     }
                     }
-                    $amp_domain = implode('.', $host_array_amp);
+                    $amp_domain = implode('.', $host_array);
 
 
                     if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                     if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                         //过滤已解析到别的ip的AMP域名
                         //过滤已解析到别的ip的AMP域名