合并分支 'akun' 到 'master'

Akun



查看合并请求 !998

@@ -96,10 +96,10 @@ class CNoticeController extends BaseController
                         $domain_array = parse_url($domain);
                         $host = $domain_array['host'] ?? $domain_array['path'];
                         $host_array = explode('.',$host);
-                        if(count($host_array) <= 2){
-                            array_unshift($host_array,'m');
-                        }else{
+                        if($host_array[0] == 'www'){
                             $host_array[0] = 'm';
+                        }else{
+                            array_unshift($host_array,'m');
                         }
                         $domain = implode('.',$host_array);
                     }

@@ -193,10 +193,10 @@ class DomainInfoLogic extends BaseLogic
             $domain_array = parse_url($info['domain']);
             $host = $domain_array['host'] ?? $domain_array['path'];
             $host_array = explode('.',$host);
-            if(count($host_array) <= 2){
-                array_unshift($host_array,'m');
-            }else{
+            if($host_array[0] == 'www'){
                 $host_array[0] = 'm';
+            }else{
+                array_unshift($host_array,'m');
             }
             $amp_domain = implode('.',$host_array);
             if(!check_domain_record($amp_domain, $serversIpInfo)){

@@ -418,10 +418,10 @@ class BtRepository
         $domain_array = parse_url($domain);
         $host = $domain_array['host'] ?? $domain_array['path'];
         $host_array = explode('.',$host);
-        if(count($host_array) <= 2){
-            array_unshift($host_array,'m');
-        }else{
+        if($host_array[0] == 'www'){
             $host_array[0] = 'm';
+        }else{
+            array_unshift($host_array,'m');
         }
         $host = implode('.',$host_array);