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

update

Browse Source
This commit is contained in:
Tokumeikoi 2020-06-12 16:59:18 +08:00
parent 172af72761
commit d418443404
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/User/ServerController.php
View File

@ -24,6 +24,7 @@ class ServerController extends Controller
if ($userService->isAvailable($user)) { if ($userService->isAvailable($user)) {
$serverService = new ServerService(); $serverService = new ServerService();
$servers = $serverService->getAllServers($user); $servers = $serverService->getAllServers($user);
$servers = array_merge($servers['vmess'], $servers['trojan']);
} }
return response([ return response([
'data' => $servers 'data' => $servers

2
public/assets/user/umi.js vendored
View File

File diff suppressed because one or more lines are too long