From 9066119fb5d93b4d804218268d9bdbccfd19a2d2 Mon Sep 17 00:00:00 2001
From: root <root@root.com>
Date: Sun, 15 Dec 2019 22:03:17 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/ServerController.php | 3 +--
 app/Http/Controllers/UserController.php         | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php
index a0990a30..56b9a5a3 100755
--- a/app/Http/Controllers/Admin/ServerController.php
+++ b/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']);
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8bf8038a..2948f918 100755
--- a/app/Http/Controllers/UserController.php
+++ b/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)) {