Browse Source

fix: clash proxies merge

Tokumeikoi 4 years ago
parent
commit
31a222f3d8
2 changed files with 2 additions and 1 deletions
  1. 1 0
      app/Http/Controllers/Client/ClientController.php
  2. 1 1
      config/app.php

+ 1 - 0
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);

+ 1 - 1
config/app.php

@@ -236,5 +236,5 @@ return [
     | The only modification by laravel config
     |
     */
-    'version' => '1.3.2-d.1'
+    'version' => '1.3.3'
 ];