Tokumeikoi 4 years ago
parent
commit
d418443404
2 changed files with 1 additions and 0 deletions
  1. 1 0
      app/Http/Controllers/User/ServerController.php
  2. 0 0
      public/assets/user/umi.js

+ 1 - 0
app/Http/Controllers/User/ServerController.php

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

File diff suppressed because it is too large
+ 0 - 0
public/assets/user/umi.js


Some files were not shown because too many files changed in this diff