From 6c3e12aecdfae29b9cceeb3f96d44b19cc0945a9 Mon Sep 17 00:00:00 2001 From: dumplin233 <1277385101@qq.com> Date: Fri, 18 May 2018 10:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8A=82=E7=82=B9=E5=90=88?= =?UTF-8?q?=E7=A7=9F=E6=A8=A1=E5=BC=8F=E5=92=8CNAT=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/NodeController.php | 72 ++++++++++++++++++ app/Controllers/UserController.php | 19 ++++- app/Utils/URL.php | 26 +++++++ .../views/material/admin/node/create.tpl | 61 +++++++++++++++ resources/views/material/admin/node/edit.tpl | 69 ++++++++++++++++- resources/views/material/user/node.tpl | 74 ++++++++++++++++++- 6 files changed, 316 insertions(+), 5 deletions(-) diff --git a/app/Controllers/Admin/NodeController.php b/app/Controllers/Admin/NodeController.php index 9466d9a8..d487655a 100644 --- a/app/Controllers/Admin/NodeController.php +++ b/app/Controllers/Admin/NodeController.php @@ -52,6 +52,31 @@ class NodeController extends AdminController $node->node_speedlimit = $request->getParam('node_speedlimit'); $node->status = $request->getParam('status'); $node->sort = $request->getParam('sort'); + $offset_mode = $request->getParam('offset_mode'); + $offset = $request->getParam('offset'); + $muport = $request->getParam('muport'); + $subscribe = $request->getParam('subscribe'); + + if ($offset_mode == 1) { + if (is_numeric($offset)) { + $node->name .= ' : '.$offset; + } else { + $rs['ret'] = 0; + $rs['msg'] = "请输入正确的端口偏移值"; + return $response->getBody()->write(json_encode($rs)); + } + } + + if ($offset_mode == 2) { + if (is_numeric($muport) && is_numeric($subscribe)) { + $node->name .= ' : '.$muport.'=>'.$subscribe; + } else { + $rs['ret'] = 0; + $rs['msg'] = "请输入正确的内网端口或公网端口"; + return $response->getBody()->write(json_encode($rs)); + } + } + if ($node->sort == 0 || $node->sort == 1 || $node->sort == 10 || $node->sort == 11) { if ($request->getParam('node_ip') != '') { $node->node_ip = $request->getParam('node_ip'); @@ -91,6 +116,24 @@ class NodeController extends AdminController { $id = $args['id']; $node = Node::find($id); + $temp = explode(' : ', $node->name); + $node->offset_mode = 0; + if (isset($temp[1])) { + $node->name = $temp[0]; + if (is_numeric($temp[1])) { + $node->offset = $temp[1]; + $node->mu_only = -1; + $node->offset_mode = 1; + } else { + $temp = explode('=>', $temp[1]); + if (is_numeric($temp[0]) && is_numeric($temp[1])) { + $node->mu_only = 1; + $node->muport = $temp[0]; + $node->subscribe = $temp[1]; + $node->offset_mode = 2; + } + } + } if ($node == null) { } return $this->view()->assign('node', $node)->display('admin/node/edit.tpl'); @@ -113,6 +156,30 @@ class NodeController extends AdminController $node->node_speedlimit = $request->getParam('node_speedlimit'); $node->type = $request->getParam('type'); $node->sort = $request->getParam('sort'); + $offset_mode = $request->getParam('offset_mode'); + $offset = $request->getParam('offset'); + $muport = $request->getParam('muport'); + $subscribe = $request->getParam('subscribe'); + + if ($offset_mode == 1) { + if (is_numeric($offset)) { + $node->name .= ' : '.$offset; + } else { + $rs['ret'] = 0; + $rs['msg'] = "请输入正确的端口偏移值"; + return $response->getBody()->write(json_encode($rs)); + } + } + + if ($offset_mode == 2) { + if (is_numeric($muport) && is_numeric($subscribe)) { + $node->name .= ' : '.$muport.'=>'.$subscribe; + } else { + $rs['ret'] = 0; + $rs['msg'] = "请输入正确的内网端口或公网端口"; + return $response->getBody()->write(json_encode($rs)); + } + } if ($node->sort == 0 || $node->sort == 1 || $node->sort == 10 || $node->sort == 11) { if ($request->getParam('node_ip') != '') { @@ -226,6 +293,11 @@ class NodeController extends AdminController 删除'; }); + $datatables->edit('name', function ($data) { + $temp = explode(' : ', $data['name']); + return $temp[0]; + }); + $datatables->edit('node_bandwidth', function ($data) { return Tools::flowToGB($data['node_bandwidth']); }); diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 2ff94107..ab4f9114 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -581,7 +581,8 @@ class UserController extends BaseController { $id = $args['id']; $point_node=Node::find($id); - $prefix=explode(" - ", $point_node->name); + $temp = explode(' : ', $point_node->name); + $prefix=explode(" - ", $prefix[0]); return $this->view()->assign('point_node', $point_node)->assign('prefix', $prefix[0])->assign('id', $id)->display('user/nodeajax.tpl'); } @@ -617,6 +618,22 @@ class UserController extends BaseController foreach ($nodes as $node) { if (((($user->node_group==$node->node_group||$node->node_group==0))||$user->is_admin)&&(!$node->isNodeTrafficOut())) { + $temp = explode(' : ', $node->name); + if (isset($temp[1])) { + $node->name = $temp[0]; + if (is_numeric($temp[1])) { + $node->offset = $temp[1]; + $node->mu_only = -1; + } else { + $temp = explode('=>', $temp[1]); + if (is_numeric($temp[0]) && is_numeric($temp[1])) { + $node->mu_only = 1; + $node->muport = $temp[0]; + $node->subscribe = $temp[1]; + } + } + } + if ($node->sort==9) { $mu_user=User::where('port', '=', $node->server)->first(); $mu_user->obfs_param=$this->user->getMuMd5(); diff --git a/app/Utils/URL.php b/app/Utils/URL.php index e69e1f93..13bff175 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -167,6 +167,22 @@ class URL $relay_rules = array(); } foreach ($nodes as $node) { + $temp = explode(' : ', $node->name); + if (isset($temp[1])) { + $node->name = $temp[0]; + if (is_numeric($temp[1])) { + $node->offset = $temp[1]; + $node->mu_only = -1; + } else { + $temp = explode('=>', $temp[1]); + if (is_numeric($temp[0]) && is_numeric($temp[1])) { + $node->mu_only = 1; + $node->muport = $temp[0]; + $node->subscribe = $temp[1]; + } + } + } + if ($node->mu_only != 1 && $is_mu == 0) { if ($node->sort == 10) { $relay_rule_id = 0; @@ -324,6 +340,12 @@ class URL if ($mu_user == null) { return; } + if (isset($node->subscribe)) { + if ($node->muport != $mu_port) { + return; + } + $mu_user->port = $node->subscribe; + } $mu_user->obfs_param = $user->getMuMd5(); $mu_user->protocol_param = $user->id.":".$user->passwd; $user = $mu_user; @@ -340,6 +362,10 @@ class URL } $user = URL::getSSRConnectInfo($user); } + + if (isset($node->offset)) { + $user->port = $user->port + $node->offset; + } $return_array['address'] = $node->server; $return_array['port'] = $user->port; $return_array['passwd'] = $user->passwd; diff --git a/resources/views/material/admin/node/create.tpl b/resources/views/material/admin/node/create.tpl index 478b58e6..a62e5655 100644 --- a/resources/views/material/admin/node/create.tpl +++ b/resources/views/material/admin/node/create.tpl @@ -73,6 +73,40 @@ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ @@ -192,6 +226,33 @@ {include file='admin/footer.tpl'} + + {literal} {literal}