From 32ac54ba592cb577af672b18106ad66b86aebd6b Mon Sep 17 00:00:00 2001 From: GeekQu Date: Fri, 14 Dec 2018 12:42:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20v2ray=20=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Utils/URL.php | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/app/Utils/URL.php b/app/Utils/URL.php index cd377592..fce68535 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -456,6 +456,62 @@ class URL return $result; } + public static function getV2ray($user, $node){ + $node_explode = explode(';', $node->server); + $item = [ + 'v'=>'2', + 'host'=>'', + 'path'=>'', + 'tls'=>'' + ]; + $item['ps'] = $node->name; + $item['add'] = $node_explode[0]; + $item['port'] = $node_explode[1]; + $item['id'] = $user->getUuid(); + $item['aid'] = $node_explode[2]; + $item['net'] = "tcp"; + $item['type'] = "none"; + if (count($node_explode) >= 4) { + $item['net'] = $node_explode[3]; + if ($item['net'] == 'ws') { + $item['path'] = '/'; + } else if ($item['net'] == 'tls') { + $item['tls'] = 'tls'; + } + } + if (count($node_explode) >= 5 ) { + if (in_array($item['net'], array("kcp", "http"))){ + + $item['type'] = $node_explode[4]; + } else if ($node_explode[4]=='ws'){ + $item['net'] = 'ws'; + } + } + + if (count($node_explode) >= 6) { + $item = array_merge($item, URL::parse_args($node_explode[5])); + } + + return $item; + } + + public static function getAllV2ray($user) { + $nodes = Node::where('sort', 11)->where( + function ($query) use ($user){ + $query->where("node_group", "=", $user->node_group) + ->orWhere("node_group", "=", 0); + } + )->where("type", "1")->where("node_class", "<=", $user->class)->orderBy("name")->get(); + + $return_array = array(); + + foreach ($nodes as $node) { + array_push($return_array, URL::getV2ray($user, $node)); + } + + return $return_array; + } + public static function getAllSSDUrl($user){ if (!URL::SSCanConnect($user)){ return null; From fbca65601e155f13ff14538c6b63392ed35f13ee Mon Sep 17 00:00:00 2001 From: GeekQu Date: Sat, 15 Dec 2018 00:14:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Quantumult=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/LinkController.php | 77 +++++++++++++++++++++++++++++- resources/conf/quantumult.tpl | 27 +++++++++++ 2 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 resources/conf/quantumult.tpl diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index d6af3d33..e028b00d 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -147,9 +147,21 @@ class LinkController extends BaseController $app = (int)$request->getQueryParams()['app']; } - $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::GetSSRSub(User::where("id", "=", $Elink->userid)->first(), $mu, $max, $app)); + $quantumult = 0; + if (isset($request->getQueryParams()["quantumult"])) { + $quantumult = $request->getQueryParams()["quantumult"]; + } + + if (($quantumult == 1 || $quantumult == 2) && ($mu == 0 || $mu == 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=Quantumult.conf'); + $newResponse->getBody()->write(LinkController::GetQuantumult($user, $mu, $quantumult)); + 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::GetSSRSub(User::where("id", "=", $Elink->userid)->first(), $mu, $max, $app)); return $newResponse; + } default: break; } @@ -157,6 +169,67 @@ class LinkController extends BaseController $newResponse->getBody()->write(LinkController::GetPac($type, $Elink->address, $Elink->port, User::where("id", "=", $Elink->userid)->first()->pac)); return $newResponse; } + + public static function GetQuantumult($user, $mu = 0, $quantumult = 0) + { + $ss_group = ""; + $ss_name = ""; + $v2ray_group = ""; + + if ($quantumult == 1) { + + $v2rays = URL::getAllV2ray($user); + foreach($v2rays as $v2ray) { + + $v2ray_tls = ", over-tls=false, certificate=1"; + if ($v2ray['tls'] == "tls"){ + $v2ray_tls = ", over-tls=true, tls-host=".$v2ray['add'].", certificate=1"; + } + + $v2ray_obfs = ""; + if ($v2ray['net'] == "ws" || $v2ray['net'] == "http"){ + $v2ray_obfs = ", obfs=http, obfs-path=\"".$v2ray['path']."\", obfs-header=\"Host: ".$v2ray['add']."[Rr][Nn]User-Agent: Mozilla/5.0 (iPhone; CPU iPhone OS 18_0_0 like Mac OS X) AppleWebKit/888.8.88 (KHTML, like Gecko) Mobile/6666666\""; + } + + if ($v2ray['net'] == "kcp"){ + $v2ray_group .= ""; + } else { + $v2ray_group .= "vmess://" . base64_encode($v2ray['ps'] . " = vmess, " . $v2ray['add'].", " . $v2ray['port'] . ", chacha20-ietf-poly1305, \"" . $v2ray['id'] . "\", group=" . Config::get('appName') . "" . $v2ray_tls . $v2ray_obfs) . "\n"; + } + } + + return base64_encode($v2ray_group); + + } else { + + + $items = URL::getAllItems($user, $mu, 1); + foreach($items as $item) { + $ss_group .= $item['remark']." = shadowsocks, ".$item['address'].", ".$item['port'].", ".$item['method'].", \"".$item['passwd']."\", upstream-proxy=false, upstream-proxy-auth=false".URL::getSurgeObfs($item)."\n"; + $ss_name .= "\n".$item['remark']; + } + + $quan_proxy_group = base64_encode("๐Ÿƒ Proxy : static, ๐Ÿƒ Auto\n๐Ÿƒ Auto\n๐Ÿš€ Direct\n" . $ss_name); + $quan_auto_group = base64_encode("๐Ÿƒ Auto : auto\n".$ss_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_direct_group = base64_encode("๐Ÿš€ Direct : static, DIRECT\nDIRECT"); + $quan_apple_group = base64_encode("๐ŸŽ Only : static, ๐Ÿš€ Direct\n๐Ÿš€ Direct\n๐Ÿƒ Proxy"); + + $render = ConfRender::getTemplateRender(); + $render->assign('user', $user) + ->assign('ss_group', $ss_group) + ->assign('quan_proxy_group', $quan_proxy_group) + ->assign('quan_auto_group', $quan_auto_group) + ->assign('quan_domestic_group', $quan_domestic_group) + ->assign('quan_others_group', $quan_others_group) + ->assign('quan_direct_group', $quan_direct_group) + ->assign('quan_apple_group', $quan_apple_group) + ; + + return $render->fetch('quantumult.tpl'); +} + } public static function GetPcConf($user, $is_mu = 0, $is_ss = 0) { diff --git a/resources/conf/quantumult.tpl b/resources/conf/quantumult.tpl new file mode 100644 index 00000000..5ed87e63 --- /dev/null +++ b/resources/conf/quantumult.tpl @@ -0,0 +1,27 @@ +[Proxy] +{$ss_group} + +[POLICY] +{$quan_proxy_group} +{$quan_auto_group} +{$quan_domestic_group} +{$quan_others_group} +{$quan_apple_group} +{$quan_direct_group} + +[DNS] +system, 119.29.29.29, 223.6.6.6, 80.80.81.81, 1.1.1.1 + +[Rule] +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/Apple.conf")} + +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/PROXY.conf")} + +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/DIRECT.conf")} +GEOIP,CN,๐Ÿ‚ Domestic +FINAL,โ˜๏ธ Others + +[GLOBAL] + +[STATE] +STATE,AUTO \ No newline at end of file From 30ce333c2d8850a249438d8017bf5eb5abc399a1 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Sat, 15 Dec 2018 03:36:10 +0800 Subject: [PATCH 3/6] fix , add surge --- app/Controllers/LinkController.php | 157 ++++++++++++++++++++++------- resources/conf/surge2.tpl | 122 ++++++++++++++++++++++ resources/conf/surge3.tpl | 123 ++++++++++++++++++++++ 3 files changed, 364 insertions(+), 38 deletions(-) create mode 100644 resources/conf/surge2.tpl create mode 100644 resources/conf/surge3.tpl diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index e028b00d..d5e1c251 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -147,6 +147,11 @@ class LinkController extends BaseController $app = (int)$request->getQueryParams()['app']; } + $surge = 0; + if (isset($request->getQueryParams()["surge"])) { + $quantumult = $request->getQueryParams()["surge"]; + } + $quantumult = 0; if (isset($request->getQueryParams()["quantumult"])) { $quantumult = $request->getQueryParams()["quantumult"]; @@ -157,6 +162,11 @@ class LinkController extends BaseController $newResponse->getBody()->write(LinkController::GetQuantumult($user, $mu, $quantumult)); return $newResponse; } + elseif (($surge == 1 || $surge == 2 || $surge == 3) && ($mu == 0 || $mu == 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=Surge.conf'); + $newResponse->getBody()->write(LinkController::GetSurge($user, $mu, $surge)); + 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::GetSSRSub(User::where("id", "=", $Elink->userid)->first(), $mu, $max, $app)); @@ -170,65 +180,136 @@ class LinkController extends BaseController return $newResponse; } + public static function GetIosConf($user, $mu = 0, $surge = 0) + { + + $proxy_name=""; + $proxy_group=""; + + $render = ConfRender::getTemplateRender(); + + $userapiUrl = Config::get('baseUrl') . "/link/" . LinkController::GenerateSSRSubCode($user->id, 0) . "?surge=" . $surge . "&mu=" . $mu; + + $items = URL::getAllItems($user, $mu, 1); + foreach($items as $item) { + + if ($surge == 1 || $surge == 3) { + $proxy_group .= $item['remark'] . ' = ss, ' . $item['address'] . ', ' . $item['port'] . ', encrypt-method=' . $item['method'] . ', password=' . $item['passwd'] . '' . URL::getSurgeObfs($item) . ", tfo=true, udp-relay=true\n"; + + } else { + $proxy_group .= $item['remark'] . ' = custom, ' . $item['address'] . ', ' . $item['port'] . ', ' . $item['method'] . ', ' . $item['passwd'] . ', ' . Config::get('baseUrl') . '/downloads/SSEncrypt.module' . URL::getSurgeObfs($item) . ", tfo=true, udp-relay=true\n"; + } + + $proxy_name .= ", ".$item['remark']; + } + + if ($surge == 3) { + + $render->assign('user', $user) + ->assign('userapiUrl', $userapiUrl) + ->assign('proxy_name', $proxy_name) + ->assign('proxy_group', $proxy_group); + + return $render->fetch('surge3.tpl'); + + } elseif ($surge == 2) { + + $render->assign('user', $user) + ->assign('userapiUrl', $userapiUrl) + ->assign('proxy_name', $proxy_name) + ->assign('proxy_group', $proxy_group); + + return $render->fetch('surge2.tpl'); + + } elseif ($surge == 1) { + + return $proxy_group; + + } + + } + public static function GetQuantumult($user, $mu = 0, $quantumult = 0) { $ss_group = ""; $ss_name = ""; + $ssr_group = ""; + $ssr_name = ""; $v2ray_group = ""; - - if ($quantumult == 1) { - - $v2rays = URL::getAllV2ray($user); + $v2ray_name = ""; + + $v2rays = URL::getAllV2ray($user); + foreach($v2rays as $v2ray) { - + + $v2ray_name .= "\n" . $v2ray['ps']; + $v2ray_tls = ", over-tls=false, certificate=1"; if ($v2ray['tls'] == "tls"){ - $v2ray_tls = ", over-tls=true, tls-host=".$v2ray['add'].", certificate=1"; - } - + $v2ray_tls = ", over-tls=true, tls-host=" . $v2ray['add'] . ", certificate=1"; + } + $v2ray_obfs = ""; if ($v2ray['net'] == "ws" || $v2ray['net'] == "http"){ - $v2ray_obfs = ", obfs=http, obfs-path=\"".$v2ray['path']."\", obfs-header=\"Host: ".$v2ray['add']."[Rr][Nn]User-Agent: Mozilla/5.0 (iPhone; CPU iPhone OS 18_0_0 like Mac OS X) AppleWebKit/888.8.88 (KHTML, like Gecko) Mobile/6666666\""; - } + $v2ray_obfs = ", obfs=" . $v2ray['net'] . ", obfs-path=\"" . $v2ray['path'] . "\", obfs-header=\"Host: " . $v2ray['add'] . "[Rr][Nn]User-Agent: Mozilla/5.0 (iPhone; CPU iPhone OS 18_0_0 like Mac OS X) AppleWebKit/888.8.88 (KHTML, like Gecko) Mobile/6666666\""; + } if ($v2ray['net'] == "kcp"){ $v2ray_group .= ""; + } else { + if ($quantumult == 1) { + $v2ray_group .= "vmess://" . base64_encode($v2ray['ps'] . " = vmess, " . $v2ray['add'] . ", " . $v2ray['port'] . ", chacha20-ietf-poly1305, \"" . $v2ray['id'] . "\", group=" . Config::get('appName') . "" . $v2ray_tls . $v2ray_obfs) . "\n"; } else { - $v2ray_group .= "vmess://" . base64_encode($v2ray['ps'] . " = vmess, " . $v2ray['add'].", " . $v2ray['port'] . ", chacha20-ietf-poly1305, \"" . $v2ray['id'] . "\", group=" . Config::get('appName') . "" . $v2ray_tls . $v2ray_obfs) . "\n"; + $v2ray_group .= $v2ray['ps'] . " = vmess, " . $v2ray['add'] . ", " . $v2ray['port'] . ", chacha20-ietf-poly1305, \"" . $v2ray['id'] . "\"" . $v2ray_tls . $v2ray_obfs . "\n"; } + } } + + if ($quantumult == 1) { - return base64_encode($v2ray_group); + return base64_encode($v2ray_group); } else { - - $items = URL::getAllItems($user, $mu, 1); - foreach($items as $item) { - $ss_group .= $item['remark']." = shadowsocks, ".$item['address'].", ".$item['port'].", ".$item['method'].", \"".$item['passwd']."\", upstream-proxy=false, upstream-proxy-auth=false".URL::getSurgeObfs($item)."\n"; - $ss_name .= "\n".$item['remark']; - } - - $quan_proxy_group = base64_encode("๐Ÿƒ Proxy : static, ๐Ÿƒ Auto\n๐Ÿƒ Auto\n๐Ÿš€ Direct\n" . $ss_name); - $quan_auto_group = base64_encode("๐Ÿƒ Auto : auto\n".$ss_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_direct_group = base64_encode("๐Ÿš€ Direct : static, DIRECT\nDIRECT"); - $quan_apple_group = base64_encode("๐ŸŽ Only : static, ๐Ÿš€ Direct\n๐Ÿš€ Direct\n๐Ÿƒ Proxy"); + $items = URL::getAllItems($user, $mu, 1); + + foreach($items as $item) { + + $ss_group .= $item['remark'] . " = shadowsocks, " . $item['address'] . ", " . $item['port'] . ", " . $item['method'] . ", \"" . $item['passwd'] . "\", upstream-proxy=false, upstream-proxy-auth=false" . URL::getSurgeObfs($item) . "\n"; + + $ss_name .= "\n" . $item['remark']; + } + + $ssrs = URL::getAllItems($user, $mu, 0); + + foreach($ssrs as $item) { + + $ssr_group .= $item['remark'] . " = shadowsocksr, " . $item['address'] . ", " . $item['port'] . ", " . $item['method'] . ", \"" . $item['passwd'] . "\", protocol=" . $item['protocol'] . ", protocol_param=" . $item['protocol_param'] . ", obfs=" . $item['obfs'] . ", obfs_param=\"" . $item['obfs_param'] . "\"\n"; + + $ssr_name .= "\n" . $item['remark']; + } + + $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_direct_group = base64_encode("๐Ÿš€ Direct : static, DIRECT\nDIRECT"); + $quan_apple_group = base64_encode("๐ŸŽ Only : static, ๐Ÿš€ Direct\n๐Ÿš€ Direct\n๐Ÿƒ Proxy"); - $render = ConfRender::getTemplateRender(); - $render->assign('user', $user) - ->assign('ss_group', $ss_group) - ->assign('quan_proxy_group', $quan_proxy_group) - ->assign('quan_auto_group', $quan_auto_group) - ->assign('quan_domestic_group', $quan_domestic_group) - ->assign('quan_others_group', $quan_others_group) - ->assign('quan_direct_group', $quan_direct_group) - ->assign('quan_apple_group', $quan_apple_group) - ; - - return $render->fetch('quantumult.tpl'); -} + $render = ConfRender::getTemplateRender(); + $render->assign('user', $user) + ->assign('ss_group', $ss_group) + ->assign('ssr_group', $ssr_group) + ->assign('v2ray_group', $v2ray_group) + ->assign('quan_proxy_group', $quan_proxy_group) + ->assign('quan_auto_group', $quan_auto_group) + ->assign('quan_domestic_group', $quan_domestic_group) + ->assign('quan_others_group', $quan_others_group) + ->assign('quan_direct_group', $quan_direct_group) + ->assign('quan_apple_group', $quan_apple_group); + + return $render->fetch('quantumult.tpl'); + } } public static function GetPcConf($user, $is_mu = 0, $is_ss = 0) diff --git a/resources/conf/surge2.tpl b/resources/conf/surge2.tpl new file mode 100644 index 00000000..4c753552 --- /dev/null +++ b/resources/conf/surge2.tpl @@ -0,0 +1,122 @@ +#!MANAGED-CONFIG {$userapiUrl} + +[General] +loglevel = notify +dns-server = system, 119.29.29.29, 223.6.6.6, 80.80.80.80 +skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, 17.0.0.0/8, localhost, *.local, *.crashlytics.com +external-controller-access = MaxChina@0.0.0.0:8233 +allow-wifi-access = true +interface = 0.0.0.0 +socks-interface = 0.0.0.0 +port = 8234 +socks-port = 8235 +enhanced-mode-by-rule = false +exclude-simple-hostnames = true +ipv6 = true +replica = false + +[Replica] +hide-apple-request = true +hide-crashlytics-request = true +hide-udp = false +use-keyword-filter = false + +[Proxy] +๐Ÿš€ Direct = direct +{$proxy_group} + +[Proxy Group] + +๐Ÿƒ Proxy = select, ๐Ÿˆ Select, ๐Ÿƒ Auto, ๐Ÿš€ Direct + +๐Ÿ‚ Domestic = select, ๐Ÿš€ Direct, ๐Ÿƒ Proxy + +โ˜๏ธ Others = select, ๐Ÿƒ Proxy, ๐Ÿš€ Direct + +๐ŸŽ Only = select, ๐Ÿš€ Direct, ๐Ÿƒ Proxy + +๐Ÿˆ Select = select{$proxy_name} + +๐Ÿƒ Auto = url-test{$proxy_name}, url = http://www.gstatic.com/generate_204, interval = 1200 + +[Rule] +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/Apple.conf")} +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/DIRECT.conf")} +{file_get_contents("https://raw.githubusercontent.com/lhie1/Rules/master/Auto/PROXY.conf")} + +GEOIP,CN,๐Ÿ‚ Domestic +FINAL,โ˜๏ธ Others,dns-failed + +[Host] +localhost = 127.0.0.1 +syria.sy = 127.0.0.1 +*.1688.com = server:223.6.6.6 +*.fliggy.com = server:223.6.6.6 +*.aliqin.com = server:223.6.6.6 +*.tmall.com = server:223.6.6.6 +*.taobao.com = server:223.6.6.6 +*.ali*.com = server:223.6.6.6 +*.upyun.com = server:223.6.6.6 +*.mmstat.com = server:223.6.6.6 +*.jd.com = server:119.29.29.29 +*.qq.com = server:119.29.29.29 +*buyimg.com = server:119.29.29.29 +*gtimg.* = server:119.29.29.29 +{literal} +[URL Rewrite] +// Google_Service_HTTPS_Jump +^https?:\/\/(www\.)?g\.cn https://www.google.com 302 +^https?:\/\/(www\.)?google\.cn https://www.google.com 302 + +// Anti_ISP_JD_Hijack +^https?:\/\/coupon\.m\.jd\.com\/ https://coupon.m.jd.com/ 302 +^https?:\/\/h5\.m\.jd\.com\/ https://h5.m.jd.com/ 302 +^https?:\/\/item\.m\.jd\.com\/ https://item.m.jd.com/ 302 +^https?:\/\/m\.jd\.com\/ https://m.jd.com/ 302 +^https?:\/\/newcz\.m\.jd\.com\/ https://newcz.m.jd.com/ 302 +^https?:\/\/p\.m\.jd\.com\/ https://p.m.jd.com/ 302 +^https?:\/\/so\.m\.jd\.com\/ https://so.m.jd.com/ 302 +^https?:\/\/union\.click\.jd\.com\/jda? http://union.click.jd.com/jda?adblock= header +^https?:\/\/union\.click\.jd\.com\/sem.php? http://union.click.jd.com/sem.php?adblock= header +^https?:\/\/www.jd.com\/ https://www.jd.com/ 302 + +// Anti_ISP_Taobao_Hijack +^https?:\/\/m\.taobao\.com\/ https://m.taobao.com/ 302 + +// Wiki +^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 + +// Other +^https?:\/\/cfg\.m\.ttkvod\.com\/mobile\/ttk_mobile_1.8\.txt http://ogtre5vp0.bkt.clouddn.com/Static/TXT/ttk_mobile_1.8.txt header +^https?:\/\/cnzz\.com\/ http://ogtre5vp0.bkt.clouddn.com/background.png? header +^https?:\/\/m\.qu\.la\/stylewap\/js\/wap\.js http://ogtre5vp0.bkt.clouddn.com/qu_la_wap.js 302 +^https?:\/\/m\.yhd\.com\/1\/\? http://m.yhd.com/1/?adbock= 302 +^https?:\/\/n\.mark\.letv\.com\/m3u8api\/ http://burpsuite.applinzi.com/Interface header +^https?:\/\/sqimg\.qq\.com\/ https://sqimg.qq.com/ 302 +^https?:\/\/static\.m\.ttkvod\.com\/static_cahce\/index\/index\.txt http://ogtre5vp0.bkt.clouddn.com/Static/TXT/index.txt header +^https?:\/\/www\.iqshw\.com\/d\/js\/m http://burpsuite.applinzi.com/Interface header +^https?:\/\/www\.iqshw\.com\/d\/js\/m http://rewrite.websocket.site:10/Other/Static/JS/Package.js? header + +// Tiktok +(?<=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] +^*.bdimg.com header-del Referer +^*.qpic.cn header-replace User-Agent WeChat/6.5.22.32 CFNetwork/889.9 Darwin/17.2.0 +^*.qpic.cn header-del Referer +^*.ph.126.net header-del Referer +^*.zhimg.com header-del Referer +^*.cnbetacdn.com header-del Referer +^*.zhiding.cn header-del Referer +^*.c114.com.cn header-del Referer +^https?://www.biquge.com.tw header-del Cookie +^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] \ No newline at end of file diff --git a/resources/conf/surge3.tpl b/resources/conf/surge3.tpl new file mode 100644 index 00000000..fb1bb0bf --- /dev/null +++ b/resources/conf/surge3.tpl @@ -0,0 +1,123 @@ +#!MANAGED-CONFIG {$userapiUrl} + +[General] +loglevel = notify +dns-server = system, 119.29.29.29, 223.6.6.6, 80.80.80.80 +skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, 17.0.0.0/8, localhost, *.local, *.crashlytics.com +external-controller-access = MixChina@0.0.0.0:8233 +allow-wifi-access = true +http-listen = 0.0.0.0:8234 +socks5-listen = 0.0.0.0:8235 +internet-test-url = http://baidu.com +proxy-test-url = http://bing.com +test-timeout = 3 +enhanced-mode-by-rule = false +exclude-simple-hostnames = true +ipv6 = true +replica = false + +[Replica] +hide-apple-request = true +hide-crashlytics-request = true +hide-udp = false +use-keyword-filter = false + +[Proxy] +๐Ÿš€ Direct = direct +{$proxy_group} + +[Proxy Group] + +๐Ÿƒ Proxy = select, ๐Ÿˆ Select, ๐Ÿƒ Auto, ๐Ÿš€ Direct + +๐Ÿ‚ Domestic = select, ๐Ÿš€ Direct, ๐Ÿƒ Proxy + +โ˜๏ธ Others = select, ๐Ÿƒ Proxy, ๐Ÿš€ Direct + +๐ŸŽ Only = select, ๐Ÿš€ Direct, ๐Ÿƒ Proxy + +๐Ÿˆ Select = select{$proxy_name} + +๐Ÿƒ Auto = url-test{$proxy_name}, url = http://www.gstatic.com/generate_204, interval = 1200 + +[Rule] +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/apple.list,๐ŸŽ Only +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/proxy.list,๐Ÿƒ Proxy +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic.list,๐Ÿ‚ Domestic +RULE-SET,SYSTEM,DIRECT +GEOIP,CN,๐Ÿ‚ Domestic +FINAL,โ˜๏ธ Others,dns-failed + +[Host] +localhost = 127.0.0.1 +syria.sy = 127.0.0.1 +*.1688.com = server:223.6.6.6 +*.fliggy.com = server:223.6.6.6 +*.aliqin.com = server:223.6.6.6 +*.tmall.com = server:223.6.6.6 +*.taobao.com = server:223.6.6.6 +*.ali*.com = server:223.6.6.6 +*.upyun.com = server:223.6.6.6 +*.mmstat.com = server:223.6.6.6 +*.jd.com = server:119.29.29.29 +*.qq.com = server:119.29.29.29 +*buyimg.com = server:119.29.29.29 +*gtimg.* = server:119.29.29.29 +{literal} +[URL Rewrite] +// Google_Service_HTTPS_Jump +^https?:\/\/(www\.)?g\.cn https://www.google.com 302 +^https?:\/\/(www\.)?google\.cn https://www.google.com 302 + +// Anti_ISP_JD_Hijack +^https?:\/\/coupon\.m\.jd\.com\/ https://coupon.m.jd.com/ 302 +^https?:\/\/h5\.m\.jd\.com\/ https://h5.m.jd.com/ 302 +^https?:\/\/item\.m\.jd\.com\/ https://item.m.jd.com/ 302 +^https?:\/\/m\.jd\.com\/ https://m.jd.com/ 302 +^https?:\/\/newcz\.m\.jd\.com\/ https://newcz.m.jd.com/ 302 +^https?:\/\/p\.m\.jd\.com\/ https://p.m.jd.com/ 302 +^https?:\/\/so\.m\.jd\.com\/ https://so.m.jd.com/ 302 +^https?:\/\/union\.click\.jd\.com\/jda? http://union.click.jd.com/jda?adblock= header +^https?:\/\/union\.click\.jd\.com\/sem.php? http://union.click.jd.com/sem.php?adblock= header +^https?:\/\/www.jd.com\/ https://www.jd.com/ 302 + +// Anti_ISP_Taobao_Hijack +^https?:\/\/m\.taobao\.com\/ https://m.taobao.com/ 302 + +// Wiki +^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 + +// Other +^https?:\/\/cfg\.m\.ttkvod\.com\/mobile\/ttk_mobile_1.8\.txt http://ogtre5vp0.bkt.clouddn.com/Static/TXT/ttk_mobile_1.8.txt header +^https?:\/\/cnzz\.com\/ http://ogtre5vp0.bkt.clouddn.com/background.png? header +^https?:\/\/m\.qu\.la\/stylewap\/js\/wap\.js http://ogtre5vp0.bkt.clouddn.com/qu_la_wap.js 302 +^https?:\/\/m\.yhd\.com\/1\/\? http://m.yhd.com/1/?adbock= 302 +^https?:\/\/n\.mark\.letv\.com\/m3u8api\/ http://burpsuite.applinzi.com/Interface header +^https?:\/\/sqimg\.qq\.com\/ https://sqimg.qq.com/ 302 +^https?:\/\/static\.m\.ttkvod\.com\/static_cahce\/index\/index\.txt http://ogtre5vp0.bkt.clouddn.com/Static/TXT/index.txt header +^https?:\/\/www\.iqshw\.com\/d\/js\/m http://burpsuite.applinzi.com/Interface header +^https?:\/\/www\.iqshw\.com\/d\/js\/m http://rewrite.websocket.site:10/Other/Static/JS/Package.js? header + +// Tiktok +(?<=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] +^*.bdimg.com header-del Referer +^*.qpic.cn header-replace User-Agent WeChat/6.5.22.32 CFNetwork/889.9 Darwin/17.2.0 +^*.qpic.cn header-del Referer +^*.ph.126.net header-del Referer +^*.zhimg.com header-del Referer +^*.cnbetacdn.com header-del Referer +^*.zhiding.cn header-del Referer +^*.c114.com.cn header-del Referer +^https?://www.biquge.com.tw header-del Cookie +^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] \ No newline at end of file From ab34be79990e2c62fe551707be7fd7aefe33d753 Mon Sep 17 00:00:00 2001 From: GeekQu Date: Sat, 15 Dec 2018 23:43:45 +0800 Subject: [PATCH 4/6] fix bug --- app/Controllers/LinkController.php | 2 +- resources/conf/quantumult.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index d5e1c251..a7c539ed 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -180,7 +180,7 @@ class LinkController extends BaseController return $newResponse; } - public static function GetIosConf($user, $mu = 0, $surge = 0) + public static function GetSurge($user, $mu = 0, $surge = 0) { $proxy_name=""; diff --git a/resources/conf/quantumult.tpl b/resources/conf/quantumult.tpl index 5ed87e63..1e7b13bd 100644 --- a/resources/conf/quantumult.tpl +++ b/resources/conf/quantumult.tpl @@ -1,5 +1,5 @@ [Proxy] -{$ss_group} +{$ss_group}{$ssr_group}{$v2ray_group} [POLICY] {$quan_proxy_group} From de112cd7fcb4f77c3675e7dc054a5d89f735bdd4 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Sun, 16 Dec 2018 19:28:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsyncjob=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/Job.php | 8 ++++++-- resources/views/material/user/index.tpl | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Command/Job.php b/app/Command/Job.php index 64e379ae..2d812f12 100644 --- a/app/Command/Job.php +++ b/app/Command/Job.php @@ -38,11 +38,15 @@ class Job if ($node->sort == 11) { $server_list = explode(";", $node->server); if(!Tools::is_ip($server_list[0])){ - $node->changeNodeIp($server_list[0]); + if($node->changeNodeIp($server_list[0])){ + $node->save(); + } } } else if($node->sort == 0 || $node->sort == 1 || $node->sort == 10){ if(!Tools::is_ip($node->server)){ - $node->changeNodeIp($node->server); + if($node->changeNodeIp($node->server)){ + $node->save(); + } } } } diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index b64f1d62..8aaf96c4 100644 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -388,7 +388,8 @@ {$user = URL::getSSConnectInfo($pre_user)} {$ss_url_all = URL::getAllUrl($pre_user, 0, 1)} {$ss_url_all_mu = URL::getAllUrl($pre_user, 1, 1)} - {$ss_url_all_win = URL::getAllUrl($pre_user, 0, 2)} + {$ss_url_all_win = URL::getAllUrl($pre_user, 0, 2)} + {$ssd_url_all =URL::getAllSSDUrl($user)} {if URL::SSCanConnect($user)}
@@ -416,7 +417,6 @@ {/if}
- {$ssd_url_all =URL::getAllSSDUrl($user)}

