周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 4d0d8a3ff5c621aea5dcb22c87ec6613018a560d 2 个父辈 51c480d1 9944fa62

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !2587
内嵌 并排对比
正在显示 1 个修改的文件 包含 54 行增加 和 54 行删除
@@ -49,13 +49,13 @@ class DomainInfo extends Command @@ -49,13 +49,13 @@ class DomainInfo extends Command
49 $this->startUpdateSslTime(); 49 $this->startUpdateSslTime();
50 50
51 //主站证书到期更新 51 //主站证书到期更新
52 - $this->startUpdateCert(); 52 +// $this->startUpdateCert();
53 53
54 //AMP站证书到期更新 54 //AMP站证书到期更新
55 - $this->startUpdateAmpCert(); 55 +// $this->startUpdateAmpCert();
56 56
57 //创建的自定义小语种域名证书到期更新 57 //创建的自定义小语种域名证书到期更新
58 - $this->startUpdateCustomCert(); 58 +// $this->startUpdateCustomCert();
59 59
60 return true; 60 return true;
61 } 61 }
@@ -86,12 +86,12 @@ class DomainInfo extends Command @@ -86,12 +86,12 @@ class DomainInfo extends Command
86 86
87 if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) { 87 if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
88 //自建站项目，直接获取主站证书有效期并更新 88 //自建站项目，直接获取主站证书有效期并更新
89 - $ssl_time = $this->getDomainSslTime($v['domain']);  
90 - if ($ssl_time['from'] && $ssl_time['to']) {  
91 - $v->certificate_start_time = $ssl_time['from'];  
92 - $v->certificate_end_time = $ssl_time['to'];  
93 - $v->save();  
94 - } 89 +// $ssl_time = $this->getDomainSslTime($v['domain']);
  90 +// if ($ssl_time['from'] && $ssl_time['to']) {
  91 +// $v->certificate_start_time = $ssl_time['from'];
  92 +// $v->certificate_end_time = $ssl_time['to'];
  93 +// $v->save();
  94 +// }
95 95
96 if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) { 96 if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) {
97 //获取主站域名有效期并更新 97 //获取主站域名有效期并更新
@@ -100,13 +100,13 @@ class DomainInfo extends Command @@ -100,13 +100,13 @@ class DomainInfo extends Command
100 $v->domain_start_time = $valid_time['start']; 100 $v->domain_start_time = $valid_time['start'];
101 $v->domain_end_time = $valid_time['end']; 101 $v->domain_end_time = $valid_time['end'];
102 $v->save(); 102 $v->save();
103 - }  
104 - }  
105 103
106 - //域名到期提醒  
107 - if ($v->domain_end_time && $v->domain_end_time < $end_day) {  
108 - $is_end = $v->domain_end_time < date('Y-m-d H:i:s') ? 1 : 0;  
109 - $this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end); 104 + //域名到期提醒
  105 + if ($valid_time['end'] < $end_day) {
  106 + $is_end = $valid_time['end'] < date('Y-m-d H:i:s') ? 1 : 0;
  107 + $this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
  108 + }
  109 + }
110 } 110 }
111 } else { 111 } else {
112 //除自建站项目外，记录已解析到别的ip的域名 112 //除自建站项目外，记录已解析到别的ip的域名
@@ -127,12 +127,12 @@ class DomainInfo extends Command @@ -127,12 +127,12 @@ class DomainInfo extends Command
127 } 127 }
128 128
129 //获取主站证书有效期并更新 129 //获取主站证书有效期并更新
130 - $ssl_time = $this->getDomainSslTime($v['domain']);  
131 - if ($ssl_time['from'] && $ssl_time['to']) {  
132 - $v->certificate_start_time = $ssl_time['from'];  
133 - $v->certificate_end_time = $ssl_time['to'];  
134 - $v->save();  
135 - } 130 +// $ssl_time = $this->getDomainSslTime($v['domain']);
  131 +// if ($ssl_time['from'] && $ssl_time['to']) {
  132 +// $v->certificate_start_time = $ssl_time['from'];
  133 +// $v->certificate_end_time = $ssl_time['to'];
  134 +// $v->save();
  135 +// }
