正在显示
1 个修改的文件
包含
8 行增加
和
3 行删除
| @@ -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,12 +323,16 @@ class Project extends Base | @@ -322,12 +323,16 @@ 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)){ |
| 328 | - $isLang = Translate::getTls($domainPrefix[0]); | ||
| 329 | - if ($isLang) { | 329 | + if($domainPrefix[0] == 'm'){ |
| 330 | $domain = "www.".$domainPrefix[1].".".$domainPrefix[2]; | 330 | $domain = "www.".$domainPrefix[1].".".$domainPrefix[2]; |
| 331 | + }else{ | ||
| 332 | + $isLang = Translate::getTls($domainPrefix[0]); | ||
| 333 | + if ($isLang) { | ||
| 334 | + $domain = "www.".$domainPrefix[1].".".$domainPrefix[2]; | ||
| 335 | + } | ||
| 331 | } | 336 | } |
| 332 | } | 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'); |
-
请 注册 或 登录 后发表评论