diff --git a/app/Controllers/Admin/RelayController.php b/app/Controllers/Admin/RelayController.php index fca33a03..4d685ffe 100644 --- a/app/Controllers/Admin/RelayController.php +++ b/app/Controllers/Admin/RelayController.php @@ -38,7 +38,7 @@ class RelayController extends AdminController )->orderBy('name')->get(); foreach ($source_nodes as $node) { if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; + $node->name .= 'V2ray中转,Port代表中转监听端口'; } } $dist_nodes = Node::where( @@ -53,9 +53,9 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { $node_explode = Tools::v2Array($node->server); - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; + $node->name = $node->name; } else { - $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; + $node->name .= ' 如果是V2ray中转,无法食用'; } } @@ -79,9 +79,9 @@ class RelayController extends AdminController if ($source_node->sort == 12) { $rules = Relay::Where('source_node_id', $source_node_id)->get(); - if (count($rules) > 0) { + if (!Tools::relayRulePortCheck($rules)) { $rs['ret'] = 0; - $rs['msg'] = 'v2ray中转一个起点一个rule'; + $rs['msg'] = '端口冲突请,请更换一个'; return $response->getBody()->write(json_encode($rs)); } } @@ -164,9 +164,9 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { $node_explode = Tools::v2Array($node->server); - $node->name = $node->name . ' 如果是V2ray后端 请设置成' . $node_explode['port']; + $node->name = $node->name . 'V2ray中转,Port代表中转监听端口'; } else { - $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; + $node->name .= ' 如果是V2ray中转,无法食用'; } } diff --git a/app/Controllers/RelayController.php b/app/Controllers/RelayController.php index 4172adf7..b7d4439b 100644 --- a/app/Controllers/RelayController.php +++ b/app/Controllers/RelayController.php @@ -126,15 +126,10 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); - foreach ($source_nodes as $node) { - if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; - } - } + $dist_nodes = Node::where( static function ($query) use ($user) { $query->Where('node_group', '=', $user->node_group) @@ -143,9 +138,7 @@ class RelayController extends UserController )->where('type', 1)->where( static function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); @@ -164,16 +157,6 @@ class RelayController extends UserController } } - foreach ($dist_nodes as $node) { - if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::v2Array($node->server); - $ports[] = $node_explode['port']; - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; - } else { - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port; - } - } - $ports[] = $user->port; $ports = array_unique($ports); return $this->view()->assign('source_nodes', $source_nodes)->assign('dist_nodes', $dist_nodes)->assign('ports', $ports)->display('user/relay/add.tpl'); @@ -195,8 +178,7 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->first(); if ($source_node == null) { @@ -223,8 +205,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->first(); @@ -247,12 +228,7 @@ class RelayController extends UserController ->orWhere('node_group', '=', 0); } )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); - $v2ray_port_raw = ''; - if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::v2Array($dist_node->server); - $v2ray_port_raw = $node_explode['port']; - } - if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port)) { $rs['ret'] = 0; $rs['msg'] = '端口错误'; return $response->getBody()->write(json_encode($rs)); @@ -316,15 +292,10 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); - foreach ($source_nodes as $node) { - if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; - } - } + $dist_nodes = Node::where( static function ($query) use ($user) { $query->Where('node_group', '=', $user->node_group) @@ -334,8 +305,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); @@ -353,15 +323,7 @@ class RelayController extends UserController $ports[] = $port_raw->server; } } - foreach ($dist_nodes as $node) { - if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::v2Array($node->server); - $ports[] = $node_explode['port']; - $node->name = $node->name . ' 如果是V2ray后端 请设置成: ' . $node_explode['port']; - } else { - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port; - } - } + $ports[] = $user->port; $ports = array_unique($ports); @@ -390,8 +352,7 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->first(); if ($source_node == null) { @@ -409,8 +370,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->first(); @@ -433,12 +393,7 @@ class RelayController extends UserController ->orWhere('node_group', '=', 0); } )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); - $v2ray_port_raw = ''; - if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::v2Array($dist_node->server); - $v2ray_port_raw = $node_explode['port']; - } - if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port)) { $rs['ret'] = 0; $rs['msg'] = '端口错误'; return $response->getBody()->write(json_encode($rs)); diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php index d0350cb3..a6603f87 100644 --- a/app/Utils/Tools.php +++ b/app/Utils/Tools.php @@ -386,6 +386,13 @@ class Tools } return $object; } + public static function relayRulePortCheck($rules){ + $res = array(); + foreach($rules as $value) { + $res[$value->port][] = $value->port; + } + return count($res)==count($rules); + } public static function getRelayNodeIp($source_node, $dist_node) {