合并分支 'akun' 到 'master'

Akun



查看合并请求 !2441

@@ -264,9 +264,21 @@ class DomainInfoLogic extends BaseLogic
         $unique_extend = [];
         $unique_extend = [];
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
             foreach ($this->param['extend_config'] as $k=>$v){
             foreach ($this->param['extend_config'] as $k=>$v){
-                if($v['origin'] && (!in_array($v['origin'],$unique_extend))){
-                    $unique_extend[] = $v['origin'];
-                    $extend_config[] = $v;
+                if(!$v['origin']){
+                    continue;
+                }
+                if(!$v['target']){
+                    continue;
+                }
+
+                $origin_array = parse_url($v['origin']);
+                $origin_url = isset($origin_array['path']) && $origin_array['path'] ? $origin_array['path'] : $origin_array['host'];
+
+                $target_array = parse_url($v['target']);
+                $target_url = isset($target_array['path']) && $target_array['path'] ? $target_array['path'] : $target_array['host'];
+                if((!in_array($origin_url,$unique_extend))){
+                    $unique_extend[] = $origin_url;
+                    $extend_config[] = ['origin'=>$origin_url,'target'=>$target_url];
                 }
                 }
             }
             }
         }
         }