作者 刘锟

update

@@ -315,6 +315,7 @@ class Project extends Base @@ -315,6 +315,7 @@ class Project extends Base
315 { 315 {
316 $cache_key = 'getProjectByDomain_' . $domain; 316 $cache_key = 'getProjectByDomain_' . $domain;
317 $project = Cache::get($cache_key); 317 $project = Cache::get($cache_key);
  318 + $project = null;
318 if(!$project){ 319 if(!$project){
319 $domain_parse = parse_url($domain); 320 $domain_parse = parse_url($domain);
320 $domain = $domain_parse['host'] ?? $domain; 321 $domain = $domain_parse['host'] ?? $domain;
@@ -322,14 +323,18 @@ class Project extends Base @@ -322,14 +323,18 @@ class Project extends Base
322 $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id'); 323 $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
323 //是否正式域名 324 //是否正式域名
324 if (!$project_id) { 325 if (!$project_id) {
325 - //是否小语种域名 326 + //是否小语种域名或amp站域名
326 $domainPrefix = explode(".",$domain); 327 $domainPrefix = explode(".",$domain);
327 if (!empty($domainPrefix)){ 328 if (!empty($domainPrefix)){
  329 + if($domainPrefix[0] == 'm'){
  330 + $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
  331 + }else{
328 $isLang = Translate::getTls($domainPrefix[0]); 332 $isLang = Translate::getTls($domainPrefix[0]);
329 if ($isLang) { 333 if ($isLang) {
330 $domain = "www.".$domainPrefix[1].".".$domainPrefix[2]; 334 $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
331 } 335 }
332 } 336 }
  337 + }
333 $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id'); 338 $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
334 } 339 }
335 $project = self::find($project_id ?: 0); 340 $project = self::find($project_id ?: 0);