合并分支 'akun' 到 'master'

Akun



查看合并请求 !2520

@@ -81,69 +81,86 @@ class DomainInfo extends Command
                 continue;
                 continue;
             }
             }
 
 
-            //除自建站项目外，记录已解析到别的ip的域名
-            if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                //过滤已解析到别的ip的域名
+            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的域名
                 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) {
-                $type = DomainCreateTask::TYPE_BLOG;
-            } else {
-                $type = DomainCreateTask::TYPE_MAIN;
-            }
-            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
-            if (!$task_info) {
-                continue;
-            }
-
-            //获取主站证书有效期并更新
-            $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 ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
+                    $type = DomainCreateTask::TYPE_BLOG;
+                } else {
+                    $type = DomainCreateTask::TYPE_MAIN;
+                }
+                $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
+                if (!$task_info) {
+                    continue;
+                }
 
 
-            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'];
+                //获取主站证书有效期并更新
+                $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();
                     $v->save();
                 }
                 }
-            }
 
 
-            if ($v['amp_status'] == 1) {
-                $domain_array = parse_url($v['domain']);
-                $host = $domain_array['host'] ?? $domain_array['path'];
-                $host_array = explode('.', $host);
-                if (count($host_array) <= 2) {
-                    array_unshift($host_array, 'm');
-                } else {
-                    $host_array[0] = 'm';
+                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();
+                    }
                 }
                 }
-                $amp_domain = implode('.', $host_array);
 
 
-                if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                    //过滤已解析到别的ip的AMP域名
-                    if (!check_domain_record($amp_domain, $servers_ip_info)) {
-                        Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
-                        continue;
+                if ($v['amp_status'] == 1) {
+                    $domain_array = parse_url($v['domain']);
+                    $host = $domain_array['host'] ?? $domain_array['path'];
+                    $host_array = explode('.', $host);
+                    if (count($host_array) <= 2) {
+                        array_unshift($host_array, 'm');
+                    } else {
+                        $host_array[0] = 'm';
+                    }
+                    $amp_domain = implode('.', $host_array);
+
+                    if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                        //过滤已解析到别的ip的AMP域名
+                        if (!check_domain_record($amp_domain, $servers_ip_info)) {
+                            Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
+                            continue;
+                        }
                     }
                     }
-                }
 
 
-                //获取AMP站证书有效期并更新
-                $amp_ssl_time = $this->getDomainSslTime($amp_domain);
-                if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
-                    $v->amp_certificate_start_time = $amp_ssl_time['from'];
-                    $v->amp_certificate_end_time = $amp_ssl_time['to'];
-                    $v->save();
+                    //获取AMP站证书有效期并更新
+                    $amp_ssl_time = $this->getDomainSslTime($amp_domain);
+                    if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
+                        $v->amp_certificate_start_time = $amp_ssl_time['from'];
+                        $v->amp_certificate_end_time = $amp_ssl_time['to'];
+                        $v->save();
+                    }
                 }
                 }
             }
             }
         }
         }