From f1c28a84a114d2e4edf0c93d10eb13eb185577dc Mon Sep 17 00:00:00 2001
From: root <root@root.com>
Date: Mon, 23 Dec 2019 15:38:50 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/NoticeController.php |  2 +-
 app/Http/Controllers/ServerController.php | 46 +++++++++++------------
 routes/api.php                            |  4 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/NoticeController.php b/app/Http/Controllers/NoticeController.php
index 7eec0e26..52454441 100644
--- a/app/Http/Controllers/NoticeController.php
+++ b/app/Http/Controllers/NoticeController.php
@@ -9,7 +9,7 @@ use App\Utils\Helper;
 
 class NoticeController extends Controller
 {
-    public function index (Request $request) {
+    public function getNotice (Request $request) {
         return response([
             'data' => Notice::orderBy('created_at', 'DESC')->first()
         ]);
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 5329fdb1..b8d560c3 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -12,6 +12,29 @@ use App\Models\User;
 use App\Utils\Helper;
 
 class ServerController extends Controller {
+    public function getServers (Request $request) {
+        $user = User::find($request->session()->get('id'));
+        $server = [];
+        if ($user->expired_at > time()) {
+            $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)) {
+                    array_push($server, $item);
+                }
+            }
+        }
+        for ($i = 0; $i < count($server); $i++) {
+            $server[$i]['link'] = Helper::buildVmessLink($server[$i], $user);
+            $server[$i]['last_check_at'] = Redis::get('server_last_check_at_' . $server[$i]['id']);
+        }
+        return response([
+            'data' => $server
+        ]);
+    }
+
     public function getTrafficLog (Request $request) {
     	$type = $request->input('type') ? $request->input('type') : 0;
         $current = $request->input('current') ? $request->input('current') : 1;
@@ -38,27 +61,4 @@ class ServerController extends Controller {
             'sum' => $sum
         ]);
     }
-
-    public function getServers (Request $request) {
-        $user = User::find($request->session()->get('id'));
-        $server = [];
-        if ($user->expired_at > time()) {
-            $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)) {
-                    array_push($server, $item);
-                }
-            }
-        }
-        for ($i = 0; $i < count($server); $i++) {
-            $server[$i]['link'] = Helper::buildVmessLink($server[$i], $user);
-            $server[$i]['last_check_at'] = Redis::get('server_last_check_at_' . $server[$i]['id']);
-        }
-        return response([
-            'data' => $server
-        ]);
-    }
 }
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 61d24feb..d04f1006 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -86,15 +86,15 @@ Route::prefix('v1')
                 Route::get ('tutorial/getSubscribeUrl', 'TutorialController@getSubscribeUrl');
                 Route::get ('tutorial/getAppleID', 'TutorialController@getAppleID');
                 // Notice
-                Route::get ('notice', 'NoticeController@index');
+                Route::get ('notice/getNotice', 'NoticeController@getNotice');
                 // Ticket
                 Route::get ('ticket', 'TicketController@index');
                 Route::post('ticket/save', 'TicketController@save');
                 Route::post('ticket/reply', 'TicketController@reply');
                 Route::post('ticket/close', 'TicketController@close');
                 // Server
-                Route::get ('server/getTrafficLog', 'ServerController@getTrafficLog');
                 Route::get ('server/getServers', 'ServerController@getServers');
+                Route::get ('server/getTrafficLog', 'ServerController@getTrafficLog');
             });
 
         // Passport