合并分支 'akun' 到 'master'

Akun



查看合并请求 !438

@@ -315,6 +315,7 @@ class Project extends Base
     {
         $cache_key = 'getProjectByDomain_' . $domain;
         $project = Cache::get($cache_key);
+        $project = null;
         if(!$project){
             $domain_parse = parse_url($domain);
             $domain = $domain_parse['host'] ?? $domain;
@@ -322,12 +323,16 @@ class Project extends Base
             $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
             //是否正式域名
             if (!$project_id) {
-                //是否小语种域名
+                //是否小语种域名或amp站域名
                 $domainPrefix = explode(".",$domain);
                 if (!empty($domainPrefix)){
-                    $isLang = Translate::getTls($domainPrefix[0]);
-                    if ($isLang) {
+                    if($domainPrefix[0] == 'm'){
                         $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
+                    }else{
+                        $isLang = Translate::getTls($domainPrefix[0]);
+                        if ($isLang) {
+                            $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
+                        }
                     }
                 }
                 $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');