From 177e2f41cb59a5533245258323bbf9a793fab66c Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 15 Apr 2019 08:22:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Clash=20=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正 Clash 托管中中文被转为 Unicode 字符、Proxy 策略组中的 Auto 挪到最前面、去除 Clash for Windows 中已经内置的 cfw-bypass 规则 --- resources/conf/clash.tpl | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/resources/conf/clash.tpl b/resources/conf/clash.tpl index 587584bb..b66f2391 100644 --- a/resources/conf/clash.tpl +++ b/resources/conf/clash.tpl @@ -33,16 +33,16 @@ secret: '' Proxy: {foreach $confs as $conf} - - {json_encode($conf,JSON_UNESCAPED_SLASHES)} + - {json_encode($conf,320)} {/foreach} Proxy Group: - - { name: "Auto", type: fallback, proxies: {$proxies|json_encode}, url: "http://www.gstatic.com/generate_204", interval: 300 } -{append var='proxies' value='Auto'} - - { name: "Proxy", type: select, proxies: {$proxies|json_encode} } + - { name: "Auto", type: fallback, proxies: {json_encode($proxies,320)}, url: "http://www.gstatic.com/generate_204", interval: 300 } +{append var='proxies' value='Auto' index=0} + - { name: "Proxy", type: select, proxies: {json_encode($proxies,320)} } - { name: "Domestic", type: select, proxies: ["DIRECT","Proxy"] } {$China_media=["Domestic","Proxy"]} - - { name: "China_media", type: select, proxies: {$China_media|json_encode} } + - { name: "China_media", type: select, proxies: {json_encode($China_media,320)} } - { name: "Global_media", type: select, proxies: ["Proxy"]} - { name: "Others", type: select, proxies: ["Proxy","Domestic"]} @@ -587,30 +587,3 @@ Rule: - GEOIP,CN,Domestic - MATCH,Others - -# Clash for Windows 自定义系统代理需要绕过的域名或IP。 - -cfw-bypass: - - 'music.163.com' - - '*.music.126.net' - - localhost - - 127.* - - 10.* - - 172.16.* - - 172.17.* - - 172.18.* - - 172.19.* - - 172.20.* - - 172.21.* - - 172.22.* - - 172.23.* - - 172.24.* - - 172.25.* - - 172.26.* - - 172.27.* - - 172.28.* - - 172.29.* - - 172.30.* - - 172.31.* - - 192.168.* - - \ No newline at end of file From 966fd462fcb1c772e9bc256503b8397c3cc7e2ec Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 15 Apr 2019 08:33:08 +0800 Subject: [PATCH 2/5] bug fixes --- app/Utils/URL.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Utils/URL.php b/app/Utils/URL.php index ba7bd563..d2df2e88 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -303,7 +303,12 @@ class URL } public static function getAllVMessUrl($user, $arrout = 0) { - $nodes = Node::where('sort', 11)->orwhere('sort',12)->where( + $nodes = Node::where( + function ($query) { + $query->where('sort', 11) + ->orwhere('sort', 12); + } + )->where( function ($query) use ($user){ $query->where("node_group", "=", $user->node_group) ->orWhere("node_group", "=", 0); @@ -315,14 +320,13 @@ class URL foreach ($nodes as $node) { $result .= (URL::getV2Url($user, $node, $arrout) . "\n"); } - return $result; } else { $result = []; foreach ($nodes as $node) { array_push($result, URL::getV2Url($user, $node, $arrout)); } - return $result; } + return $result; } public static function getAllSSDUrl($user){ From 3a154a395f10093d4817ef8d7026e9b7c106939c Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 15 Apr 2019 08:33:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=20ss?= =?UTF-8?q?=20=E8=BF=9E=E6=8E=A5=E5=AF=86=E7=A0=81=E4=BC=9A=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=20V2Ray=20UUID=20=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/material/user/edit.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/material/user/edit.tpl b/resources/views/material/user/edit.tpl index eb064b6a..5ae4b08e 100755 --- a/resources/views/material/user/edit.tpl +++ b/resources/views/material/user/edit.tpl @@ -57,6 +57,8 @@ +
+

