gx

@@ -43,10 +43,12 @@ class DomainInfo extends Command
         foreach ($list as $v){
         foreach ($list as $v){
             if(empty($v['private_key']) || empty($v['private_cert'])){
             if(empty($v['private_key']) || empty($v['private_cert'])){
                 //域名结束时间<2天时，重新生成
                 //域名结束时间<2天时，重新生成
-                if(!empty($v['certificate_end_time']) && ($v['certificate_end_time'] > date('Y-m-d H:i:s',time() + 24*3600))){
+                if(!empty($v['certificate_end_time'])){
+                    if(($v['certificate_end_time'] > date('Y-m-d H:i:s',time() + 24*3600)) || ($v['certificate_end_time'] < date('Y-m-d H:i:s',time()))){
                         $this->updatePrivate($v);
                         $this->updatePrivate($v);
                     }
                     }
                 }
                 }
+            }
             $ssl = $this->updateDomainSsl($v['domain']);
             $ssl = $this->updateDomainSsl($v['domain']);
             $time = $this->updateDomain($v['domain']);
             $time = $this->updateDomain($v['domain']);
             if(!empty($time['start']) && !!empty($time['end'])){
             if(!empty($time['start']) && !!empty($time['end'])){