From 31a222f3d87a390489212d2a7213d6d28cfb3474 Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Tue, 1 Sep 2020 10:08:42 +0800
Subject: [PATCH] fix: clash proxies merge

---
 app/Http/Controllers/Client/ClientController.php | 1 +
 config/app.php                                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Client/ClientController.php b/app/Http/Controllers/Client/ClientController.php
index 44084993..b39fe814 100644
--- a/app/Http/Controllers/Client/ClientController.php
+++ b/app/Http/Controllers/Client/ClientController.php
@@ -216,6 +216,7 @@ class ClientController extends Controller
 
         $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
         foreach ($config['proxy-groups'] as $k => $v) {
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
             $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
         $yaml = Yaml::dump($config);
diff --git a/config/app.php b/config/app.php
index 0925b40a..466eb62f 100755
--- a/config/app.php
+++ b/config/app.php
@@ -236,5 +236,5 @@ return [
     | The only modification by laravel config
     |
     */
-    'version' => '1.3.2-d.1'
+    'version' => '1.3.3'
 ];