From 17bd5111ec2240c23ecb6df2eff7f177b595490a Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4PAC=20PLUS=20PLUS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/NodeController.php | 9 --- app/Controllers/LinkController.php | 31 -------- app/Controllers/UserController.php | 31 -------- .../views/material/admin/node/create.tpl | 3 - resources/views/material/admin/node/edit.tpl | 3 - resources/views/material/user/nodeinfopac.tpl | 78 ------------------- .../views/material/user/nodeinfopacplus.tpl | 76 ------------------ .../views/material/user/nodeinfopacpp.tpl | 76 ------------------ 8 files changed, 307 deletions(-) delete mode 100644 resources/views/material/user/nodeinfopac.tpl delete mode 100644 resources/views/material/user/nodeinfopacplus.tpl delete mode 100644 resources/views/material/user/nodeinfopacpp.tpl diff --git a/app/Controllers/Admin/NodeController.php b/app/Controllers/Admin/NodeController.php index 729b7180..2f16fd2d 100644 --- a/app/Controllers/Admin/NodeController.php +++ b/app/Controllers/Admin/NodeController.php @@ -269,18 +269,9 @@ class NodeController extends AdminController case 2: $sort = 'SSH'; break; - case 3: - $sort = 'PAC'; - break; case 5: $sort = 'Anyconnect'; break; - case 7: - $sort = 'PAC PLUS(Socks 代理生成 PAC文件)'; - break; - case 8: - $sort = 'PAC PLUS PLUS(HTTPS 代理生成 PAC文件)'; - break; case 9: $sort = 'Shadowsocks - 单端口多用户'; break; diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index c53d987d..e6c2daf5 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -37,24 +37,6 @@ class LinkController extends BaseController return "couldn't alloc token"; } - public static function GenerateCode($type, $address, $port, $ios, $userid) - { - $Elink = Link::where("type", "=", $type)->where("address", "=", $address)->where("port", "=", $port)->where("ios", "=", $ios)->where("userid", "=", $userid)->first(); - if ($Elink != null) { - return $Elink->token; - } - $NLink = new Link(); - $NLink->type = $type; - $NLink->address = $address; - $NLink->port = $port; - $NLink->ios = $ios; - $NLink->userid = $userid; - $NLink->token = LinkController::GenerateRandomLink(); - $NLink->save(); - - return $NLink->token; - } - public static function GenerateAclCode($address, $port, $userid, $geo, $method) { $Elink = Link::where("type", "=", 9)->where("address", "=", $address)->where("port", "=", $port)->where("userid", "=", $userid)->where("geo", "=", $geo)->where("method", "=", $method)->first(); @@ -126,19 +108,6 @@ class LinkController extends BaseController } switch ($Elink->type) { - case 3: - $type = "PROXY"; - break; - case 7: - $type = "PROXY"; - break; - case 8: - if ($Elink->ios==0) { - $type = "SOCKS5"; - } else { - $type = "SOCKS"; - } - break; case 9: $newResponse = $response->withHeader('Content-type', ' application/octet-stream; charset=utf-8')->withHeader('Cache-Control', 'no-store, no-cache, must-revalidate')->withHeader('Content-Disposition', ' attachment; filename='.$token.'.acl');//->getBody()->write($builder->output()); $newResponse->getBody()->write(LinkController::GetAcl(User::where("id", "=", $Elink->userid)->first())); diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index debe0823..25949616 100755 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -721,17 +721,6 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfossh.tpl'); } break; - case 3: - if ($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) { - $email = $this->user->email; - $email = Radius::GetUserName($email); - $exp = explode(":", $node->server); - $token = LinkController::GenerateCode(3, $exp[0], $exp[1], 0, $this->user->id); - $json_show = "PAC 信息
地址:" . Config::get('baseUrl') . "/link/" . $token . "
" . "用户名:" . $email . "
密码:" . $this->user->passwd . "
支持方式:" . $node->method . "
备注:" . $node->info; - - return $this->view()->assign('json_show', $json_show)->display('user/nodeinfopac.tpl'); - } - break; case 5: if ($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) { $email = $this->user->email; @@ -742,26 +731,6 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfoanyconnect.tpl'); } break; - case 7: - if ($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) { - $email = $this->user->email; - $email = Radius::GetUserName($email); - $token = LinkController::GenerateCode(7, $node->server, ($this->user->port - 20000), 0, $this->user->id); - $json_show = "PAC Plus 信息
PAC 地址:" . Config::get('baseUrl') . "/link/" . $token . "
支持方式:" . $node->method . "
备注:" . $node->info; - return $this->view()->assign('json_show', $json_show)->display('user/nodeinfopacplus.tpl'); - } - break; - case 8: - if ($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) { - $email = $this->user->email; - $email = Radius::GetUserName($email); - $token = LinkController::GenerateCode(8, $node->server, ($this->user->port - 20000), 0, $this->user->id); - $token_ios = LinkController::GenerateCode(8, $node->server, ($this->user->port - 20000), 1, $this->user->id); - $json_show = "PAC Plus Plus信息
PAC 一般地址:" . Config::get('baseUrl') . "/link/" . $token . "
PAC iOS 地址:" . Config::get('baseUrl') . "/link/" . $token_ios . "
" . "备注:" . $node->info; - - return $this->view()->assign('json_show', $json_show)->display('user/nodeinfopacpp.tpl'); - } - break; case 10: if ((($user->class >= $node->node_class && ($user->node_group == $node->node_group || $node->node_group == 0)) || $user->is_admin) && ($node->node_bandwidth_limit == 0 || $node->node_bandwidth < $node->node_bandwidth_limit)) { return $this->view()->assign('node', $node)->assign('user', $user)->assign('mu', $mu)->assign('relay_rule_id', $relay_rule_id)->registerClass("URL", "App\Utils\URL")->display('user/nodeinfo.tpl'); diff --git a/resources/views/material/admin/node/create.tpl b/resources/views/material/admin/node/create.tpl index b2f8859b..98fd0b3b 100644 --- a/resources/views/material/admin/node/create.tpl +++ b/resources/views/material/admin/node/create.tpl @@ -102,10 +102,7 @@ - - - diff --git a/resources/views/material/admin/node/edit.tpl b/resources/views/material/admin/node/edit.tpl index b0c86e99..c9ab30c1 100644 --- a/resources/views/material/admin/node/edit.tpl +++ b/resources/views/material/admin/node/edit.tpl @@ -104,10 +104,7 @@ - - - diff --git a/resources/views/material/user/nodeinfopac.tpl b/resources/views/material/user/nodeinfopac.tpl deleted file mode 100644 index 2fecc38a..00000000 --- a/resources/views/material/user/nodeinfopac.tpl +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - -{include file='user/header_info.tpl'} - - - - - - - -
-
-
-

节点信息

-
-
-
-
-
-
-
-
-
-
-

注意!

-

下面为您的 PAC 配置。

-
- -
-
-
-
-
-
-
-

配置信息

-

{$json_show}

-
- -
-
-
- -
-
-
-
-

配置方法

-

Android:打开设置-WLAN-长按要使用的wifi-弹出窗口-点击修改网络-展开高级选项-代理框中选择代理自动配置-PAC网址中填写配置信息所给出的地址-保存。连接时会提示输入用户名密码,按照配置信息输入即可。

-

iOS:打开设置-无线局域网-点击需要使用的wifi右侧蓝色修改按钮-在新打开的页面中-HTTP代理选择自动-URL框中填写配置信息所给出的地址-保存。连接时会提示输入用户名密码,按照配置信息输入即可。

-

Windows:打开控制面板-在查看方式中选择小图标或大图标-打开Internet选项-在连接选项卡上单击局域网设置-在自动配置中选择使用自动脚本,并将配置信息中给出的地址填写到地址一栏中-之后点击确定-应用。连接时会提示输入用户名密码,按照配置信息输入即可。

-
- -
-
-
- -
-
-
-
-
- - - - - - - -{include file='user/footer.tpl'} - - - - diff --git a/resources/views/material/user/nodeinfopacplus.tpl b/resources/views/material/user/nodeinfopacplus.tpl deleted file mode 100644 index cc11bc3e..00000000 --- a/resources/views/material/user/nodeinfopacplus.tpl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -{include file='user/header_info.tpl'} - - - - - - - -
-
-
-

节点信息

-
-
-
-
-
-
-
-
-
-
-

注意!

-

下面为您的 Pac Plus 配置。

-
- -
-
-
-
-
-
-
-

配置信息

-

{$json_show}

-
- -
-
-
- -
-
-
-
-

配置方法

-

未完待续

-
- -
-
-
- -
-
-
-
-
- - - - - - - -{include file='user/footer.tpl'} - - - - diff --git a/resources/views/material/user/nodeinfopacpp.tpl b/resources/views/material/user/nodeinfopacpp.tpl deleted file mode 100644 index 250e815f..00000000 --- a/resources/views/material/user/nodeinfopacpp.tpl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -{include file='user/header_info.tpl'} - - - - - - - -
-
-
-

节点信息

-
-
-
-
-
-
-
-
-
-
-

注意!

-

下面为您的 Pac Plus Plus 配置。

-
- -
-
-
-
-
-
-
-

配置信息

-

{$json_show}

-
- -
-
-
- -
-
-
-
-

配置方法

-

未完待续

-
- -
-
-
- -
-
-
-
-
- - - - - - - -{include file='user/footer.tpl'} - - - -