作者 赵彬吉

update

@@ -4,9 +4,7 @@ namespace App\Http\Logic\Aside\Project; @@ -4,9 +4,7 @@ namespace App\Http\Logic\Aside\Project;
4 4
5 5
6 use App\Http\Logic\Aside\BaseLogic; 6 use App\Http\Logic\Aside\BaseLogic;
7 -use App\Models\Project\DomainInfo;  
8 -use App\Models\Project\Payment;  
9 -use MongoDB\Client; 7 +use App\Models\Domain\DomainInfo;
10 8
11 class DomainInfoLogic extends BaseLogic 9 class DomainInfoLogic extends BaseLogic
12 { 10 {
@@ -18,26 +16,15 @@ class DomainInfoLogic extends BaseLogic @@ -18,26 +16,15 @@ class DomainInfoLogic extends BaseLogic
18 16
19 public function getDomainInfo($project_id) 17 public function getDomainInfo($project_id)
20 { 18 {
21 - $project = (new ProjectLogic())->getProjectInfo($project_id);  
22 - $domain = (!empty($project['deploy_optimize']['domain']) ? ((new \App\Models\Domain\DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');  
23 - $info = $this->model->where('project_id', $project_id)->first();  
24 - //不存在或时间过期了 重新获取信息  
25 - $expiration_date = $info['domain_info']['expiration_date'] ?? '';  
26 - $end_time = $info['ssl']['end_time'] ?? '';  
27 - if(!$info || $expiration_date < date("Y-m-d") || $end_time < date('Y-m-d')){  
28 - try {  
29 - $mongo = new Client("mongodb://root:globalso8837840@23.228.125.2:27017");  
30 - $db = $mongo->globalso_monitor;  
31 - $collection = $db->project_v1;  
32 - $project_zk = $collection->findOne(['main_url' => $domain]);  
33 - $info['domain'] = $domain;  
34 - $info['domain_info'] = (array) $project_zk['domain_info'] ?? [];  
35 - $info['ssl'] = (array) $project_zk['ssl'] ?? [];  
36 - parent::save($info);  
37 - }catch (\Exception $e){ 19 + $domain_info = $this->model->where('project_id', $project_id)->first();
  20 + if(!$domain_info){
38 return []; 21 return [];
39 } 22 }
40 - }  
41 - return $info; 23 +
  24 + return [
  25 + 'domain' => 'https://'.$domain_info['domain'].'/',
  26 + 'domain_info' => $domain_info['domain_start_time'] . ' - ' .$domain_info['domain_end_time'],
  27 + 'cert_info' => $domain_info['certificate_start_time'] . ' - ' .$domain_info['certificate_end_time'],
  28 + ];
42 } 29 }
43 } 30 }
@@ -60,9 +60,9 @@ class RankDataLogic extends BaseLogic @@ -60,9 +60,9 @@ class RankDataLogic extends BaseLogic
60 //项目信息 60 //项目信息
61 $data['project'] = [ 61 $data['project'] = [
62 'company' => $project['company'], 62 'company' => $project['company'],
63 - 'domain' => (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''),  
64 - 'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''),  
65 - 'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''), 63 + 'domain' => $domain_info['domain'] ?? '',
  64 + 'domain_info' => $domain_info['domain_info'] ?? '',
  65 + 'cert_info' => $domain_info['cert_info'] ?? '',
66 'plan' => Project::planMap()[$project['deploy_build']['plan']], 66 'plan' => Project::planMap()[$project['deploy_build']['plan']],
67 'keyword_num' => $project['deploy_build']['keyword_num'], 67 'keyword_num' => $project['deploy_build']['keyword_num'],
68 'compliance_day' => $rank['compliance_day'] ?? 0, 68 'compliance_day' => $rank['compliance_day'] ?? 0,