From 0d0884a2c20f88ed57d6a069ff409ed16b30e8e1 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Tue, 12 Feb 2019 14:43:30 +0800 Subject: [PATCH 01/12] Update HomeController.php --- app/Controllers/HomeController.php | 51 ++++++++++++------------------ 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/app/Controllers/HomeController.php b/app/Controllers/HomeController.php index acbcd068..71c7043b 100644 --- a/app/Controllers/HomeController.php +++ b/app/Controllers/HomeController.php @@ -154,92 +154,81 @@ class HomeController extends BaseController if (!$user->isLogin) { $msg = "₍₍ ◝(・ω・)◟ ⁾⁾ 您没有登录噢,登录之后再刷新就阔以了啦"; } else { - $subUrl = Config::get('subUrl') . LinkController::GenerateSSRSubCode($user->id, 0); + $subInfo = LinkController::GetSubinfo($user, 0); switch ($request->getParam('type')) { case 'ss': $msg = "``` -个人端口:" . $subUrl . "?sub=2&mu=0 -公共端口:" . $subUrl . "?sub=2&mu=1 +订阅链接:" . $subInfo['ss'] . " ```"; break; case 'ssr': $msg = "``` -个人端口:" . $subUrl . "?sub=1&mu=0 -公共端口:" . $subUrl . "?sub=1&mu=1 +订阅链接:" . $subInfo['ssr'] . " ```"; break; case 'v2ray': // v2rayN 格式 $msg = "``` -公共端口:" . $subUrl . "?sub=3 +订阅链接:" . $subInfo['v2ray'] . " ```"; break; // APPs~ case 'ssd': $msg = "``` -个人端口:" . $subUrl . "?ssd=1&mu=0 -公共端口:" . $subUrl . "?ssd=1&mu=1 +订阅链接:" . $subInfo['ssd'] . " ```"; break; case 'clash': $msg = "``` -个人端口:" . $subUrl . "?clash=1&mu=0 -公共端口:" . $subUrl . "?clash=1&mu=1 +订阅链接:" . $subInfo['clash'] . " ```"; break; case 'surge': $msg = "``` // Surge Version 2.x -个人端口:" . $subUrl . "?surge=2&mu=0 -公共端口:" . $subUrl . "?surge=2&mu=1 +订阅链接:" . $subInfo['surge2'] . " // Surge Version 3.x -个人端口:" . $subUrl . "?surge=3&mu=0 -公共端口:" . $subUrl . "?surge=3&mu=1 +订阅链接:" . $subInfo['surge3'] . " ```"; break; case 'kitsunebi': $msg = "``` // 合并订阅,包含 ss、v2ray -个人端口:" . $subUrl . "?sub=4&mu=0 -公共端口:" . $subUrl . "?sub=4&mu=1 +订阅链接:" . $subInfo['v2ray_ss'] . " // v2ray 订阅 -公共端口:" . $subUrl . "?sub=3 +订阅链接:" . $subInfo['v2ray'] . " ```"; break; case 'surfboard': $msg = "``` -个人端口:" . $subUrl . "?surfboard=1&mu=0 -公共端口:" . $subUrl . "?surfboard=1&mu=1 +订阅链接:" . $subInfo['surfboard'] . " ```"; break; case 'quantumult_sub': // Quantumult V2ray 专属格式 $msg = "``` // ssr 订阅 -个人端口:" . $subUrl . "?sub=1&mu=0 -公共端口:" . $subUrl . "?sub=1&mu=1 +订阅链接:" . $subInfo['ssr'] . " // V2ray 订阅 -公共端口:" . $subUrl . "?quantumult=1 +订阅链接:" . $subInfo['quantumult_v2'] . " ```"; break; case 'quantumult_conf': $msg = "``` // 导入 ss、ssr、v2ray 以及分流规则的配置 -个人端口[全部订阅]:" . $subUrl . "?quantumult=2&mu=0 -公共端口[全部订阅]:" . $subUrl . "?quantumult=2&mu=1 -// 使用自定义策略组的配置,类似 Surge -个人端口[全部订阅]:" . $subUrl . "?quantumult=3&mu=0 -公共端口[全部订阅]:" . $subUrl . "?quantumult=3&mu=1 +订阅链接:" . $subInfo['quantumult_sub'] . " +// 使用自定义策略组的配置,类似 Surge、Clash +订阅链接:" . $subInfo['quantumult_conf'] . " ```"; break; case 'shadowrocket': $msg = "``` // ssr 订阅 -个人端口:" . $subUrl . "?sub=1&mu=0 -公共端口:" . $subUrl . "?sub=1&mu=1 +订阅链接:" . $subInfo['ssr'] . " +// v2ray 订阅 +订阅链接:" . $subInfo['v2ray'] . " // 合并订阅,包含 ss、ssr、v2ray -个人端口:" . $subUrl . "?sub=5&mu=0 -公共端口:" . $subUrl . "?sub=5&mu=1 +订阅链接:" . $subInfo['v2ray_ss_ssr'] . " ```"; break; default: From 0c060eebc43492472c57553a49c6a99903b6708b Mon Sep 17 00:00:00 2001 From: GeekQu Date: Tue, 12 Feb 2019 18:05:01 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8A=A0=E5=9B=9E=20ss=20&=20ssd=20?= =?UTF-8?q?=E7=9A=84=E5=85=A8=E9=83=A8=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/material/user/index.tpl | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index 55ca0efd..58d278a2 100644 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -12,7 +12,7 @@ {$ss_url_all = URL::getAllUrl($pre_user, 0, 2)} {$ss_url_all_mu = URL::getAllUrl($pre_user, 1, 1)} -{$ssd_url_all =URL::getAllSSDUrl($user)} +{$ssd_url_all = URL::getAllSSDUrl($user)} {$v2_url_all = URL::getAllVMessUrl($user)} @@ -255,27 +255,33 @@
-

filter_1 [ SSR ]:

+

filter_1 [ SS ]:

+

使用方式:how_to_vote全部 URL

+
+

filter_2 [ SSR ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


-

filter_2 [ VMess ]:

+

filter_3 [ VMess ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


如您的应用不在下方的支持列表,那么请使用上方的使用方案:


filter_1 save_alt GET SSD - [ SS ]:

教程文档:how_to_vote点击查看

-

使用方式:how_to_vote拷贝链接

+

使用方式:how_to_vote拷贝链接.how_to_vote全部 URL


filter_2 save_alt GET Clash for Windows - [ SS/VMess ]:

教程文档:how_to_vote点击查看

使用方式:how_to_vote拷贝链接.how_to_vote配置下载

-

filter_1 [ SSR ]:

+

filter_1 [ SS ]:

+

使用方式:how_to_vote全部 URL

+
+

filter_2 [ SSR ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


-

filter_2 [ VMess ]:

+

filter_3 [ VMess ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


如您的应用不在下方的支持列表,那么请使用上方的使用方案:

@@ -289,10 +295,13 @@

使用方式:how_to_vote拷贝链接.how_to_vote配置下载

-

filter_1 [ SSR ]:

+

filter_1 [ SS ]:

+

使用方式:how_to_vote全部 URL

+
+

filter_2 [ SSR ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


-

filter_2 [ VMess ]:

+

filter_3 [ VMess ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


如您的应用不在下方的支持列表,那么请使用上方的使用方案:

@@ -314,17 +323,20 @@

使用方式:how_to_voteV2 订阅.how_to_voteSSR 订阅.how_to_voteSS(R) + V2 订阅

-

filter_1 [ SSR ]:

+

filter_1 [ SS ]:

+

使用方式:how_to_vote全部 URL

+
+

filter_2 [ SSR ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


-

filter_2 [ VMess ]:

+

filter_3 [ VMess ]:

使用方式:how_to_vote订阅链接.how_to_vote全部 URL


如您的应用不在下方的支持列表,那么请使用上方的使用方案:


filter_1 save_alt GET SSD - [ SS ]:

教程文档:how_to_vote点击查看

-

使用方式:how_to_vote拷贝链接

+

使用方式:how_to_vote拷贝链接.how_to_vote全部 URL


filter_2 save_alt GET SSR - [ SSR ]:

教程文档:how_to_vote点击查看

From d65905ceebe72c22a78423602434ab7b2ed8772f Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 15 Feb 2019 17:29:10 +0800 Subject: [PATCH 03/12] =?UTF-8?q?mergeSub=20=E5=8E=BB=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/LinkController.php | 19 ++++++---------- app/Utils/URL.php | 36 +++++++----------------------- 2 files changed, 15 insertions(+), 40 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 53df5acc..2e7e3410 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -386,14 +386,12 @@ class LinkController extends BaseController $return_url = ''; // SSR if ($sub == 1) { - $return_url .= URL::getAllUrl($user, 0, 0, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 1, 0, $extend) . PHP_EOL; + $return_url .= URL::getAllUrl($user, $mu, 0, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // SS elseif ($sub == 2) { - $return_url .= URL::getAllUrl($user, 0, 1, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 1, 1, $extend) . PHP_EOL; + $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // V2 @@ -402,18 +400,15 @@ class LinkController extends BaseController } // V2 + SS elseif ($sub == 4) { - $return_url .= URL::getAllVMessUrl($user) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 0, 1, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 1, 1, $extend) . PHP_EOL; + $return_url .= URL::getAllVMessUrl($user).PHP_EOL; + $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // V2 + SS + SSR elseif ($sub == 5) { - $return_url .= URL::getAllVMessUrl($user) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 0, 0, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 1, 0, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 0, 1, $extend) . PHP_EOL; - $return_url .= URL::getAllUrl($user, 1, 1, $extend) . PHP_EOL; + $return_url .= URL::getAllVMessUrl($user).PHP_EOL; + $return_url .= URL::getAllUrl($user, $mu, 0, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } } diff --git a/app/Utils/URL.php b/app/Utils/URL.php index 524fe6c9..4ed6d184 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -246,13 +246,12 @@ class URL foreach($items as $item) { $return_url .= URL::getItemUrl($item, $is_ss).PHP_EOL; } - if(Config::get('mergeSub')=='true' and in_array($is_mu, array(0, 1))){ - $is_mu = $is_mu==0?1:0; - $items = URL::getAllItems($user, $is_mu, $is_ss); - foreach($items as $item) { - $return_url .= URL::getItemUrl($item, $is_ss).PHP_EOL; - } + $is_mu = $is_mu==0?1:0; + $items = URL::getAllItems($user, $is_mu, $is_ss); + foreach($items as $item) { + $return_url .= URL::getItemUrl($item, $is_ss).PHP_EOL; } + return $return_url; } @@ -537,9 +536,7 @@ class URL $mu_user->obfs_param = $user->getMuMd5(); $mu_user->protocol_param = $user->id.":".$user->passwd; $user = $mu_user; - if(Config::get('mergeSub')!='true'){ - $node_name .= " - ".$mu_port." 单端口"; - } + $node_name .= " - ".$mu_port." 单端口"; } if($is_ss) { if(!URL::SSCanConnect($user)) { @@ -562,9 +559,7 @@ class URL $return_array['obfs'] = $user->obfs; $return_array['obfs_param'] = $user->obfs_param; $return_array['group'] = Config::get('appName'); - if($mu_port != 0 && Config::get('mergeSub')!='true') { - $return_array['group'] .= ' - 单端口'; - } + return $return_array; } @@ -573,15 +568,9 @@ class URL return $new_user; } - public static function getUserTraffic($user, $is_mu = 0, $is_ss = 0){ - + public static function getUserTraffic($user, $is_mu = 0, $is_ss = 0) { $group_name = Config::get('appName'); - if(Config::get('mergeSub')!='true' and $is_mu == 1){ - $group_name .= ' - 单端口'; - } - if (!$is_ss) { - if(strtotime($user->expire_in)>time()){ if($user->transfer_enable==0){ $percent='0.00%'; @@ -593,7 +582,6 @@ class URL }else{ $ssurl = "www.google.com:1:auth_chain_a:chacha20:tls1.2_ticket_auth:YnJlYWt3YWxs/?obfsparam=&protoparam=&remarks=".Tools::base64_url_encode("账户已过期,请续费后使用")."&group=".Tools::base64_url_encode($group_name); } - return "ssr://".Tools::base64_url_encode($ssurl); } else { @@ -613,18 +601,12 @@ class URL public static function getUserClassExpiration($user, $is_mu = 0, $is_ss = 0){ $group_name = Config::get('appName'); - if(Config::get('mergeSub')!='true' and $is_mu == 1){ - $group_name .= ' - 单端口'; - } - if (!$is_ss) { - if(strtotime($user->expire_in)>time()){ $ssurl = "www.google.com:2:auth_chain_a:chacha20:tls1.2_ticket_auth:YnJlYWt3YWxs/?obfsparam=&protoparam=&remarks=".Tools::base64_url_encode("过期时间:".$user->class_expire)."&group=".Tools::base64_url_encode($group_name); } else { $ssurl = "www.google.com:2:auth_chain_a:chacha20:tls1.2_ticket_auth:YnJlYWt3YWxs/?obfsparam=&protoparam=&remarks=".Tools::base64_url_encode("账户已过期,请续费后使用")."&group=".Tools::base64_url_encode($group_name); } - return "ssr://".Tools::base64_url_encode($ssurl); } else { @@ -634,9 +616,7 @@ class URL }else{ $remark= "账户已过期,请续费后使用"; } - $ssurl = "ss://".Tools::base64_url_encode("chacha20:YnJlYWt3YWxs@www.google.com:1") . "#" . rawurlencode($remark); - return $ssurl; } } From 2ce018b32b6efdadd21f51ac0158bc2bf6ce1705 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 15 Feb 2019 17:41:58 +0800 Subject: [PATCH 04/12] fix bug --- app/Utils/URL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Utils/URL.php b/app/Utils/URL.php index 0788b84c..8c22a7da 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -372,7 +372,7 @@ class URL $array_all['traffic_used']=Tools::flowToGB($user->u+$user->d); $array_all['traffic_total']=Tools::flowToGB($user->transfer_enable); $array_all['expiry']=$user->class_expire; - $array_all['url']=Config::get('subUrl').LinkController::GenerateSSRSubCode($user->id, 0).'?mu=3'; + $array_all['url']=Config::get('subUrl').LinkController::GenerateSSRSubCode($user->id, 0).'?ssd=1'; $plugin_options=''; if(strpos($user->obfs,'http')!=FALSE){ $plugin_options='obfs=http'; From 8266caf023417538721855f47b64f7c153c76b80 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 15 Feb 2019 19:18:42 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uim-index-dev/src/mixins/agentMixin.js | 8 +++---- uim-index-dev/src/views/Panel.vue | 31 +------------------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/uim-index-dev/src/mixins/agentMixin.js b/uim-index-dev/src/mixins/agentMixin.js index 3c6213f1..8e745cba 100644 --- a/uim-index-dev/src/mixins/agentMixin.js +++ b/uim-index-dev/src/mixins/agentMixin.js @@ -4,16 +4,16 @@ export default { return this.subUrl + this.ssrSubToken }, suburlMu0: function () { - return this.suburlBase + '?mu=0' + return this.suburlBase + '?sub=1' }, suburlMu1: function () { - return this.suburlBase + '?mu=1' + return this.suburlBase + '?sub=1' }, suburlMu3: function () { - return this.suburlBase + '?mu=3' + return this.suburlBase + '?ssd=1' }, suburlMu2: function () { - return this.suburlBase + '?mu=2' + return this.suburlBase + '?sub=3' } }, data: function () { diff --git a/uim-index-dev/src/views/Panel.vue b/uim-index-dev/src/views/Panel.vue index f1282df0..9a8ad43b 100644 --- a/uim-index-dev/src/views/Panel.vue +++ b/uim-index-dev/src/views/Panel.vue @@ -100,7 +100,7 @@
- {{currentDlType === 'SSR' ? '普通端口:' : '订阅链接:'}} + 订阅链接
-
- 单端口: - - - - - - -
From 49efc532cb2a215a64c1cfe6fdb99fcbe2e83271 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Sat, 16 Feb 2019 01:36:13 +0800 Subject: [PATCH 06/12] Update main.tpl --- resources/views/material/user/main.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/material/user/main.tpl b/resources/views/material/user/main.tpl index 3dbf1f8e..6c1b817d 100755 --- a/resources/views/material/user/main.tpl +++ b/resources/views/material/user/main.tpl @@ -136,7 +136,7 @@
  • - + start 使用教程
  • From 98eced52fde86ced7cb56700b47647bba9b0ff1f Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 18 Feb 2019 17:55:42 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9BURL?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加一些URL传参 ## Clash - dns,1=开启、0=关闭,默认0 - secret,默认 MixsChina,如有设置将覆盖此值,请urlencode - log-level,默认 silent,如有设置将覆盖此值 --- app/Controllers/LinkController.php | 54 ++++++++++++++++------------ resources/conf/clash.tpl | 57 ++++++++++++++++++++++++------ resources/conf/quantumult.tpl | 4 +-- resources/conf/surfboard.tpl | 4 +-- resources/conf/surge.tpl | 12 ++----- 5 files changed, 84 insertions(+), 47 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 2e7e3410..3c8c8129 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -76,11 +76,6 @@ class LinkController extends BaseController return null; } - $mu = 0; - if (isset($request->getQueryParams()["mu"])) { - $mu = (int)$request->getQueryParams()["mu"]; - } - $extend = 0; if (isset($request->getQueryParams()["extend"])) { $extend = (int)$request->getQueryParams()["extend"]; @@ -92,6 +87,8 @@ class LinkController extends BaseController } // apps + $opts = []; + $ssd = 0; if (isset($request->getQueryParams()["ssd"])) { $ssd = (int)$request->getQueryParams()["ssd"]; @@ -100,6 +97,16 @@ class LinkController extends BaseController $clash = 0; if (isset($request->getQueryParams()["clash"])) { $clash = (int)$request->getQueryParams()["clash"]; + $opts['dns'] = "0"; + if (isset($request->getQueryParams()["dns"])) { + $opts['dns'] = (int)$request->getQueryParams()["dns"]; + } + if (isset($request->getQueryParams()["secret"])) { + $opts['secret'] = urldecode($request->getQueryParams()["secret"]); + } + if (isset($request->getQueryParams()["log-level"])) { + $opts['log-level'] = urldecode($request->getQueryParams()["log-level"]); + } } $surge = 0; @@ -119,32 +126,32 @@ class LinkController extends BaseController if (in_array($quantumult, array(1, 2, 3))) { $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=Quantumult.conf'); - $newResponse->getBody()->write(LinkController::GetQuantumult($user, $mu, $quantumult)); + $newResponse->getBody()->write(LinkController::GetQuantumult($user, $quantumult)); return $newResponse; } elseif (in_array($surge, array(1, 2, 3))) { $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=Surge.conf'); - $newResponse->getBody()->write(LinkController::GetSurge($user, $mu, $surge)); + $newResponse->getBody()->write(LinkController::GetSurge($user, $surge)); return $newResponse; } elseif ($surfboard == 1) { $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=Surfboard.conf'); - $newResponse->getBody()->write(LinkController::GetSurfboard($user, $mu)); + $newResponse->getBody()->write(LinkController::GetSurfboard($user)); return $newResponse; } elseif ($clash == 1) { $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=config.yml'); - $newResponse->getBody()->write(LinkController::GetClash($user, $mu)); + $newResponse->getBody()->write(LinkController::GetClash($user, $opts)); return $newResponse; } elseif ($ssd == 1) { $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=SSD.txt'); - $newResponse->getBody()->write(LinkController::GetSSD($user, $mu)); + $newResponse->getBody()->write(LinkController::GetSSD($user)); return $newResponse; } else { $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 . '.txt'); - $newResponse->getBody()->write(LinkController::GetSub($user, $mu, $sub, $extend)); + $newResponse->getBody()->write(LinkController::GetSub($user, $sub, $extend)); return $newResponse; } } @@ -179,7 +186,7 @@ class LinkController extends BaseController return $return_info; } - public static function GetSurge($user, $mu = 0, $surge = 0) + public static function GetSurge($user, $surge = 0) { $subInfo = LinkController::GetSubinfo($user, $surge); $userapiUrl = $subInfo['surge']; @@ -209,7 +216,7 @@ class LinkController extends BaseController } } - public static function GetQuantumult($user, $mu = 0, $quantumult = 0) + public static function GetQuantumult($user, $quantumult = 0) { $subInfo = LinkController::GetSubinfo($user, 0); $proxys = []; @@ -263,7 +270,7 @@ class LinkController extends BaseController $quan_proxy_group = base64_encode("🍃 Proxy : static, 🏃 Auto\n🏃 Auto\n🚀 Direct\n" . $ss_name . $ssr_name . $v2ray_name); $quan_auto_group = base64_encode("🏃 Auto : auto\n" . $ss_name . $ssr_name . $v2ray_name); $quan_domestic_group = base64_encode("🍂 Domestic : static, 🚀 Direct\n🚀 Direct\n🍃 Proxy"); - $quan_others_group = base64_encode("☁️ Others : static, 🚀 Direct\n🚀 Direct\n🍃 Proxy"); + $quan_others_group = base64_encode("☁️ Others : static, 🍃 Proxy\n🚀 Direct\n🍃 Proxy"); $quan_apple_group = base64_encode("🍎 Only : static, 🚀 Direct\n🚀 Direct\n🍃 Proxy"); $quan_direct_group = base64_encode("🚀 Direct : static, DIRECT\nDIRECT"); $proxys = [ @@ -294,7 +301,7 @@ class LinkController extends BaseController return $render->fetch('quantumult.tpl'); } - public static function GetSurfboard($user, $mu = 0) + public static function GetSurfboard($user) { $subInfo = LinkController::GetSubinfo($user, 0); $userapiUrl = $subInfo['surfboard']; @@ -313,7 +320,7 @@ class LinkController extends BaseController return $render->fetch('surfboard.tpl'); } - public static function GetClash($user, $mu = 0) + public static function GetClash($user, $opts) { $subInfo = LinkController::GetSubinfo($user, 0); $userapiUrl = $subInfo['clash']; @@ -369,6 +376,7 @@ class LinkController extends BaseController $render = ConfRender::getTemplateRender(); $render->assign('user', $user) ->assign('userapiUrl', $userapiUrl) + ->assign('opts', $opts) ->assign('confs', $confs) ->assign('proxies', array_map(function ($conf) { return $conf['name']; @@ -376,22 +384,22 @@ class LinkController extends BaseController return $render->fetch('clash.tpl'); } - public static function GetSSD($user, $mu = 0) + public static function GetSSD($user) { return URL::getAllSSDUrl($user); } - public static function GetSub($user, $mu = 0, $sub, $extend) + public static function GetSub($user, $sub, $extend) { $return_url = ''; // SSR if ($sub == 1) { - $return_url .= URL::getAllUrl($user, $mu, 0, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, 0, 0, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // SS elseif ($sub == 2) { - $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, 0, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // V2 @@ -401,14 +409,14 @@ class LinkController extends BaseController // V2 + SS elseif ($sub == 4) { $return_url .= URL::getAllVMessUrl($user).PHP_EOL; - $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, 0, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } // V2 + SS + SSR elseif ($sub == 5) { $return_url .= URL::getAllVMessUrl($user).PHP_EOL; - $return_url .= URL::getAllUrl($user, $mu, 0, $extend).PHP_EOL; - $return_url .= URL::getAllUrl($user, $mu, 1, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, 0, 0, $extend).PHP_EOL; + $return_url .= URL::getAllUrl($user, 0, 1, $extend).PHP_EOL; return Tools::base64_url_encode($return_url); } } diff --git a/resources/conf/clash.tpl b/resources/conf/clash.tpl index 37a628e4..3cfb52f5 100644 --- a/resources/conf/clash.tpl +++ b/resources/conf/clash.tpl @@ -19,35 +19,45 @@ allow-lan: true # 规则模式:Rule(规则) / Global(全局代理)/ Direct(全局直连) mode: Rule -# 设置日志输出级别 (默认级别:info,级别越高日志输出量越大,越倾向于调试) -# 四个级别:info / warning / error / debug -log-level: info +# 设置日志输出级别 (默认级别:silent,即不输出任何内容,以避免因日志内容过大而导致程序内存溢出)。 +# 5 个级别:silent / info / warning / error / debug。级别越高日志输出量越大,越倾向于调试,若需要请自行开启。 +log-level: {if array_key_exists("log-level",$opts)}{$opts['log-level']}{else}silent{/if} # Clash 的 RESTful API external-controller: '0.0.0.0:8233' # RESTful API 的口令 -secret: 'MixsChina' +secret: '{if array_key_exists("secret",$opts)}{$opts['secret']}{else}MixsChina{/if}' +# 您可以将静态网页资源(如 clash-dashboard)放置在一个目录中,clash 将会服务于 `${API}/ui` +# 参数应填写配置目录的相对路径或绝对路径。 +# external-ui: folder + +{if $opts['dns']==1} dns: enable: true ipv6: false # listen: 0.0.0.0:53 # enhanced-mode: redir-host nameserver: - - 114.114.114.114 - - 223.5.5.5 - - tls://dns.rubyfish.cn:853 + - 1.2.4.8 + - 223.5.5.5 + - 114.114.114.114 + - tls://dns.rubyfish.cn:853 fallback: - - 114.114.114.114 - - tls://dns.rubyfish.cn:853 - - 8.8.8.8 + - tls://dns.rubyfish.cn:853 + - tls://dns.google # Clash DNS 请求逻辑: # (1) 当访问一个域名时, nameserver 与 fallback 列表内的所有服务器并发请求,得到域名对应的 IP 地址。 # (2) clash 将选取 nameserver 列表内,解析最快的结果。 # (3) 若解析结果中,IP 地址属于 国外,那么 Clash 将选择 fallback 列表内,解析最快的结果。 +# 注意: +# (1) 如果您为了确保 DNS 解析结果无污染,请仅保留列表内以 tls:// 开头的 DNS 服务器,但是通常对于国内没有太大必要。 +# (2) 如果您不在乎可能解析到污染的结果,更加追求速度。请将 nameserver 列表的服务器插入至 fallback 列表内,并移除重复项。 +{/if} + Proxy: {foreach $confs as $conf} - {json_encode($conf,JSON_UNESCAPED_SLASHES)} @@ -63,3 +73,30 @@ Proxy Group: - { name: "Others", type: select, proxies: ["Proxy","Domestic"]} {include file='rule/Rule.yml'} + +# 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 diff --git a/resources/conf/quantumult.tpl b/resources/conf/quantumult.tpl index 029483ff..0fd9c870 100644 --- a/resources/conf/quantumult.tpl +++ b/resources/conf/quantumult.tpl @@ -23,8 +23,8 @@ FINAL,☁️ Others [SOURCE] {$appName}_v2, server ,{$subUrl}?quantumult=1, false, true, false -{$appName}_ss, server ,{$subUrl}?sub=2&extend=0, false, true, false -{$appName}_ssr, server ,{$subUrl}?sub=1&extend=0, false, true, false +{$appName}_ss, server ,{$subUrl}?sub=2, false, true, false +{$appName}_ssr, server ,{$subUrl}?sub=1, false, true, false Hackl0us Rules, filter, https://raw.githubusercontent.com/Hackl0us/Surge-Rule-Snippets/master/LAZY_RULES/Quantumult.conf, true {/if} diff --git a/resources/conf/surfboard.tpl b/resources/conf/surfboard.tpl index 5110b705..d33c1251 100644 --- a/resources/conf/surfboard.tpl +++ b/resources/conf/surfboard.tpl @@ -15,14 +15,14 @@ udp-replay = true {$ss_group} [Proxy Group] +🍈 Select = select{$ss_name} + 🍃 Proxy = select, 🍈 Select, 🚀 Direct 🍂 Domestic = select, 🚀 Direct, 🍃 Proxy ☁️ Others = select, 🍃 Proxy, 🚀 Direct -🍈 Select = select{$ss_name} - [Rule] {include file='rule/PROXY.conf'} {include file='rule/DIRECT.conf'} diff --git a/resources/conf/surge.tpl b/resources/conf/surge.tpl index 383cec49..4488f19a 100644 --- a/resources/conf/surge.tpl +++ b/resources/conf/surge.tpl @@ -39,7 +39,7 @@ use-keyword-filter = false [Proxy Group] -🍃 Proxy = select, 🍈 Select, 🏃 Auto, 🚀 Direct +🍃 Proxy = select, 🏃 Auto, 🍈 Select, 🚀 Direct 🍂 Domestic = select, 🚀 Direct, 🍃 Proxy @@ -91,20 +91,12 @@ syria.sy = 127.0.0.1 ^https?:\/\/.+.(m\.)?wikipedia\.org/wiki http://www.wikiwand.com/en 302 ^https?:\/\/zh.(m\.)?wikipedia\.org/(zh-hans|zh-sg|zh-cn|zh(?=/)) http://www.wikiwand.com/zh 302 ^https?:\/\/zh.(m\.)?wikipedia\.org/zh-[a-zA-Z]{2,} http://www.wikiwand.com/zh-hant 302 - -// Tiktok US -(?<=aweme\/v1\/)playwm play 302 -(?<=&ac=)4G(?=.*) WIFI 302 -(?<=_region=)CN(?=&) US 302 -(?<=&app_version=)9..(?=.?.?&) 1 302 -(?<=\?version_code=)9..(?=.?.?&) 1 302 -(?<=&?watermark=)1(?=.*) 0 302 {/literal} [Header Rewrite] ^https?://www.zhihu.com/question/ header-replace User-Agent Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.45 Safari/537.36 [MITM] skip-server-cert-verify = true -hostname = api.zhihu.com, www.zhihu.com, *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com +hostname = api.zhihu.com, www.zhihu.com ca-passphrase = GeekQu ca-p12 = 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 From 0b63054d600db6ce33c29555f9a5eca1fdb47bc9 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 18 Feb 2019 18:23:21 +0800 Subject: [PATCH 08/12] fix bug --- resources/conf/clash.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/conf/clash.tpl b/resources/conf/clash.tpl index 3cfb52f5..0c5ca4f0 100644 --- a/resources/conf/clash.tpl +++ b/resources/conf/clash.tpl @@ -29,7 +29,7 @@ external-controller: '0.0.0.0:8233' # RESTful API 的口令 secret: '{if array_key_exists("secret",$opts)}{$opts['secret']}{else}MixsChina{/if}' -# 您可以将静态网页资源(如 clash-dashboard)放置在一个目录中,clash 将会服务于 `${API}/ui` +# 您可以将静态网页资源(如 clash-dashboard)放置在一个目录中,clash 将会服务于 `RESTful API/ui` # 参数应填写配置目录的相对路径或绝对路径。 # external-ui: folder From 85c17b606d31db8dadb0a9efaf70ff079a7a5816 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 25 Feb 2019 12:12:53 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/HomeController.php | 4 ++-- app/Controllers/LinkController.php | 13 ++----------- app/Utils/TelegramProcess.php | 5 ++--- resources/conf/clash.tpl | 8 ++++---- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/Controllers/HomeController.php b/app/Controllers/HomeController.php index 71c7043b..dfbc8355 100644 --- a/app/Controllers/HomeController.php +++ b/app/Controllers/HomeController.php @@ -193,10 +193,10 @@ class HomeController extends BaseController break; case 'kitsunebi': $msg = "``` -// 合并订阅,包含 ss、v2ray -订阅链接:" . $subInfo['v2ray_ss'] . " // v2ray 订阅 订阅链接:" . $subInfo['v2ray'] . " +// 合并订阅,包含 ss、v2ray +订阅链接:" . $subInfo['v2ray_ss'] . " ```"; break; case 'surfboard': diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 3160bd0a..34a15c6d 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -88,7 +88,7 @@ class LinkController extends BaseController // apps $opts = []; - + $ssd = 0; if (isset($request->getQueryParams()["ssd"])) { $ssd = (int)$request->getQueryParams()["ssd"]; @@ -97,16 +97,7 @@ class LinkController extends BaseController $clash = 0; if (isset($request->getQueryParams()["clash"])) { $clash = (int)$request->getQueryParams()["clash"]; - $opts['dns'] = "0"; - if (isset($request->getQueryParams()["dns"])) { - $opts['dns'] = (int)$request->getQueryParams()["dns"]; - } - if (isset($request->getQueryParams()["secret"])) { - $opts['secret'] = urldecode($request->getQueryParams()["secret"]); - } - if (isset($request->getQueryParams()["log-level"])) { - $opts['log-level'] = urldecode($request->getQueryParams()["log-level"]); - } + $opts = $request->getQueryParams(); } $surge = 0; diff --git a/app/Utils/TelegramProcess.php b/app/Utils/TelegramProcess.php index aab2a5cb..81ba2b14 100644 --- a/app/Utils/TelegramProcess.php +++ b/app/Utils/TelegramProcess.php @@ -10,16 +10,15 @@ class TelegramProcess { private static $all_rss = [ "clean_link"=>"重置订阅", - "?sub=2" => "SS订阅" , "?sub=1" => "SSR订阅", "?sub=3" => "V2ray订阅", "?sub=5" => "Shadowrocket", - "?sub=4" => "Kitsunebi or v2rayNG", + "?sub=4" => "Kitsunebi or V2rayNG or BifrostV", "?surge=2" => "Surge 2.x", "?surge=3" => "Surge 3.x", "?ssd=1" => "SSD", "?clash=1" => "Clash", - "?surfboard=1" => "surfboard", + "?surfboard=1" => "Surfboard", "?quantumult=3" => "Quantumult(完整配置)" ]; diff --git a/resources/conf/clash.tpl b/resources/conf/clash.tpl index 2a019c4d..01816e46 100644 --- a/resources/conf/clash.tpl +++ b/resources/conf/clash.tpl @@ -5,13 +5,13 @@ #---------------------------------------------------# # HTTP 代理端口 -port: 8234 +port: {if array_key_exists("port",$opts)}{$opts['port']}{else}8234{/if} # SOCKS5 代理端口 -socks-port: 8235 +socks-port: {if array_key_exists("socks-port",$opts)}{$opts['socks-port']}{else}8235{/if} # Linux 和 macOS 的 redir 代理端口 -redir-port: 8236 +redir-port: {if array_key_exists("redir-port",$opts)}{$opts['redir-port']}{else}8236{/if} # 允许局域网的连接 allow-lan: true @@ -33,7 +33,7 @@ secret: '{if array_key_exists("secret",$opts)}{$opts['secret']}{else}MixsChina{/ # 参数应填写配置目录的相对路径或绝对路径。 # external-ui: folder -{if $opts['dns']==1} +{if array_key_exists("dns",$opts) && $opts['dns']==1} dns: enable: true ipv6: false From 12940ab53e9484c079cacbf2157e257c98b36227 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 28 Feb 2019 11:39:59 +0800 Subject: [PATCH 10/12] =?UTF-8?q?ios=E8=B4=A6=E6=88=B7=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC=E9=97=A8?= =?UTF-8?q?=E6=A7=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/UserController.php | 1 + config/.config.php.example | 1 + resources/views/material/user/index.tpl | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 07d26d28..ea057f87 100755 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -84,6 +84,7 @@ class UserController extends BaseController return $this->view() ->assign('ssr_sub_token', $ssr_sub_token) ->assign('display_ios_class',Config::get('display_ios_class')) + ->assign('display_ios_topup',Config::get('display_ios_topup')) ->assign('ios_account',Config::get('ios_account')) ->assign('ios_password',Config::get('ios_password')) ->assign('ann', $Ann) diff --git a/config/.config.php.example b/config/.config.php.example index fef777de..bd6fb325 100755 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -212,6 +212,7 @@ $System_Config['enable_donate']='false'; //是否显示用户捐赠(所有收 #iOS账户显示 $System_Config['display_ios_class']='-1'; //至少等级为多少的用户可以看见,小于0时关闭此功能 +$System_Config['display_ios_topup']='0'; //满足等级要求后,累计充值高于多少的用户可以看见 $System_Config['ios_account']=''; //iOS账户 $System_Config['ios_password']=''; //iOS密码 diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index 1b0c5313..3c116a72 100644 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -256,20 +256,22 @@
    {if $display_ios_class>=0} -
    account_box 公共iOS账户:
    - {if $user->class>=$display_ios_class} +
    account_box 本站iOS账户:
    + {if $user->class>=$display_ios_class && $user->get_top_up()>=$display_ios_topup}

    -
    lock 公共iOS密码:
    +
    lock 本站iOS密码:

    +

    error禁止将账户分享给他人!

    +
    {else}

    - visibility_off等级至少为{$display_ios_class}可见,如需升级请点击这里升级套餐 + visibility_off等级至少为{$display_ios_class}且累计充值大于{$display_ios_topup}时可见,如需升级请点击这里升级套餐

    {/if} {/if} @@ -439,20 +441,22 @@
    {if $display_ios_class>=0} -
    account_box 公共iOS账户:
    - {if $user->class>=$display_ios_class} +
    account_box 本站iOS账户:
    + {if $user->class>=$display_ios_class && $user->get_top_up()>=$display_ios_topup}

    -
    lock 公共iOS密码:
    +
    lock 本站iOS密码:

    +

    error禁止将账户分享给他人!

    +
    {else}

    - visibility_off等级至少为{$display_ios_class}可见,如需升级请点击这里升级套餐。 + visibility_off等级至少为{$display_ios_class}且累计充值大于{$display_ios_topup}时可见,如需升级请点击这里升级套餐。

    {/if} {/if} From a6e39a784efa107aaab1c5a34437ba9169ae36df Mon Sep 17 00:00:00 2001 From: GeekQu Date: Sun, 3 Mar 2019 05:40:56 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=20Clash=20=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/LinkController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 34a15c6d..6bc7ec1e 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -343,15 +343,16 @@ class LinkController extends BaseController "password" => $item['passwd'], ]; if (in_array($item['obfs'], array("simple_obfs_tls", "simple_obfs_http"))) { + $sss['plugin'] = "obfs"; if (strpos($item['obfs'], 'http')) { - $sss['obfs'] = "http"; + $sss['plugin-opts']['mode'] = "http"; } else { - $sss['obfs'] = "tls"; + $sss['plugin-opts']['mode'] = "tls"; } if ($item['obfs_param'] != '') { - $sss['obfs-host'] = $item['obfs_param']; + $sss['plugin-opts']['host'] = $item['obfs_param']; } else { - $sss['obfs-host'] = "wns.windows.com"; + $sss['plugin-opts']['host'] = "wns.windows.com"; } } if (strpos($sss['name'],"回国") or strpos($sss['name'],"China")){ @@ -379,6 +380,9 @@ class LinkController extends BaseController if ($item['tls'] == 'tls') { $v2rays['tls'] = true; } + if ($item['host'] != '') { + $v2rays['ws-headers']['Host'] = $item['host']; + } } elseif ($item['net'] == "tls") { $v2rays['tls'] = true; } From feff60fbc75ade75c9c52f619d67281451c8a900 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Mon, 4 Mar 2019 01:39:00 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8DClash=20YAML=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=BD=93=E6=B2=A1=E6=9C=89=E5=9B=9E=E5=9B=BD?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/conf/clash.tpl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/conf/clash.tpl b/resources/conf/clash.tpl index 01816e46..164aa836 100644 --- a/resources/conf/clash.tpl +++ b/resources/conf/clash.tpl @@ -65,13 +65,17 @@ Proxy: Proxy Group: - { name: "Auto", type: fallback, proxies: {$proxies|json_encode}, url: "http://www.gstatic.com/generate_204", interval: 300 } - {append var='proxies' value='Auto'} +{append var='proxies' value='Auto'} +{if count($back_china_proxies)!=0} - { name: "Back_China_Auto", type: fallback, proxies: {$back_china_proxies|json_encode}, url: "http://www.gstatic.com/generate_204", interval: 300 } - {append var='back_china_proxies' value='Back_China_Auto'} - - { name: "Proxy", type: select, proxies: {$proxies|json_encode} } +{append var='back_china_proxies' value='Back_China_Auto'} - { name: "Back_China_Proxy", type: select, proxies: {$back_china_proxies|json_encode} } +{/if} + - { name: "Proxy", type: select, proxies: {$proxies|json_encode} } - { name: "Domestic", type: select, proxies: ["DIRECT","Proxy"] } - - { name: "China_media", type: select, proxies: ["Domestic","Proxy","Back_China_Proxy"]} +{$China_media=["Domestic","Proxy"]} +{if count($back_china_proxies)!=0}{append var='China_media' value='Back_China_Proxy'}{/if} + - { name: "China_media", type: select, proxies: {$China_media|json_encode} } - { name: "Global_media", type: select, proxies: ["Proxy"]} - { name: "Others", type: select, proxies: ["Proxy","Domestic"]}