yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-01-11 00:29:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: clash proxies merge

Browse Source
This commit is contained in:
Tokumeikoi 2020-09-01 10:08:42 +08:00
parent d9d1947625
commit 31a222f3d8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Client/ClientController.php
View File

@ -216,6 +216,7 @@ class ClientController extends Controller
$config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy); $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
foreach ($config['proxy-groups'] as $k => $v) { 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); $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
} }
$yaml = Yaml::dump($config); $yaml = Yaml::dump($config);

2
config/app.php
View File

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