Browse Source

(端口偏移):去除冲突

GeekQu 5 years ago
parent
commit
2ea7ddeb05

+ 0 - 1
resources/views/material/admin/node/create.tpl

@@ -126,7 +126,6 @@
                                     <label class="floating-label" for="info">节点描述</label>
                                     <label class="floating-label" for="info">节点描述</label>
                                     <input class="form-control maxwidth-edit" id="info" type="text" name="info"
                                     <input class="form-control maxwidth-edit" id="info" type="text" name="info"
                                            value="无描述">
                                            value="无描述">
-                                    <p class="form-control-guide"><i class="material-icons">info</i>设置单端口偏移请在描述最后加"#偏移值",正加负减</p>
                                 </div>
                                 </div>
 
 
                                 <div class="form-group form-group-label">
                                 <div class="form-group form-group-label">

+ 0 - 1
resources/views/material/admin/node/edit.tpl

@@ -133,7 +133,6 @@
                                     <label class="floating-label" for="info">节点描述</label>
                                     <label class="floating-label" for="info">节点描述</label>
                                     <input class="form-control maxwidth-edit" id="info" name="info" type="text"
                                     <input class="form-control maxwidth-edit" id="info" name="info" type="text"
                                            value="{$node->info}">
                                            value="{$node->info}">
-                                    <p class="form-control-guide"><i class="material-icons">info</i>设置单端口偏移请在描述最后加"#偏移值",正加负减</p>
                                 </div>
                                 </div>
 
 
                                 <div class="form-group form-group-label">
                                 <div class="form-group form-group-label">

+ 2 - 2
src/Controllers/UserController.php

@@ -436,7 +436,7 @@ class UserController extends BaseController
 
 
             $array_node['id'] = $node->id;
             $array_node['id'] = $node->id;
             $array_node['class'] = $node->node_class;
             $array_node['class'] = $node->node_class;
-            $array_node['name'] = explode("#",$node->name)[0];
+            $array_node['name'] = $node->name;
             if ($node->sort == 13) {
             if ($node->sort == 13) {
                 $server = Tools::ssv2Array($node->server);
                 $server = Tools::ssv2Array($node->server);
                 $array_node['server'] = $server['add'];
                 $array_node['server'] = $server['add'];
@@ -444,7 +444,7 @@ class UserController extends BaseController
                 $array_node['server'] = $node->getServer();
                 $array_node['server'] = $node->getServer();
             }
             }
             $array_node['sort'] = $node->sort;
             $array_node['sort'] = $node->sort;
-            $array_node['info'] = explode("#", $node->info)[0];
+            $array_node['info'] = $node->info;
             $array_node['mu_only'] = $node->mu_only;
             $array_node['mu_only'] = $node->mu_only;
             $array_node['group'] = $node->node_group;
             $array_node['group'] = $node->node_group;
 
 

+ 0 - 9
src/Utils/URL.php

@@ -940,15 +940,6 @@ class URL
             }
             }
         )->orderBy('priority', 'DESC')->orderBy('id')->first();
         )->orderBy('priority', 'DESC')->orderBy('id')->first();
         $node_name = $node->name;
         $node_name = $node->name;
-        /***节点描述后加#偏移值***/
-        $temp = explode("#", $node->info);
-        $offset = 0;
-        if ($temp[1]!=null){
-            if (is_numeric($temp[1])) {
-                $offset = $temp[1];
-            }
-        }
-        /************/
         if ($relay_rule != null) {
         if ($relay_rule != null) {
             $node_name .= ' - ' . $relay_rule->dist_node()->name;
             $node_name .= ' - ' . $relay_rule->dist_node()->name;
         }
         }