周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 d21bbab622c4b329ffc24fefd98e0e1d48e67af0 2 个父辈 bd159128 56458df0

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !731
内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 9 行删除
@@ -67,9 +67,7 @@ class DomainInfo extends Command @@ -67,9 +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(function ($query) use ($end_day) {  
71 - $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);  
72 - })->get()->toArray(); 70 + $list = $domainModel->where('status', '=', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
73 foreach ($list as $v) { 71 foreach ($list as $v) {
74 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 72 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
75 if (!$project_info) { 73 if (!$project_info) {
@@ -116,9 +114,7 @@ class DomainInfo extends Command @@ -116,9 +114,7 @@ class DomainInfo extends Command
116 $serverIpModel = new ServersIp(); 114 $serverIpModel = new ServersIp();
117 $domainCreateTaskModel = new DomainCreateTask(); 115 $domainCreateTaskModel = new DomainCreateTask();
118 $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天后到期
119 - $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', 1)->where(function ($query) use ($end_day) {  
120 - $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);  
121 - })->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();
122 foreach ($list as $v) { 118 foreach ($list as $v) {
123 $domain_array = parse_url($v['domain']); 119 $domain_array = parse_url($v['domain']);
124 $host = $domain_array['host'] ?? $domain_array['path']; 120 $host = $domain_array['host'] ?? $domain_array['path'];
@@ -175,9 +171,7 @@ class DomainInfo extends Command @@ -175,9 +171,7 @@ class DomainInfo extends Command
175 $serverIpModel = new ServersIp(); 171 $serverIpModel = new ServersIp();
176 $domainCreateTaskModel = new DomainCreateTask(); 172 $domainCreateTaskModel = new DomainCreateTask();
177 $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天后到期
178 - $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', 1)->where(function ($query) use ($end_day) {  
179 - $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);  
180 - })->get()->toArray(); 174 + $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
181 foreach ($list as $v) { 175 foreach ($list as $v) {
182 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 176 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
183 if (!$project_info) { 177 if (!$project_info) {