136 136
137 if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) { 137 if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) {
138 //获取主站域名有效期并更新 138 //获取主站域名有效期并更新
@@ -141,42 +141,42 @@ class DomainInfo extends Command @@ -141,42 +141,42 @@ class DomainInfo extends Command
141 $v->domain_start_time = $valid_time['start']; 141 $v->domain_start_time = $valid_time['start'];
142 $v->domain_end_time = $valid_time['end']; 142 $v->domain_end_time = $valid_time['end'];
143 $v->save(); 143 $v->save();
144 - }  
145 - }  
146 144
147 - //域名到期提醒  
148 - if ($v->domain_end_time && $v->domain_end_time < $end_day) {  
149 - $is_end = $v->domain_end_time < date('Y-m-d H:i:s') ? 1 : 0;  
150 - $this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);  
151 - }  
152 -  
153 - if ($v['amp_status'] == 1) {  
154 - $domain_array = parse_url($v['domain']);  
155 - $host = $domain_array['host'] ?? $domain_array['path'];  
156 - $host_array = explode('.', $host);  
157 - if (count($host_array) <= 2) {  
158 - array_unshift($host_array, 'm');  
159 - } else {  
160 - $host_array[0] = 'm';  
161 - }  
162 - $amp_domain = implode('.', $host_array);  
163 -  
164 - if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {  
165 - //过滤已解析到别的ip的AMP域名  
166 - if (!check_domain_record($amp_domain, $servers_ip_info)) {  
167 - Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');  
168 - continue; 145 + //域名到期提醒
  146 + if ($valid_time['end'] < $end_day) {
  147 + $is_end = $valid_time['end'] < date('Y-m-d H:i:s') ? 1 : 0;
  148 + $this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
169 } 149 }
170 } 150 }
171 -  
172 - //获取AMP站证书有效期并更新  
173 - $amp_ssl_time = $this->getDomainSslTime($amp_domain);  
174 - if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {  
175 - $v->amp_certificate_start_time = $amp_ssl_time['from'];  
176 - $v->amp_certificate_end_time = $amp_ssl_time['to'];  
177 - $v->save();  
178 - }  
179 } 151 }
  152 +
  153 +// if ($v['amp_status'] == 1) {
  154 +// $domain_array = parse_url($v['domain']);
  155 +// $host = $domain_array['host'] ?? $domain_array['path'];
  156 +// $host_array = explode('.', $host);
  157 +// if (count($host_array) <= 2) {
  158 +// array_unshift($host_array, 'm');
  159 +// } else {
  160 +// $host_array[0] = 'm';
  161 +// }
  162 +// $amp_domain = implode('.', $host_array);
  163 +//
  164 +// if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
  165 +// //过滤已解析到别的ip的AMP域名
  166 +// if (!check_domain_record($amp_domain, $servers_ip_info)) {
  167 +// Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
  168 +// continue;
  169 +// }
  170 +// }
  171 +//
  172 +// //获取AMP站证书有效期并更新
  173 +// $amp_ssl_time = $this->getDomainSslTime($amp_domain);
  174 +// if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
  175 +// $v->amp_certificate_start_time = $amp_ssl_time['from'];
  176 +// $v->amp_certificate_end_time = $amp_ssl_time['to'];
  177 +// $v->save();
  178 +// }
  179 +// }
180 } 180 }
181 } 181 }
182 } 182 }
@@ -420,7 +420,7 @@ class DomainInfo extends Command @@ -420,7 +420,7 @@ class DomainInfo extends Command
420 'type' => MessagePush::TYPE_DOMAIN, 420 'type' => MessagePush::TYPE_DOMAIN,
421 'content' => $message, 421 'content' => $message,
422 'ref_ids' => $domain_id, 422 'ref_ids' => $domain_id,
423 - 'send_time' => date('Y-m-d 14:00:00'), 423 + 'send_time' => date('Y-m-d 16:00:00'),
424 'status' => 0, 424 'status' => 0,
425 ]; 425 ];
426 //写入一条推送消息 自动消费 426 //写入一条推送消息 自动消费