合并分支 'akun' 到 'master'

Akun



查看合并请求 !2442

@@ -287,9 +287,21 @@ class DomainInfoLogic extends BaseLogic
         $amp_unique_extend = [];
         $amp_unique_extend = [];
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
-                if($va['origin'] && (!in_array($va['origin'],$amp_unique_extend))){
-                    $amp_unique_extend[] = $va['origin'];
-                    $amp_extend_config[] = $va;
+                if(!$va['origin']){
+                    continue;
+                }
+                if(!$va['target']){
+                    continue;
+                }
+
+                $amp_origin_array = parse_url($va['origin']);
+                $amp_origin_url = isset($amp_origin_array['path']) && $amp_origin_array['path'] ? $amp_origin_array['path'] : $amp_origin_array['host'];
+
+                $amp_target_array = parse_url($va['target']);
+                $amp_target_url = isset($amp_target_array['path']) && $amp_target_array['path'] ? $amp_target_array['path'] : $amp_target_array['host'];
+                if((!in_array($amp_origin_url,$amp_unique_extend))){
+                    $amp_unique_extend[] = $amp_origin_url;
+                    $amp_extend_config[] = ['origin'=>$amp_origin_url,'target'=>$amp_target_url];
                 }
                 }
             }
             }
         }
         }