Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -34,7 +34,7 @@ class UpgradeCount extends Command
 
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
+        $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0,'id'=>['<=',985]]);
         foreach ($list as $v) {
             echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);

@@ -33,6 +33,7 @@ class OptimizeController extends BaseController
     public function lists(Project $project){
         $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+            ->leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
         $query = $this->searchParam($query)->orderByRaw("FIELD(gl_project.level, '2') DESC")
@@ -131,8 +132,10 @@ class OptimizeController extends BaseController
         $item['plan'] = Project::planMap()[$item['plan']];
         $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
         $item['autologin_code'] = getAutoLoginCode($item['id']);
-        $domainModel = new DomainInfo();
-        $item['domain'] = !empty($item['domain']) ?  $domainModel->getDomain($item['domain']) : '';
+        $item['domain'] = 'https://'.$item['domain'].'/';
+        if(!empty($item['domain']) && $item['amp_status'] == 1){
+            $item['amp_domain'] = str_replace('www','m',$item['domain']);
+        }
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
@@ -186,11 +189,12 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.tech_leader AS tech_leader',
-            'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.start_date AS start_date',
             'gl_project_deploy_optimize.backlink AS backlink',
+            'gl_domain_info.amp_status AS amp_status',
+            'gl_domain_info.domain AS domain',
         ];
         return $select;
     }
@@ -246,8 +250,8 @@ class OptimizeController extends BaseController
         if(isset($this->map['domain']) && !empty($this->map['domain'])){
             $parsedUrl = parse_url($this->map['domain']);
             $this->map['domain'] = $parsedUrl['host'] ?? $this->map['domain'];
-            $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain'].'%')->pluck('id')->toArray();
-            $query = $query->whereIn('gl_project_deploy_optimize.domain', $ids);
+//            $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain'].'%')->pluck('id')->toArray();
+            $query = $query->where('gl_domain_info.domain', 'like' ,'%'.$this->map['domain'].'%');
         }
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');