周海龙 / globalso · 提交

转到一个项目

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

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !2587
内嵌 并排对比
正在显示 1 个修改的文件 包含 54 行增加 和 54 行删除
... ... @@ -49,13 +49,13 @@ class DomainInfo extends Command
$this->startUpdateSslTime();
//主站证书到期更新
$this->startUpdateCert();
// $this->startUpdateCert();
//AMP站证书到期更新
$this->startUpdateAmpCert();
// $this->startUpdateAmpCert();
//创建的自定义小语种域名证书到期更新
$this->startUpdateCustomCert();
// $this->startUpdateCustomCert();
return true;
}
... ... @@ -86,12 +86,12 @@ class DomainInfo extends Command
if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
//自建站项目，直接获取主站证书有效期并更新
$ssl_time = $this->getDomainSslTime($v['domain']);
if ($ssl_time['from'] && $ssl_time['to']) {
$v->certificate_start_time = $ssl_time['from'];
$v->certificate_end_time = $ssl_time['to'];
$v->save();
}
// $ssl_time = $this->getDomainSslTime($v['domain']);
// if ($ssl_time['from'] && $ssl_time['to']) {
// $v->certificate_start_time = $ssl_time['from'];
// $v->certificate_end_time = $ssl_time['to'];
// $v->save();
// }
if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) {
//获取主站域名有效期并更新
... ... @@ -100,13 +100,13 @@ class DomainInfo extends Command
$v->domain_start_time = $valid_time['start'];
$v->domain_end_time = $valid_time['end'];
$v->save();
}
}
//域名到期提醒
if ($v->domain_end_time && $v->domain_end_time < $end_day) {
$is_end = $v->domain_end_time < date('Y-m-d H:i:s') ? 1 : 0;
$this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
//域名到期提醒
if ($valid_time['end'] < $end_day) {
$is_end = $valid_time['end'] < date('Y-m-d H:i:s') ? 1 : 0;
$this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
}
}
}
} else {
//除自建站项目外，记录已解析到别的ip的域名
... ... @@ -127,12 +127,12 @@ class DomainInfo extends Command
}
//获取主站证书有效期并更新
$ssl_time = $this->getDomainSslTime($v['domain']);
if ($ssl_time['from'] && $ssl_time['to']) {
$v->certificate_start_time = $ssl_time['from'];
$v->certificate_end_time = $ssl_time['to'];
$v->save();
}
// $ssl_time = $this->getDomainSslTime($v['domain']);
// if ($ssl_time['from'] && $ssl_time['to']) {
// $v->certificate_start_time = $ssl_time['from'];
// $v->certificate_end_time = $ssl_time['to'];
// $v->save();
// }
if (empty($v['domain_end_time']) || $v['domain_end_time'] < $end_day) {
//获取主站域名有效期并更新
... ... @@ -141,42 +141,42 @@ class DomainInfo extends Command
$v->domain_start_time = $valid_time['start'];
$v->domain_end_time = $valid_time['end'];
$v->save();
}
}
//域名到期提醒
if ($v->domain_end_time && $v->domain_end_time < $end_day) {
$is_end = $v->domain_end_time < date('Y-m-d H:i:s') ? 1 : 0;
$this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
}
if ($v['amp_status'] == 1) {
$domain_array = parse_url($v['domain']);
$host = $domain_array['host'] ?? $domain_array['path'];
$host_array = explode('.', $host);
if (count($host_array) <= 2) {
array_unshift($host_array, 'm');
} else {
$host_array[0] = 'm';
}
$amp_domain = implode('.', $host_array);
if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
//过滤已解析到别的ip的AMP域名
if (!check_domain_record($amp_domain, $servers_ip_info)) {
Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
continue;
//域名到期提醒
if ($valid_time['end'] < $end_day) {
$is_end = $valid_time['end'] < date('Y-m-d H:i:s') ? 1 : 0;
$this->domainChatMessage($v['project_id'], $v['id'], $v['domain'], $is_end);
}
}
//获取AMP站证书有效期并更新
$amp_ssl_time = $this->getDomainSslTime($amp_domain);
if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
$v->amp_certificate_start_time = $amp_ssl_time['from'];
$v->amp_certificate_end_time = $amp_ssl_time['to'];
$v->save();
}
}
// if ($v['amp_status'] == 1) {
// $domain_array = parse_url($v['domain']);
// $host = $domain_array['host'] ?? $domain_array['path'];
// $host_array = explode('.', $host);
// if (count($host_array) <= 2) {
// array_unshift($host_array, 'm');
// } else {
// $host_array[0] = 'm';
// }
// $amp_domain = implode('.', $host_array);
//
// if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
// //过滤已解析到别的ip的AMP域名
// if (!check_domain_record($amp_domain, $servers_ip_info)) {
// Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
// continue;
// }
// }
//
// //获取AMP站证书有效期并更新
// $amp_ssl_time = $this->getDomainSslTime($amp_domain);
// if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
// $v->amp_certificate_start_time = $amp_ssl_time['from'];
// $v->amp_certificate_end_time = $amp_ssl_time['to'];
// $v->save();
// }
// }
}
}
}
... ... @@ -420,7 +420,7 @@ class DomainInfo extends Command
'type' => MessagePush::TYPE_DOMAIN,
'content' => $message,
'ref_ids' => $domain_id,
'send_time' => date('Y-m-d 14:00:00'),
'send_time' => date('Y-m-d 16:00:00'),
'status' => 0,
];
//写入一条推送消息 自动消费
... ...