From bd4fc024b2aaac58f63229b3a30c8b2e6d420df3 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Thu, 30 Jan 2020 15:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=20(relay?= =?UTF-8?q?=5Fport=5Fmigration)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Mod_Mu/FuncController.php | 57 ++++------------------- config/.config.example.php | 1 - 2 files changed, 10 insertions(+), 48 deletions(-) diff --git a/app/Controllers/Mod_Mu/FuncController.php b/app/Controllers/Mod_Mu/FuncController.php index c772e615..3e8c0940 100644 --- a/app/Controllers/Mod_Mu/FuncController.php +++ b/app/Controllers/Mod_Mu/FuncController.php @@ -62,53 +62,16 @@ class FuncController extends BaseController $server = null; } - if (Config::get('relay_port_migration') === true) { - foreach ($rules as $rule) { - $dis = $this->get_dis_node_info($rule['dist_node_id']); - if ($dis != null) { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = $dis->sort; - if (in_array($dis->sort, [0, 10])) { - $dis_server = explode(';', $dis->server); - $rule['dist_node_server'] = $dis_server[0]; - } else { - $rule['dist_node_server'] = $dis->server; - } - - if (in_array($dis->sort, [0, 10]) && strpos($dis->server, ';') !== false && $dis->mu_only != -1) { - $muPort = Tools::get_MuOutPortArray($dis->server); - $user = User::where('port', '=', $rule['port'])->first(); - if ($user != null) { - if ($user->is_multi_user != 0) { - if ($muPort['type'] == 0) { - if (in_array($rule['port'], array_keys($muPort['port']))) { - $rule['port'] = $muPort['port'][$rule['port']]; - } - } else { - $rule['port'] = ($rule['port'] + $muPort['type']); - } - } - } - } - - } else { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = null; - $rule['dist_node_server'] = null; - } - } - } else { - foreach ($rules as $rule) { - $dis = $this->get_dis_node_info($rule['dist_node_id']); - if ($dis != null) { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = $dis->sort; - $rule['dist_node_server'] = $dis->server; - } else { - $rule['source_node_sort'] = $node->sort; - $rule['dist_node_sort'] = null; - $rule['dist_node_server'] = null; - } + foreach ($rules as $rule) { + $dis = $this->get_dis_node_info($rule['dist_node_id']); + if ($dis != null) { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = $dis->sort; + $rule['dist_node_server'] = $dis->server; + } else { + $rule['source_node_sort'] = $node->sort; + $rule['dist_node_sort'] = null; + $rule['dist_node_server'] = null; } } diff --git a/config/.config.example.php b/config/.config.example.php index d557312d..69ad47f9 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -381,7 +381,6 @@ $_ENV['subscribe_client'] = false; //下载协议客户端时附带节点 $_ENV['subscribe_client_url'] = ''; //使用独立的服务器提供附带节点和订阅信息的协议客户端下载,为空表示不使用 $_ENV['mu_port_migration'] = false; //为后端直接下发偏移后的端口 -$_ENV['relay_port_migration'] = false; //为中转规则下发偏移后的端口,此项未经测试 $_ENV['add_emoji_to_node_name'] = false; //为部分订阅中默认添加 emoji $_ENV['add_appName_to_ss_uri'] = true; //为 SS 节点名称中添加站点名 $_ENV['enable_sub_cache'] = false; //订阅信息缓存