diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php
index d2738c3e..e5422479 100644
--- a/app/Utils/Tools.php
+++ b/app/Utils/Tools.php
@@ -536,4 +536,35 @@ class Tools
}
return $item;
}
+
+ public static function OutPort($node, $mu_port)
+ {
+ $node_server = explode(';', $node->server);
+ $node_port = $mu_port;
+ if (strpos($node_server[1], 'port') !== false) {
+ $item = URL::parse_args($node_server[1]);
+ if (strpos($item['port'], '#') !== false) { // 端口偏移,指定端口,格式:8.8.8.8;port=80#1080
+ if (strpos($item['port'], '+') !== false) { // 多个单端口节点,格式:8.8.8.8;port=80#1080+443#8443
+ $args_explode = explode('+', $item['port']);
+ foreach ($args_explode as $arg) {
+ if ((int) substr($arg, 0, strpos($arg, '#')) == $mu_port) {
+ $node_port = (int) substr($arg, strpos($arg, '#') + 1);
+ }
+ }
+ } else {
+ if ((int) substr($item['port'], 0, strpos($item['port'], '#')) == $mu_port) {
+ $node_port = (int) substr($item['port'], strpos($item['port'], '#') + 1);
+ }
+ }
+ } else { // 端口偏移,偏移端口,格式:8.8.8.8;port=1000 or 8.8.8.8;port=-1000
+ $node_port = ($mu_port + (int) $item['port']);
+ }
+ }
+
+ return [
+ 'name' => ($node->name . ' - ' . $node_port . ' 单端口'),
+ 'address' => $node_server[0],
+ 'port' => $node_port
+ ];
+ }
}
diff --git a/app/Utils/URL.php b/app/Utils/URL.php
index a4800a68..79826d00 100644
--- a/app/Utils/URL.php
+++ b/app/Utils/URL.php
@@ -631,28 +631,10 @@ class URL
$return_array['passwd'] = $user->passwd;
$return_array['method'] = $user->method;
if (strpos($node->server, ';') !== false && $node->sort != 13) {
- $node_server = explode(';', $node->server);
- $return_array['address'] = $node_server[0];
- if (strpos($node_server[1], 'port') !== false) {
- $item = self::parse_args($node_server[1]);
- if (strpos($item['port'], '#') !== false) { // 端口偏移,指定端口,格式:8.8.8.8;port=80#1080
- if (strpos($item['port'], '+') !== false) { // 多个单端口节点,格式:8.8.8.8;port=80#1080+443#8443
- $args_explode = explode('+', $item['port']);
- foreach ($args_explode as $arg) {
- if ((int) substr($arg, 0, strpos($arg, '#')) == $mu_port) {
- $return_array['port'] = (int) substr($arg, strpos($arg, '#') + 1);
- }
- }
- } else {
- if ((int) substr($item['port'], 0, strpos($item['port'], '#')) == $mu_port) {
- $return_array['port'] = (int) substr($item['port'], strpos($item['port'], '#') + 1);
- }
- }
- } else { // 端口偏移,偏移端口,格式:8.8.8.8;port=1000 or 8.8.8.8;port=-1000
- $return_array['port'] = ($return_array['port'] + (int) $item['port']);
- }
- }
- $node_name = ($node->name . ' - ' . $return_array['port'] . ' 单端口');
+ $node_tmp = Tools::OutPort($node, $mu_port);
+ $return_array['address'] = $node_tmp['address'];
+ $return_array['port'] = $node_tmp['port'];
+ $node_name = $node_tmp['name'];
}
$return_array['remark'] = $node_name;
$return_array['class'] = $node->node_class;
diff --git a/resources/views/material/user/node.tpl b/resources/views/material/user/node.tpl
index ad68938a..f9f1da7b 100755
--- a/resources/views/material/user/node.tpl
+++ b/resources/views/material/user/node.tpl
@@ -168,7 +168,9 @@
{$node['name']}
{if $relay_rule != null} - {$relay_rule->dist_node()->name}{/if} -
- 单端口 Shadowsocks - {$single_muport['server']->server} 端口
+ 单端口 Shadowsocks -
+ {if strpos($node->server, ';') !== false}{$node_tmp=$tools->OutPort($node, $single_muport)}{$node_tmp['port']}{else}{$single_muport['server']->server}{/if}
+ 端口
{/foreach}
@@ -306,7 +308,7 @@
onClick="urlChange('{$node['id']}',{$single_muport['server']->server},{if $relay_rule != null}{$relay_rule->id}{else}0{/if})">{$node['name']}
{if $relay_rule != null} - {$relay_rule->dist_node()->name}{/if}
- 单端口 Shadowsocks -
- {$single_muport['server']->server}
+ {if strpos($node->server, ';') !== false}{$node_tmp=$tools->OutPort($node, $single_muport)}{$node_tmp['port']}{else}{$single_muport['server']->server}{/if}
端口←点击节点查看配置信息