code logic fix & remove unused code

resources/views/material/admin/node/create.tpl

@@ -95,9 +95,7 @@
                                         <select id="sort" class="form-control maxwidth-edit" name="sort">
                                             <option value="0">Shadowsocks</option>
                                             <option value="9">Shadowsocks 单端口多用户</option>
-                                            {* <option value="10">Shadowsocks 中转</option> *}
                                             <option value="11">V2Ray</option>
-                                            {* <option value="12">V2Ray 中转</option> *}
                                             <option value="13">Shadowsocks V2Ray-Plugin&Obfs</option>
                                             <option value="14">Trojan</option>
                                         </select>

src/Controllers/Admin/IpController.php

@@ -149,7 +149,7 @@ class IpController extends AdminController
                 }
             },
             static function ($query) {
-                $query->where('datetime', time() - 60);
+                $query->where('datetime', '>=', time() - 60);
             }
         );
 

src/Controllers/Admin/NodeController.php

@@ -102,22 +102,17 @@ class NodeController extends AdminController
             $req_node_ip = $node->server;
         }
 
-        $nodeSort = [2, 5, 9, 999];     // 无需更新 IP 的节点类型
-        if (!in_array($node->sort, $nodeSort)) {
-            $server_list = explode(';', $node->server);
-            if (!Tools::is_ip($server_list[0])) {
-                $node->node_ip = gethostbyname($server_list[0]);
-            } else {
-                $node->node_ip = $req_node_ip;
-            }
-            if ($node->node_ip == '') {
-                return $response->withJson([
-                    'ret' => 0,
-                    'msg' => '获取节点IP失败，请检查您输入的节点地址是否正确！'
-                ]);
-            }
+        $server_list = explode(';', $node->server);
+        if (!Tools::is_ip($server_list[0])) {
+            $node->node_ip = gethostbyname($server_list[0]);
         } else {
-            $node->node_ip = '';
+            $node->node_ip = $req_node_ip;
+        }
+        if ($node->node_ip == '') {
+            return $response->withJson([
+                'ret' => 0,
+                'msg' => '获取节点IP失败，请检查您输入的节点地址是否正确！'
+            ]);
         }
 
         $node->node_class                 = $request->getParam('class');
@@ -195,16 +190,11 @@ class NodeController extends AdminController
         }
 
         $success = true;
-        $nodeSort = [2, 5, 9, 999];     // 无需更新 IP 的节点类型
-        if (!in_array($node->sort, $nodeSort)) {
-            $server_list = explode(';', $node->server);
-            if (!Tools::is_ip($server_list[0])) {
-                $success = $node->changeNodeIp($server_list[0]);
-            } else {
-                $success = $node->changeNodeIp($req_node_ip);
-            }
+        $server_list = explode(';', $node->server);
+        if (!Tools::is_ip($server_list[0])) {
+            $success = $node->changeNodeIp($server_list[0]);
         } else {
-            $node->node_ip = '';
+            $success = $node->changeNodeIp($req_node_ip);
         }
 
         if (!$success) {

src/Controllers/User/NodeController.php

@@ -57,7 +57,7 @@ class NodeController extends UserController
             $array_node['bandwidth']      = $node->get_node_speedlimit();
 
             $all_connect = [];
-            if (in_array($node->sort, [0, 10])) {
+            if (in_array($node->sort, [0])) {
                 if ($node->mu_only != 1) {
                     $all_connect[] = 0;
                 }

src/Models/Node.php

@@ -223,9 +223,6 @@ class Node extends Model
         if ($this->node_heartbeat === 0) {
             return false;
         }
-        if (in_array($this->sort, [1, 2, 5, 9, 999])) {
-            return null;
-        }
         return $this->node_heartbeat > time() - 300;
     }
 
@@ -288,7 +285,7 @@ class Node extends Model
             return $server['add'];
         }
         $explode = explode(';', $this->server);
-        if (in_array($this->sort, [0, 10]) && isset($explode[1])) {
+        if (in_array($this->sort, [0]) && isset($explode[1])) {
             if (stripos($explode[1], 'server=') !== false) {
                 return URL::parse_args($explode[1])['server'];
             }

src/Utils/URL.php

@@ -205,22 +205,22 @@ class URL
 
         switch ($Rule['type']) {
             case 'ss':
-                $sort = [0, 10, 13];
-                $is_ss = [1];
+                $sort = [0, 13];
+                $is_ss = [0];
                 break;
             case 'ssr':
-                $sort = [0, 10];
+                $sort = [0];
                 break;
             case 'vmess':
-                $sort = [11, 12];
+                $sort = [11];
                 break;
             case 'trojan':
                 $sort = [14];
                 break;
             default:
                 $Rule['type'] = 'all';
-                $sort = [0, 10, 11, 12, 13, 14];
-                $is_ss = [0, 1];
+                $sort = [0, 11, 13, 14];
+                $is_ss = [0];
                 break;
         }
 
@@ -265,10 +265,9 @@ class URL
             // 筛选 End
 
             // 其他类型单端口节点
-            if (in_array($node->sort, [11, 12, 13, 14])) {
+            if (in_array($node->sort, [11, 13, 14])) {
                 $node_class = [
                     11 => 'getV2RayItem',           // V2Ray
-                    12 => 'getV2RayItem',           // V2Ray
                     13 => 'getV2RayPluginItem',     // Rico SS (V2RayPlugin && obfs)
                     14 => 'getTrojanItem',          // Trojan
                 ];
@@ -282,7 +281,7 @@ class URL
             // 其他类型单端口节点 End
 
             // SS 节点
-            if (in_array($node->sort, [0, 10])) {
+            if (in_array($node->sort, [0])) {
                 // 节点非只启用单端口 && 只获取普通端口
                 if ($node->mu_only != 1 && ($is_mu == 0 || ($is_mu != 0 && $_ENV['mergeSub'] === true))) {
                     foreach ($is_ss as $ss) {
@@ -428,7 +427,7 @@ class URL
      */
     public static function getAllVMessUrl(User $user, $arrout = false, $emoji = false)
     {
-        $nodes = self::getNodes($user, [11, 12]);
+        $nodes = self::getNodes($user, [11]);
         # 增加中转配置，后台目前配置user=0的话是自由门直接中转
         $tmp_nodes = array();
         foreach ($nodes as $node) {