合并分支 'akun' 到 'master'

Akun



查看合并请求 !395

@@ -57,11 +57,9 @@ class DomainInfo extends Command
     public function startUpdateDomain()
     public function startUpdateDomain()
     {
     {
         $domainModel = new DomainInfoModel();
         $domainModel = new DomainInfoModel();
-        $map = [
-            'status' => ['!=', 2],
-            'domain_end_time' => ['<', date('Y-m-d H:i:s')]
-        ];
-        $list = $domainModel->list($map);
+        $list = $domainModel->where('status', '!=', 2)->where(function ($query) {
+            $query->whereNull('domain_end_time')->orWhere('domain_end_time', '<', date('Y-m-d H:i:s'));
+        })->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             $time = $this->updateDomain($v['domain']);
             $time = $this->updateDomain($v['domain']);
             $data = [
             $data = [
@@ -82,11 +80,9 @@ class DomainInfo extends Command
     {
     {
         $domainModel = new DomainInfoModel();
         $domainModel = new DomainInfoModel();
         $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
         $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
-        $map = [
-            'status' => ['!=', 2],
-            'certificate_end_time' => ['<', $end_day]
-        ];
-        $list = $domainModel->list($map);
+        $list = $domainModel->where('status', '!=', 2)->where(function ($query) use ($end_day) {
+            $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
+        })->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             //更新证书到期时间
             //更新证书到期时间
             $data = [];
             $data = [];
@@ -96,7 +92,7 @@ class DomainInfo extends Command
 
 
             $domainModel->edit($data, ['id' => $v['id']]);
             $domainModel->edit($data, ['id' => $v['id']]);
 
 
-            if($v['type'] == 1 && ($data['certificate_end_time'] ?? '') < $end_day){
+            if ($v['type'] == 1 && ($data['certificate_end_time'] ?? '') < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updatePrivate($v);
                 $this->updatePrivate($v);
             }
             }
@@ -112,12 +108,9 @@ class DomainInfo extends Command
     {
     {
         $domainModel = new DomainInfoModel();
         $domainModel = new DomainInfoModel();
         $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
         $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
-        $map = [
-            'status' => ['!=', 2],
-            'amp_status' => ['=', 1],
-            'amp_certificate_end_time' => ['<', $end_day]
-        ];
-        $list = $domainModel->list($map);
+        $list = $domainModel->where('status', '!=', 2)->where('amp_status', 1)->where(function ($query) use ($end_day) {
+            $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);
+        })->get()->toArray();
         foreach ($list as $v) {
         foreach ($list as $v) {
             //更新amp站点证书到期时间
             //更新amp站点证书到期时间
             $domain_array = parse_url($v['domain']);
             $domain_array = parse_url($v['domain']);
@@ -137,7 +130,7 @@ class DomainInfo extends Command
 
 
             $domainModel->edit($data, ['id' => $v['id']]);
             $domainModel->edit($data, ['id' => $v['id']]);
 
 
-            if($v['amp_type'] == 1 && ($data['amp_certificate_start_time'] ?? '') < $end_day){
+            if ($v['amp_type'] == 1 && ($data['amp_certificate_start_time'] ?? '') < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updateAmpPrivate($v['domain']);
                 $this->updateAmpPrivate($v['domain']);
             }
             }
@@ -180,7 +173,8 @@ class DomainInfo extends Command
      * @author Akun
      * @author Akun
      * @date 2024/02/26 10:25
      * @date 2024/02/26 10:25
      */
      */
-    public function updateAmpPrivate($domain){
+    public function updateAmpPrivate($domain)
+    {
         $url = 'https://' . $domain . '/api/createSiteAmp/';
         $url = 'https://' . $domain . '/api/createSiteAmp/';
         $param = [
         $param = [
             "domain" => $domain,
             "domain" => $domain,