作者 刘锟

update

@@ -151,7 +151,7 @@ class DomainInfo extends Command @@ -151,7 +151,7 @@ class DomainInfo extends Command
151 $serverIpModel = new ServersIp(); 151 $serverIpModel = new ServersIp();
152 $domainCreateTaskModel = new DomainCreateTask(); 152 $domainCreateTaskModel = new DomainCreateTask();
153 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 153 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
154 - $list = $domainModel->where('status', '=', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 154 + $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
155 foreach ($list as $v) { 155 foreach ($list as $v) {
156 $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']); 156 $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
157 if (!$project_info) { 157 if (!$project_info) {
@@ -204,7 +204,7 @@ class DomainInfo extends Command @@ -204,7 +204,7 @@ class DomainInfo extends Command
204 $serverIpModel = new ServersIp(); 204 $serverIpModel = new ServersIp();
205 $domainCreateTaskModel = new DomainCreateTask(); 205 $domainCreateTaskModel = new DomainCreateTask();
206 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 206 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
207 - $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '=', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray(); 207 + $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
208 foreach ($list as $v) { 208 foreach ($list as $v) {
209 $domain_array = parse_url($v['domain']); 209 $domain_array = parse_url($v['domain']);
210 $host = $domain_array['host'] ?? $domain_array['path']; 210 $host = $domain_array['host'] ?? $domain_array['path'];