Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -90,13 +90,41 @@ class DomainInfo extends Command
                 }
                 }
             }
             }
 
 
-            //获取证书有效期并更新
+            //获取主站证书有效期并更新
             $ssl_time = $this->getDomainSslTime($v['domain']);
             $ssl_time = $this->getDomainSslTime($v['domain']);
             if ($ssl_time['from'] && $ssl_time['to']) {
             if ($ssl_time['from'] && $ssl_time['to']) {
                 $v->certificate_start_time = $ssl_time['from'];
                 $v->certificate_start_time = $ssl_time['from'];
                 $v->certificate_end_time = $ssl_time['to'];
                 $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';
+                }
+                $amp_domain = implode('.', $host_array);
+
+                if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                    //过滤已解析到别的ip的AMP域名
+                    if (!$this->check_cname($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();
+                }
+            }
         }
         }
     }
     }
 
 

@@ -114,6 +114,7 @@ class RenewProjectController extends BaseController
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')
             ->with('deploy_optimize')->with('online_check')
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($this->map, true) . PHP_EOL, FILE_APPEND);
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
             $manageModel = new Manage();
             $manageModel = new Manage();