diff --git a/.gitignore b/.gitignore index 75ad02d..be88237 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ yarn-error.log /.nova /.vscode /.zed +.DS_Store \ No newline at end of file diff --git a/app/Http/Controllers/ArtistController.php b/app/Http/Controllers/Api/ArtistController.php similarity index 95% rename from app/Http/Controllers/ArtistController.php rename to app/Http/Controllers/Api/ArtistController.php index a22cdac..7080d6e 100644 --- a/app/Http/Controllers/ArtistController.php +++ b/app/Http/Controllers/Api/ArtistController.php @@ -1,7 +1,8 @@ api_plain_token; } - return ApiResponse::success(['token' => $token]); + return ApiResponse::success(['token' => $token,'user' => $user]); } /** @@ -120,4 +121,36 @@ class AuthController extends Controller { return ApiResponse::success($request->user()); } + /** + * @OA\Post( + * path="/api/logout", + * summary="登出", + * tags={"Auth"}, + * security={{"Authorization":{}}}, + * @OA\Response( + * response=200, + * description="成功登出", + * @OA\JsonContent( + * allOf={ + * @OA\Schema(ref="#/components/schemas/ApiResponse"), + * @OA\Schema( + * @OA\Property(property="data", type="null") + * ) + * } + * ) + * ), + * @OA\Response( + * response=401, + * description="Unauthorized" + * ) + * ) + */ + public function logout(Request $request) + { + $request->user()->currentAccessToken()->delete(); + $request->user()->forceFill([ + 'api_plain_token' => null, + ])->save(); + return ApiResponse::success(); + } } diff --git a/app/Http/Controllers/BranchControlController.php b/app/Http/Controllers/Api/BranchControlController.php similarity index 98% rename from app/Http/Controllers/BranchControlController.php rename to app/Http/Controllers/Api/BranchControlController.php index fa01d01..ffe0bb9 100644 --- a/app/Http/Controllers/BranchControlController.php +++ b/app/Http/Controllers/Api/BranchControlController.php @@ -1,7 +1,8 @@ name('api.artists.search'); +Route::get('/artists/search', [ArtistController::class, 'search'])->name('api.artists.search'); Route::post('/login', [AuthController::class, 'login']); Route::post('/room/receiveRegister', [RoomControlController::class, 'receiveRegister']); diff --git a/開發手冊.ini b/開發手冊.ini index cb91f40..f677f48 100644 --- a/開發手冊.ini +++ b/開發手冊.ini @@ -104,7 +104,7 @@ php artisan make:observer RoomObserver --model=Room --memory=5120 -php artisan queue:work --timeout=600 --memory=1024 +php artisan queue:work --timeout=600 --memory=5120M php artisan queue:work --daemon --timeout=3600 --tries=1 --queue=default