From 001f0ced4117642f1cdee491a03f60bc8280e0b8 Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Sat, 4 Jul 2020 17:40:23 +0800
Subject: [PATCH] update client

---
 app/Http/Controllers/Client/AppController.php | 6 +++---
 resources/rules/app.clash.yaml                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Client/AppController.php b/app/Http/Controllers/Client/AppController.php
index 60fa7c19..f43a8e6b 100644
--- a/app/Http/Controllers/Client/AppController.php
+++ b/app/Http/Controllers/Client/AppController.php
@@ -39,9 +39,9 @@ class AppController extends Controller
             array_push($proxies, $item->name);
         }
 
-        $config['Proxy'] = array_merge($config['Proxy'] ? $config['Proxy'] : [], $proxy);
-        foreach ($config['Proxy Group'] as $k => $v) {
-            $config['Proxy Group'][$k]['proxies'] = array_merge($config['Proxy Group'][$k]['proxies'], $proxies);
+        $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
+        foreach ($config['proxy-groups'] as $k => $v) {
+            $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
         die(Yaml::dump($config));
     }
diff --git a/resources/rules/app.clash.yaml b/resources/rules/app.clash.yaml
index 6857d60c..49b88e46 100644
--- a/resources/rules/app.clash.yaml
+++ b/resources/rules/app.clash.yaml
@@ -16,14 +16,14 @@ dns:
   fallback:
     - tls://1.0.0.1:853
     - tls://dns.google:853
-Proxy:
+proxies:
 
-Proxy Group:
+proxy-groups:
   - { name: "SELECT", type: select, proxies: ["自动选择", "故障转移"] }
   - { name: "自动选择", type: url-test, proxies: [], url: "http://www.gstatic.com/generate_204", interval: 86400 }
   - { name: "故障转移", type: fallback, proxies: [], url: "http://www.gstatic.com/generate_204", interval: 7200 }
 
-Rule:
+rules:
   # Apple
   - DOMAIN,safebrowsing.urlsec.qq.com,DIRECT # 如果您并不信任此服务提供商或防止其下载消耗过多带宽资源，可以进入 Safari 设置，关闭 Fraudulent Website Warning 功能，并使用 REJECT 策略。
   - DOMAIN,safebrowsing.googleapis.com,DIRECT # 如果您并不信任此服务提供商或防止其下载消耗过多带宽资源，可以进入 Safari 设置，关闭 Fraudulent Website Warning 功能，并使用 REJECT 策略。