合并分支 'akun' 到 'master'

Akun



查看合并请求 !1058

@@ -202,6 +202,11 @@ class DomainInfoLogic extends BaseLogic
             if(!check_domain_record($amp_domain, $serversIpInfo)){
             if(!check_domain_record($amp_domain, $serversIpInfo)){
                 $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
                 $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
             }
             }
+
+            $is_redirect = $this->param['is_redirect'] ?? 0;
+        }else{
+            //未开通amp站，主站和m站相互跳转也自动取消
+            $is_redirect = 0;
         }
         }
 
 
         $not_allow_ip = array_filter($this->param['not_allow_ip'] ?? []);
         $not_allow_ip = array_filter($this->param['not_allow_ip'] ?? []);
@@ -252,7 +257,7 @@ class DomainInfoLogic extends BaseLogic
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
             'not_allow_ip'=>json_encode($not_allow_ip),
             'not_allow_ip'=>json_encode($not_allow_ip),
-            'is_redirect' => $this->param['is_redirect'] ?? 0,
+            'is_redirect' => $is_redirect,
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);