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

@@ -305,13 +305,13 @@ class DomainInfoLogic extends BaseLogic
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);
         //主站生成证书
         //主站生成证书
-//        EditDomainBt::dispatch($this->param['id']);
-        $this->setDomainSsl($server_info['init_domain'],$info['domain'],$this->param['extend_config'] ?? [],$this->param['other_domain'] ?? [],$this->param['is_https'] ?? 0);
+        EditDomainBt::dispatch($this->param['id']);
+//        $this->setDomainSsl($server_info['init_domain'],$info['domain'],$this->param['extend_config'] ?? [],$this->param['other_domain'] ?? [],$this->param['is_https'] ?? 0);
 
 
         //amp站生成证书
         //amp站生成证书
         if($data['amp_status']){
         if($data['amp_status']){
-//            EditAmpDomainBt::dispatch($this->param['id']);
-            $this->setAmpDomainSsl($server_info['init_domain'],$info['domain']);
+            EditAmpDomainBt::dispatch($this->param['id']);
+//            $this->setAmpDomainSsl($server_info['init_domain'],$info['domain']);
         }
         }
 
 
         return $this->success();
         return $this->success();

@@ -77,6 +77,7 @@ class RankDataLogic extends BaseLogic
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'remain_day' => $project['deploy_build']['service_duration'] - ($project['finish_remain_day'] ?? 0),
             'remain_day' => $project['deploy_build']['service_duration'] - ($project['finish_remain_day'] ?? 0),
+            'g_top_plan' => $project['g_top_plan'] ?? [],
         ];
         ];
 
 
         //小语种列表
         //小语种列表