From 0ff41906589c60ca8cad1d0fc949cf0d706c27bf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Dec 2019 16:23:55 +0800 Subject: [PATCH] update --- .../Server/DeepbworkController.php | 2 - app/Http/Controllers/UserController.php | 56 ------------------- routes/api.php | 2 - update.sql | 5 +- 4 files changed, 4 insertions(+), 61 deletions(-) diff --git a/app/Http/Controllers/Server/DeepbworkController.php b/app/Http/Controllers/Server/DeepbworkController.php index 1a0f82c1..a26cef82 100644 --- a/app/Http/Controllers/Server/DeepbworkController.php +++ b/app/Http/Controllers/Server/DeepbworkController.php @@ -22,8 +22,6 @@ class DeepbworkController extends Controller abort(500, 'fail'); } Redis::set('server_last_check_at_' . $server->id, time()); - $server->last_check_at = time(); - $server->save(); $users = User::whereIn('group_id', json_decode($server->group_id)) ->select([ 'id', diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 37064528..0f0e0039 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -62,30 +62,6 @@ class UserController extends Controller 'data' => $user ]); } - - public function dashboard (Request $request) { - $user = User::find($request->session()->get('id')); - if ($user->plan_id) { - $user['plan'] = Plan::find($user->plan_id); - } - $user['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token']; - $stat = [ - Order::where('status', 0) - ->where('user_id', $request->session()->get('id')) - ->count(), - Ticket::where('status', 0) - ->where('user_id', $request->session()->get('id')) - ->count(), - User::where('invite_user_id', $request->session()->get('id')) - ->count() - ]; - return response([ - 'data' => [ - 'user' => $user, - 'stat' => $stat - ] - ]); - } public function getStat (Request $request) { $stat = [ @@ -117,38 +93,6 @@ class UserController extends Controller ]); } - public function subscribe (Request $request) { - $user = User::find($request->session()->get('id')); - $server = []; - if ($user->plan_id) { - $user['plan'] = Plan::find($user->plan_id); - if (!$user['plan']) { - abort(500, '订阅计划不存在'); - } - 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); - } - $user['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token']; - return response([ - 'data' => [ - 'user' => $user, - 'server' => $server - ] - ]); - } - public function resetSecurity (Request $request) { $user = User::find($request->session()->get('id')); $user->v2ray_uuid = Helper::guid(true); diff --git a/routes/api.php b/routes/api.php index 474e84c3..4b8959bd 100755 --- a/routes/api.php +++ b/routes/api.php @@ -61,8 +61,6 @@ Route::prefix('v1') ->group(function () { // User Route::get ('resetSecurity', 'UserController@resetSecurity'); - Route::get ('dashboard', 'UserController@dashboard'); - Route::get ('subscribe', 'UserController@subscribe'); Route::get ('logout', 'UserController@logout'); Route::get ('info', 'UserController@info'); Route::post('changePassword', 'UserController@changePassword'); diff --git a/update.sql b/update.sql index b0d67b59..7b20722f 100644 --- a/update.sql +++ b/update.sql @@ -64,4 +64,7 @@ ALTER TABLE `v2_server_log` CHANGE `node_id` `server_id` int(11) NOT NULL AFTER `user_id`, CHANGE `u` `u` varchar(255) COLLATE 'utf8_general_ci' NOT NULL AFTER `server_id`, CHANGE `d` `d` varchar(255) COLLATE 'utf8_general_ci' NOT NULL AFTER `u`, -CHANGE `rate` `rate` int(11) NOT NULL AFTER `d`; \ No newline at end of file +CHANGE `rate` `rate` int(11) NOT NULL AFTER `d`; + +ALTER TABLE `v2_server` +DROP `last_check_at`; \ No newline at end of file