合并分支 'akun' 到 'master'

Akun 查看合并请求 !3250

合并分支 'akun' 到 'master'
Akun 查看合并请求 !3250
刘锟
app/Console/Commands/Domain/DomainInfo.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @a6034c3
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @a6034c3
@@ -74,7 +74,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', strtotime('+1 month'));//域名1月后到期
-        $list = $domainModel->where('status', '=', 1)->get();
+        $list = $domainModel->select(['id', 'project_id', 'domain', 'domain_end_time', 'is_expire_remind', 'amp_status'])->where('status', '=', 1)->get();
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
             if (!$project_info) {
@@ -195,7 +195,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', strtotime('+3 day'));//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->select(['id', 'project_id', 'domain'])->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
             if (!$project_info) {
@@ -248,7 +248,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', strtotime('+3 day'));//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->select(['id', 'project_id', 'domain'])->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
             $domain_array = parse_url($v['domain']);
             $host = $domain_array['host'] ?? $domain_array['path'];
@@ -305,7 +305,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', strtotime('+3 day'));//3天后到期
-        $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $customModel->select(['id', 'project_id', 'custom_domain'])->where('status', 1)->where('is_create', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
             if (!$project_info) {