合并分支 'akun' 到 'master'

Akun



查看合并请求 !2520

@@ -81,14 +81,30 @@ class DomainInfo extends Command
                 continue;
                 continue;
             }
             }
 
 
+            if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
+                //自建站项目，直接获取主站证书有效期并更新
+                $ssl_time = $this->getDomainSslTime($v['domain']);
+                if ($ssl_time['from'] && $ssl_time['to']) {
+                    $v->certificate_start_time = $ssl_time['from'];
+                    $v->certificate_end_time = $ssl_time['to'];
+                    $v->save();
+                }
+
+                if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
+                    //获取主站域名有效期并更新
+                    $valid_time = $this->getDomainValidTime($v['domain']);
+                    if ($valid_time['start'] && $valid_time['end']) {
+                        $v->domain_start_time = $valid_time['start'];
+                        $v->domain_end_time = $valid_time['end'];
+                        $v->save();
+                    }
+                }
+            } else {
                 //除自建站项目外，记录已解析到别的ip的域名
                 //除自建站项目外，记录已解析到别的ip的域名
-            if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                //过滤已解析到别的ip的域名
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     continue;
                     continue;
                 }
                 }
-            }
 
 
                 //判断是否已经建站
                 //判断是否已经建站
                 if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
                 if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
@@ -148,6 +164,7 @@ class DomainInfo extends Command
                 }
                 }
             }
             }
         }
         }
+    }
 
 
     /**
     /**
      * 主站证书到期更新
      * 主站证书到期更新