周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 dd297676009388d902fef1ffcb997c2a3e6cc0ce 2 个父辈 32bf6382 dd09ed4b

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !737
内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 3 行删除
@@ -67,7 +67,7 @@ class DomainInfo extends Command @@ -67,7 +67,7 @@ class DomainInfo extends Command
67 $serverIpModel = new ServersIp(); 67 $serverIpModel = new ServersIp();
68 $domainCreateTaskModel = new DomainCreateTask(); 68 $domainCreateTaskModel = new DomainCreateTask();
69 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 69 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
70 - $list = $domainModel->where('status', '=', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 70 + $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
71 foreach ($list as $v) { 71 foreach ($list as $v) {
72 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 72 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
73 if (!$project_info) { 73 if (!$project_info) {
@@ -114,7 +114,7 @@ class DomainInfo extends Command @@ -114,7 +114,7 @@ class DomainInfo extends Command
114 $serverIpModel = new ServersIp(); 114 $serverIpModel = new ServersIp();
115 $domainCreateTaskModel = new DomainCreateTask(); 115 $domainCreateTaskModel = new DomainCreateTask();
116 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 116 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
117 - $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray(); 117 + $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
118 foreach ($list as $v) { 118 foreach ($list as $v) {
119 $domain_array = parse_url($v['domain']); 119 $domain_array = parse_url($v['domain']);
120 $host = $domain_array['host'] ?? $domain_array['path']; 120 $host = $domain_array['host'] ?? $domain_array['path'];
@@ -171,7 +171,7 @@ class DomainInfo extends Command @@ -171,7 +171,7 @@ class DomainInfo extends Command
171 $serverIpModel = new ServersIp(); 171 $serverIpModel = new ServersIp();
172 $domainCreateTaskModel = new DomainCreateTask(); 172 $domainCreateTaskModel = new DomainCreateTask();
173 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 173 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
174 - $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 174 + $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
175 foreach ($list as $v) { 175 foreach ($list as $v) {
176 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 176 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
177 if (!$project_info) { 177 if (!$project_info) {