root 5 years ago
parent
commit
9066119fb5

+ 1 - 2
app/Http/Controllers/Admin/ServerController.php

@@ -14,8 +14,7 @@ use App\Models\User;
 class ServerController extends Controller
 {
     public function index (Request $request) {
-        $server = Server::orderBy('name')
-            ->get();
+        $server = Server::get();
         for ($i = 0; $i < count($server); $i++) {
             if (!empty($server[$i]['tags'])) {
                 $server[$i]['tags'] = json_decode($server[$i]['tags']);

+ 3 - 1
app/Http/Controllers/UserController.php

@@ -98,7 +98,9 @@ class UserController extends Controller
                 abort(500, '订阅计划不存在');
             }
             if ($user->expired_at > time()) {
-                $servers = Server::where('show', 1)->get();
+                $servers = Server::where('show', 1)
+                    ->orderBy('name')
+                    ->get();
                 foreach ($servers as $item) {
                     $groupId = json_decode($item['group_id']);
                     if (in_array($user->group_id, $groupId)) {