合并分支 'akun' 到 'master'

Akun



查看合并请求 !471

@@ -90,16 +90,21 @@ class DomainInfo extends Command
         foreach ($list as $v) {
         foreach ($list as $v) {
             //更新证书到期时间
             //更新证书到期时间
             $data = [];
             $data = [];
+
             $ssl = $this->updateDomainSsl($v['domain']);
             $ssl = $this->updateDomainSsl($v['domain']);
             $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
             $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
 
 
-            $domainModel->edit($data, ['id' => $v['id']]);
-
-            if ($v['type'] == 1 && ($data['certificate_end_time'] ?? '') < $end_day) {
+            if ($v['type'] == 1 && $ssl['to'] < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updatePrivate($v);
                 $this->updatePrivate($v);
+
+                $ssl_new = $this->updateDomainSsl($v['domain']);
+                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
             }
             }
+
+            $domainModel->edit($data, ['id' => $v['id']]);
         }
         }
     }
     }
 
 
@@ -132,12 +137,16 @@ class DomainInfo extends Command
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
             $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
             $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
 
 
-            $domainModel->edit($data, ['id' => $v['id']]);
-
-            if ($v['amp_type'] == 1 && ($data['amp_certificate_end_time'] ?? '') < $end_day) {
+            if ($v['amp_type'] == 1 && $ssl['to'] < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updateAmpPrivate($v['domain']);
                 $this->updateAmpPrivate($v['domain']);
+
+                $ssl_new = $this->updateDomainSsl($v['domain']);
+                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
             }
             }
+
+            $domainModel->edit($data, ['id' => $v['id']]);
         }
         }
     }
     }
 
 
@@ -160,12 +169,16 @@ class DomainInfo extends Command
             $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
             $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
 
 
-            $customModel->edit($data, ['id' => $v['id']]);
-
-            if ($v['type'] == 1 && ($data['certificate_end_time'] ?? '') < $end_day) {
+            if ($v['type'] == 1 && $ssl['to'] < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updateCustomPrivate($v['custom_domain']);
                 $this->updateCustomPrivate($v['custom_domain']);
+
+                $ssl_new = $this->updateDomainSsl($v['domain']);
+                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
             }
             }
+
+            $customModel->edit($data, ['id' => $v['id']]);
         }
         }
     }
     }