From 218338960b5f5e69e98b0190a889c3bacb49a8c4 Mon Sep 17 00:00:00 2001 From: Tokumeikoi Date: Wed, 4 Mar 2020 19:33:33 +0800 Subject: [PATCH] update --- app/Http/Controllers/Client/ClientController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Client/ClientController.php b/app/Http/Controllers/Client/ClientController.php index 093f6ee1..0372e125 100755 --- a/app/Http/Controllers/Client/ClientController.php +++ b/app/Http/Controllers/Client/ClientController.php @@ -140,11 +140,17 @@ class ClientController extends Controller array_push($proxyGroup, [ 'name' => 'select', 'type' => 'select', - 'proxies' => $proxies + 'proxies' => array_merge($proxies, [ + 'auto', + 'fallback-auto' + ]) ]); try { - $rules = Yaml::parseFile(base_path() . '/resources/rules/clash.rule.yaml')['Rule']; + $rules = []; + foreach (glob(base_path() . '/resources/rules/' . '*.rule.yaml') as $file) { + $rules = array_merge($rules, Yaml::parseFile($file)['Rule']); + } } catch (\Exception $e) {} $config = [