filter_1save_alt ็‚นๅ‡ปไธ‹่ฝฝ SSD๏ผŒ่งฃๅŽ‹่‡ณไปปๆ„็ฃ็›˜ๅนถ่ฟ่กŒ

filter_2 ไปปๅŠกๆ ๅณไธ‹่ง’ๅณ้”ฎ็บธ้ฃžๆœบๅ›พๆ ‡->ๆœๅŠกๅ™จ่ฎข้˜…->SSDๆœๅŠกๅ™จ่ฎข้˜…่ฎพ็ฝฎ๏ผŒๅฐ†่ฎข้˜…้“พๆŽฅ่ฎพ็ฝฎไธบไธ‹้ข็š„ๅœฐๅ€๏ผŒ็กฎๅฎšไน‹ๅŽๅ†ๆ›ดๆ–ฐSSDๆœๅŠกๅ™จ่ฎข้˜…

filter_3 ็„ถๅŽ้€‰ๆ‹ฉไธ€ไธชๅˆ้€‚็š„ๆœๅŠกๅ™จ๏ผŒไปฃ็†่ง„ๅˆ™้€‰โ€œ็ป•่ฟ‡ๅฑ€ๅŸŸ็ฝ‘ๅ’Œๅคง้™†โ€๏ผŒ็„ถๅŽๅณๅฏไธŠ็ฝ‘

From 6defaac7bd7e714c94ea5dd734e7f8cfaf9111a8 Mon Sep 17 00:00:00 2001 From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com> Date: Sun, 16 Dec 2018 20:08:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2modal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/material/admin/user/edit.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/material/admin/user/edit.tpl b/resources/views/material/admin/user/edit.tpl index b8c09b8b..55671c48 100644 --- a/resources/views/material/admin/user/edit.tpl +++ b/resources/views/material/admin/user/edit.tpl @@ -321,16 +321,16 @@ }, success: data => { if (data.ret) { - $("result").modal(); + $("#result").modal(); $$.getElementById('msg').innerHTML = data.msg; window.setTimeout("location.href=top.document.referrer", {$config['jump_delay']}); } else { - $("result").modal(); + $("#result").modal(); $$.getElementById('msg').innerHTML = data.msg; } }, error: jqXHR => { - $("result").modal(); + $("#result").modal(); $$.getElementById('msg').innerHTML = `ๅ‘็”Ÿ้”™่ฏฏ๏ผš${ldelim}jqXHR.status{rdelim}`; } });