Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -298,7 +298,7 @@ class WebTrafficRussia extends Command
                 $page++;
                 $page++;
             }
             }
         }catch (\Exception $e){
         }catch (\Exception $e){
-            Log::channel('traffic')->error("ru:" . $e->getMessage());
+            Log::channel('traffic')->error("ru:line" . $e->getLine() . ',error:' . $e->getMessage());
         }
         }
     }
     }
 
 

@@ -724,7 +724,8 @@ class ProjectController extends BaseController
                   "start_date" => $item['deploy_optimize']['start_date'] ?? '',
                   "start_date" => $item['deploy_optimize']['start_date'] ?? '',
                   "domain" => $domain ? 'https://' . $domain : $domain,
                   "domain" => $domain ? 'https://' . $domain : $domain,
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
-                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
+//                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
+                  "online_time" => $item['uptime'] ?? '',
                   "cooperate_date" => $item['cooperate_date'],
                   "cooperate_date" => $item['cooperate_date'],
                   "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
                   "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
                   "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理
                   "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理

@@ -322,14 +322,18 @@ class Project extends Base
             $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
             $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
             //是否正式域名
             //是否正式域名
             if (!$project_id) {
             if (!$project_id) {
-                //是否小语种域名
+                //是否小语种域名或amp站域名
                 $domainPrefix = explode(".",$domain);
                 $domainPrefix = explode(".",$domain);
                 if (!empty($domainPrefix)){
                 if (!empty($domainPrefix)){
+                    if($domainPrefix[0] == 'm'){
+                        $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
+                    }else{
                         $isLang = Translate::getTls($domainPrefix[0]);
                         $isLang = Translate::getTls($domainPrefix[0]);
                         if ($isLang) {
                         if ($isLang) {
                             $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
                             $domain = "www.".$domainPrefix[1].".".$domainPrefix[2];
                         }
                         }
                     }
                     }
+                }
                 $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
                 $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
             }
             }
             $project = self::find($project_id ?: 0);
             $project = self::find($project_id ?: 0);