您需要了解的是,修改此密码同时也会变更您 V2Ray 节点的 UUID,请注意及时更新托管订阅。

From a3a2d00793d451c1199fe97de72aa6d0008d1d64 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 15 Apr 2019 08:39:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20sort=2013=20=E8=8A=82=E7=82=B9=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E5=9C=B0=E5=9D=80=E4=B8=8E=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E4=B8=8D=E7=AC=A6=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/UserController.php | 4 ++-- app/Controllers/VueController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 25f46bc5..87c2218c 100755 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -482,8 +482,8 @@ class UserController extends BaseController $array_node['class']=$node->node_class; $array_node['name']=$node->name; if ($node->sort == 13) { - $server = explode(';', $node->server); - $array_node['server']=$server[1]; + $server = Tools::ssv2Array($node->server); + $array_node['server']=$server['add']; } else { $array_node['server']=$node->server; } diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php index 324965b4..5bb15c64 100644 --- a/app/Controllers/VueController.php +++ b/app/Controllers/VueController.php @@ -385,8 +385,8 @@ class VueController extends BaseController $array_node['server'] = '***.***.***.***'; } else { if ($node->sort == 13) { - $server = explode(';', $node->server); - $array_node['server'] = $server[1]; + $server = Tools::ssv2Array($node->server); + $array_node['server']=$server['add']; } else { $array_node['server'] = $node->server; } From 9ab4b96c061d32e5c0e0501d37baf809b5d27ccb Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 15 Apr 2019 08:49:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20v2=20=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=9C=89=E4=BD=BF=E7=94=A8=20outside=5Fport=20?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/RelayController.php | 48 +++++++----- app/Controllers/RelayController.php | 94 ++++++++++++++--------- 2 files changed, 87 insertions(+), 55 deletions(-) diff --git a/app/Controllers/Admin/RelayController.php b/app/Controllers/Admin/RelayController.php index 3bd449e8..c8ec6b64 100644 --- a/app/Controllers/Admin/RelayController.php +++ b/app/Controllers/Admin/RelayController.php @@ -30,7 +30,12 @@ class RelayController extends AdminController public function create($request, $response, $args) { $user = Auth::getUser(); - $source_nodes = Node::where('sort', 10)->orwhere("sort",12)->orderBy('name')->get(); + $source_nodes = Node::where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->orderBy('name')->get(); foreach($source_nodes as $node){ if ($node->sort==12){ $node->name = $node->name." 正在使用V2ray后端 "; @@ -39,23 +44,21 @@ class RelayController extends AdminController $dist_nodes = Node::where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->orderBy('name')->get(); foreach ($dist_nodes as $node){ if ($node->sort==11 or $node->sort==12){ - $node_explode = explode(';', $node->server); - if ($node_explode[1]=="" || $node_explode[1]=="0"){ - $node_explode[1]="443"; - } - $node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode[1]; + $node_explode = Tools::ssv2Array($node->server); + $node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode['port']; }else { $node->name = $node->name." 如果是V2ray后端 请不要设置,用户页面设置 "; } } - return $this->view()->assign('source_nodes', $source_nodes)->assign('dist_nodes', $dist_nodes)->display('admin/relay/add.tpl'); } @@ -137,7 +140,12 @@ class RelayController extends AdminController exit(0); } - $source_nodes = Node::where('sort', 10)->orwhere('sort',12)->orderBy('name')->get(); + $source_nodes = Node::where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->orderBy('name')->get(); foreach($source_nodes as $node){ if ($node->sort==12){ $node->name = $node->name." 正在使用V2ray后端 "; @@ -147,17 +155,16 @@ class RelayController extends AdminController $dist_nodes = Node::where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->orderBy('name')->get(); foreach ($dist_nodes as $node){ if ($node->sort==11 or $node->sort==12){ - $node_explode = explode(';', $node->server); - if ($node_explode[1]=="" || $node_explode[1]=="0"){ - $node_explode[1]="443"; - } - $node->name = $node->name." 如果是V2ray后端 请设置成".$node_explode[1]; + $node_explode = Tools::ssv2Array($node->server); + $node->name = $node->name." 如果是V2ray后端 请设置成".$node_explode['port']; }else { $node->name = $node->name." 如果是V2ray后端 请不要设置,用户页面设置 "; } @@ -267,9 +274,14 @@ class RelayController extends AdminController $nodes = Node::where( function ($query) use ($user) { $query->Where("node_group", "=", $user->node_group) - ->orWhere("node_group", "=", 0); + ->orWhere("node_group", "=", 0); + } + )->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); } - )->where("sort", "=", 10)-orwhere("sort","=",12)->where("node_class", "<=", $user->class)->orderBy('name')->get(); + )->where("node_class", "<=", $user->class)->orderBy('name')->get(); $pathset = new \ArrayObject(); @@ -366,4 +378,4 @@ class RelayController extends AdminController $body = $response->getBody(); $body->write($datatables->generate()); } -} +} \ No newline at end of file diff --git a/app/Controllers/RelayController.php b/app/Controllers/RelayController.php index 8b284681..14445ea7 100644 --- a/app/Controllers/RelayController.php +++ b/app/Controllers/RelayController.php @@ -29,9 +29,14 @@ class RelayController extends UserController $nodes = Node::where( function ($query) use ($user) { $query->Where("node_group", "=", $user->node_group) - ->orWhere("node_group", "=", 0); + ->orWhere("node_group", "=", 0); } - )->where('type', 1)->where("sort", "=", 10)->orwhere("sort","=",12)->where("node_class", "<=", $user->class)->orderBy('name')->get(); + )->where('type', 1)->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->where("node_class", "<=", $user->class)->orderBy('name')->get(); $pathset = new \ArrayObject(); @@ -119,7 +124,12 @@ class RelayController extends UserController $query->Where("node_group", "=", $user->node_group) ->orWhere("node_group", "=", 0); } - )->where('type', 1)->where('sort', 10)->orwhere('sort',12)->where("node_class", "<=", $user->class)->orderBy('name')->get(); + )->where('type', 1)->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->where("node_class", "<=", $user->class)->orderBy('name')->get(); foreach($source_nodes as $node){ if ($node->sort==12){ $node->name = $node->name." 正在使用V2ray后端 "; @@ -133,7 +143,9 @@ class RelayController extends UserController )->where('type', 1)->where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->where("node_class", "<=", $user->class)->orderBy('name')->get(); @@ -154,12 +166,9 @@ class RelayController extends UserController foreach ($dist_nodes as $node){ if ($node->sort==11 or $node->sort==12){ - $node_explode = explode(';', $node->server); - if ($node_explode[1]=="" || $node_explode[1]=="0"){ - $node_explode[1]="443"; - } - array_push($ports, $node_explode[1]); - $node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode[1]; + $node_explode = Tools::ssv2Array($node->server); + array_push($ports, $node_explode['port']); + $node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode['port']; }else { $node->name = $node->name." 如果是V2ray后端 请设置成 ".$user->port; } @@ -184,7 +193,12 @@ class RelayController extends UserController $query->Where("node_group", "=", $user->node_group) ->orWhere("node_group", "=", 0); } - )->where('type', 1)->where('sort', 10)->orwhere('sort',12)->where("node_class", "<=", $user->class)->first(); + )->where('type', 1)->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->where("node_class", "<=", $user->class)->first(); if ($source_node == null) { $rs['ret'] = 0; $rs['msg'] = "起源节点错误"; @@ -208,7 +222,9 @@ class RelayController extends UserController )->where('type', 1)->where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->where("node_class", "<=", $user->class)->first(); @@ -225,7 +241,6 @@ class RelayController extends UserController return $response->getBody()->write(json_encode($rs)); } - $port_raw = Node::where('server', $port)->where( function ($query) use ($user) { $query->Where("node_group", "=", $user->node_group) @@ -234,19 +249,16 @@ class RelayController extends UserController )->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 = explode(';', $dist_node->server); - $v2ray_port_raw= $node_explode[1]; - if ($v2ray_port_raw=="" || $v2ray_port_raw=="0"){ - $v2ray_port_raw="443"; - } + $node_explode = Tools::ssv2Array($dist_node->server); + $v2ray_port_raw = $node_explode['port']; } - if (($port_raw == null && $port != $user->port)||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port && $v2ray_port_raw=="")||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) { $rs['ret'] = 0; $rs['msg'] = "端口错误"; return $response->getBody()->write(json_encode($rs)); } - if (!Tools::is_protocol_relay($user)) { + if (!Tools::is_protocol_relay($user)) { $rs['ret'] = 0; $rs['msg'] = "为了中转的稳定,您需要在资料编辑处设置协议为 auth_aes128_md5 或 auth_aes128_sha1 后方可设置中转规则!"; return $response->getBody()->write(json_encode($rs)); @@ -302,7 +314,12 @@ class RelayController extends UserController $query->Where("node_group", "=", $user->node_group) ->orWhere("node_group", "=", 0); } - )->where('type', 1)->where('sort', 10)->orwhere("sort",12)->where("node_class", "<=", $user->class)->orderBy('name')->get(); + )->where('type', 1)->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->where("node_class", "<=", $user->class)->orderBy('name')->get(); foreach($source_nodes as $node){ if ($node->sort==12){ $node->name = $node->name." 正在使用V2ray后端 "; @@ -316,7 +333,9 @@ class RelayController extends UserController )->where('type', 1)->where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->where("node_class", "<=", $user->class)->orderBy('name')->get(); @@ -336,12 +355,9 @@ class RelayController extends UserController } foreach ($dist_nodes as $node){ if ($node->sort==11 or $node->sort==12){ - $node_explode = explode(';', $node->server); - if ($node_explode[1]=="" || $node_explode[1]=="0"){ - $node_explode[1]="443"; - } - array_push($ports, $node_explode[1]); - $node->name = $node->name." 如果是V2ray后端 请设置成: ".$node_explode[1]; + $node_explode = Tools::ssv2Array($node->server); + array_push($ports, $node_explode['port']); + $node->name = $node->name." 如果是V2ray后端 请设置成: ".$node_explode['port']; }else { $node->name = $node->name." 如果是V2ray后端 请设置成 ".$user->port; } @@ -372,7 +388,12 @@ class RelayController extends UserController $query->Where("node_group", "=", $user->node_group) ->orWhere("node_group", "=", 0); } - )->where('type', 1)->where('sort', 10)->orwhere("sort",12)->where("node_class", "<=", $user->class)->first(); + )->where('type', 1)->where( + function ($query) { + $query->Where('sort', 10) + ->orWhere('sort', 12); + } + )->where("node_class", "<=", $user->class)->first(); if ($source_node == null) { $rs['ret'] = 0; $rs['msg'] = "起源节点错误"; @@ -387,7 +408,9 @@ class RelayController extends UserController )->where('type', 1)->where( function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11); + ->orWhere('sort', 10) + ->orWhere('sort', 11) + ->orWhere('sort', 12); } )->where("node_class", "<=", $user->class)->first(); @@ -412,13 +435,10 @@ class RelayController extends UserController )->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 = explode(';', $dist_node->server); - $v2ray_port_raw= $node_explode[1]; - if ($v2ray_port_raw=="" || $v2ray_port_raw=="0"){ - $v2ray_port_raw="443"; - } + $node_explode = Tools::ssv2Array($dist_node->server); + $v2ray_port_raw= $node_explode['port']; } - if (($port_raw == null && $port != $user->port)||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port && $v2ray_port_raw=="" )||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) { $rs['ret'] = 0; $rs['msg'] = "端口错误"; return $response->getBody()->write(json_encode($rs)); @@ -482,4 +502,4 @@ class RelayController extends UserController $rs['msg'] = "删除成功"; return $response->getBody()->write(json_encode($rs)); } -} +} \ No newline at end of file