From d3d73fea684c8b901f2300f8f8acc98797c4cdd7 Mon Sep 17 00:00:00 2001 From: beermedlar <32614465+beermedlar@users.noreply.github.com> Date: Sun, 26 Sep 2021 17:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9C=88X=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF=EF=BC=8Csurge=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8F=AA=E8=BF=94=E5=9B=9E=E8=8A=82=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ClientController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 3c456af9..b931e53c 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -16,7 +16,7 @@ class ClientController extends Controller { public function config(string $target, User $user, array $servers) { - if (str_contains($target, 'quantumult%20x')) { + if (str_contains($target, 'quantumult x')) { return $this->quantumultX($user, $servers); } if (str_contains($target, 'quantumult')) { @@ -29,7 +29,7 @@ class ClientController extends Controller return $this->surfboard($user, $servers); } if (str_contains($target, 'surge')) { - return $this->surge($user, $servers); + return $this->surge($target, $user, $servers); } if (str_contains($target, 'shadowrocket')) { return $this->shadowrocket($user, $servers); @@ -173,7 +173,7 @@ class ClientController extends Controller return str_replace(['$subs_link', '$proxies', '$proxy_group'], [$subsURL, $proxies, rtrim($proxyGroup, ', ')], $config); } - private function surge(User $user, array $servers = []) + private function surge(string $target, User $user, array $servers = []) { $proxies = ''; $proxyGroup = ''; @@ -193,6 +193,10 @@ class ClientController extends Controller } } + if (str_contains($target, 'list')) { + return $proxies; + } + $defaultConfig = base_path().'/resources/rules/default.surge.conf'; $customConfig = base_path().'/resources/rules/custom.surge.conf'; if (File::exists($customConfig)) {