mirror of
https://github.com/v2board/v2board.git
synced 2025-02-10 23:49:12 +08:00
update: change server log api to getServerLogs
This commit is contained in:
parent
b4e657f463
commit
1716f2f6ca
@ -31,37 +31,21 @@ class ServerController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function logFetch(Request $request)
|
public function getServerLogs(Request $request)
|
||||||
{
|
{
|
||||||
$type = $request->input('type') ? $request->input('type') : 0;
|
|
||||||
$current = $request->input('current') ? $request->input('current') : 1;
|
|
||||||
$pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
|
|
||||||
$serverLogModel = ServerLog::select([
|
$serverLogModel = ServerLog::select([
|
||||||
DB::raw('sum(u) as u'),
|
DB::raw('sum(u) as u'),
|
||||||
DB::raw('sum(d) as d'),
|
DB::raw('sum(d) as d'),
|
||||||
'log_at',
|
'log_at',
|
||||||
'user_id',
|
'user_id',
|
||||||
'updated_at'
|
DB::raw('avg(rate) as rate'),
|
||||||
])
|
])
|
||||||
->where('user_id', $request->session()->get('id'))
|
->where('user_id', $request->session()->get('id'))
|
||||||
|
->where('log_at', '>=', strtotime(date('Y-m-1')))
|
||||||
->groupBy('log_at', 'user_id')
|
->groupBy('log_at', 'user_id')
|
||||||
->orderBy('log_at', 'DESC');
|
->orderBy('log_at', 'DESC');
|
||||||
switch ($type) {
|
|
||||||
case 0:
|
|
||||||
$serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')));
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
$serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')) - 604800);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
$serverLogModel->where('log_at', '>=', strtotime(date('Y-m-1')));
|
|
||||||
}
|
|
||||||
$total = $serverLogModel->count();
|
|
||||||
$res = $serverLogModel->forPage($current, $pageSize)
|
|
||||||
->get();
|
|
||||||
return response([
|
return response([
|
||||||
'data' => $res,
|
'data' => $serverLogModel->get()
|
||||||
'total' => $total
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ class UserRoute
|
|||||||
$router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
|
$router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
|
||||||
// Server
|
// Server
|
||||||
$router->get ('/server/fetch', 'User\\ServerController@fetch');
|
$router->get ('/server/fetch', 'User\\ServerController@fetch');
|
||||||
$router->get ('/server/log/fetch', 'User\\ServerController@logFetch');
|
$router->get ('/server/getServerLogs', 'User\\ServerController@getServerLogs');
|
||||||
// Coupon
|
// Coupon
|
||||||
$router->post('/coupon/check', 'User\\CouponController@check');
|
$router->post('/coupon/check', 'User\\CouponController@check');
|
||||||
// Telegram
|
// Telegram
|
||||||
|
Loading…
Reference in New Issue
Block a user