Skip to content

Commit

Permalink
team search
Browse files Browse the repository at this point in the history
  • Loading branch information
Last-Order committed Oct 27, 2017
1 parent ff5f8f9 commit c3358aa
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
27 changes: 25 additions & 2 deletions app/Http/Controllers/TeamController.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,28 @@ public function publicListTeams(Request $request)
}
}

public function search(Request $request)
{
$validator = \Validator::make($request->only('keyword'), [
'keyword' => 'required'
], [
'keyword.required' => '缺少关键词字段'
]);

if ($validator->fails()) {
return APIReturn::error('invalid_parameters', $validator->errors()->all(), 400);
}

try{
$keyword = $request->input('keyword');
$teams = Team::where('team_name', 'like', "%$keyword%")->get();
return APIReturn::success($teams);
}
catch (\Exception $e){
return APIReturn::error("database_error", "数据库读写错误", 500);
}
}

/**
* 封禁队伍
* @param Request $request
Expand All @@ -188,6 +210,7 @@ public function banTeam(Request $request)
if ($validator->fails()) {
return APIReturn::error('invalid_parameters', $validator->errors()->all(), 400);
}

try {
Team::where('team_id', $request->input('teamId'))->update([
'banned' => true
Expand Down Expand Up @@ -301,8 +324,8 @@ public function getRanking(Request $request)
'email', 'admin', 'banned', 'created_at', 'updated_at', 'lastLoginTime', 'signUpTime', 'flag', 'category_id', 'level_id', 'challenge_id', 'log_id', 'score', 'token'
]);

$result = $result->filter(function($team){
return $team->dynamic_total_score != 0;
$result = $result->filter(function ($team) {
return $team->dynamic_total_score != 0;
});

return APIReturn::success($result);
Expand Down
2 changes: 1 addition & 1 deletion config/jwt.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
|
*/

'ttl' => 10,
'ttl' => 60,

/*
|--------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

Route::group(['middleware' => ['jwt.auth.mod', 'AdminCheck']], function () {
Route::get('list', 'TeamController@listTeams');
Route::get('search', 'TeamController@search');
Route::post('ban', 'TeamController@banTeam');
Route::post('unban', 'TeamController@unbanTeam');
Route::post('setAdmin', 'TeamController@setAdmin');
Expand Down

0 comments on commit c3358aa

Please sign in to comment.