合并分支 'akun' 到 'master'

Akun



查看合并请求 !393

@@ -264,6 +264,22 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
+        //如果要开通amp站点，判断m域名是否已经解析
+        if(isset($this->param['amp_status']) && $this->param['amp_status'] == 1){
+            $domain_array = parse_url($info['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(!$this->check_cname($amp_domain, $server_info)){
+                $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
+            }
+        }
+
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
             'other_domain'=>json_encode($this->param['other_domain'] ?? []),
             'other_domain'=>json_encode($this->param['other_domain'] ?? []),
@@ -282,18 +298,6 @@ class DomainInfoLogic extends BaseLogic
 
 
         //amp站点生成证书
         //amp站点生成证书
         if($data['amp_status']){
         if($data['amp_status']){
-            $domain_array = parse_url($info['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(!$this->check_cname($amp_domain, $server_info)){
-                $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
-            }
             $this->setAmpDomainSsl($server_info['init_domain'],$info['domain']);
             $this->setAmpDomainSsl($server_info['init_domain'],$info['domain']);
         }
         }