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

@@ -226,6 +226,17 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
+        $amp_extend_config = [];
+        $amp_unique_extend = [];
+        if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
+            foreach ($this->param['amp_extend_config'] as $ka=>$va){
+                if(!in_array($va['origin'],$amp_unique_extend)){
+                    $amp_unique_extend[] = $va['origin'];
+                    $amp_extend_config[] = $va;
+                }
+            }
+        }
+
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
@@ -236,6 +247,7 @@ class DomainInfoLogic extends BaseLogic
             'is_https' => $this->param['is_https'] ?? 0,
             'is_https' => $this->param['is_https'] ?? 0,
             'amp_status' => $this->param['amp_status'] ?? 0,
             'amp_status' => $this->param['amp_status'] ?? 0,
             'amp_type' => $this->param['amp_type'] ?? 0,
             'amp_type' => $this->param['amp_type'] ?? 0,
+            'amp_extend_config'=>json_encode($amp_extend_config),
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_key' => $this->param['amp_key'] ?? '',
             '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'] ?? [])),