From fc5c97913dc57cec63d92759004af15aced6dd46 Mon Sep 17 00:00:00 2001
From: "allen.yan" <hungyi0816@gmail.com>
Date: Mon, 1 Sep 2025 17:33:19 +0800
Subject: [PATCH] =?UTF-8?q?202509011732=20=E8=AA=BF=E6=95=B4=20API=20?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../{ => Api}/ArtistController.php            |  3 +-
 .../Controllers/{ => Api}/AuthController.php  | 37 ++++++++++++++++++-
 .../{ => Api}/BranchControlController.php     |  3 +-
 .../{ => Api}/RoomControlController.php       |  5 ++-
 .../Controllers/Api/RoomSongController.php    |  6 +++
 routes/api.php                                | 11 +++---
 開發手冊.ini                                  |  2 +-
 8 files changed, 56 insertions(+), 12 deletions(-)
 rename app/Http/Controllers/{ => Api}/ArtistController.php (95%)
 rename app/Http/Controllers/{ => Api}/AuthController.php (78%)
 rename app/Http/Controllers/{ => Api}/BranchControlController.php (98%)
 rename app/Http/Controllers/{ => Api}/RoomControlController.php (98%)

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 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Models\Artist;
 use Illuminate\Http\Request;
 use OpenApi\Annotations as OA;
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/Api/AuthController.php
similarity index 78%
rename from app/Http/Controllers/AuthController.php
rename to app/Http/Controllers/Api/AuthController.php
index a90a64b..5074c33 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/Api/AuthController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\ReceiveLoginRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -73,7 +74,7 @@ class AuthController extends Controller
         } else {
             $token = $user->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 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/Api/RoomControlController.php
similarity index 98%
rename from app/Http/Controllers/RoomControlController.php
rename to app/Http/Controllers/Api/RoomControlController.php
index 06b4e0c..380e947 100644
--- a/app/Http/Controllers/RoomControlController.php
+++ b/app/Http/Controllers/Api/RoomControlController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\SendRoomSwitchCommandRequest;
 use App\Http\Requests\ReceiveSwitchRequest;
 use App\Http\Requests\SessionRequest;
@@ -17,7 +18,7 @@ use App\Http\Resources\RoomResource;
 use Illuminate\Support\Facades\Log;
 /**
  * @OA\Tag(
- *     name="Auth",
+ *     name="Room Control",
  *     description="包廂控制"
  * )
  */
diff --git a/app/Http/Controllers/Api/RoomSongController.php b/app/Http/Controllers/Api/RoomSongController.php
index 41f5fba..34f25d9 100644
--- a/app/Http/Controllers/Api/RoomSongController.php
+++ b/app/Http/Controllers/Api/RoomSongController.php
@@ -16,6 +16,12 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Carbon;
 use App\Http\Responses\ApiResponse;
 
+/**
+ * @OA\Tag(
+ *     name="Room Control Song",
+ *     description="包廂歌曲點歌控制"
+ * )
+ */
 class RoomSongController extends Controller
 {
     /**
diff --git a/routes/api.php b/routes/api.php
index bfe2531..9ed2e6f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,14 +1,15 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use App\Http\Controllers\ArtistController;
-use App\Http\Controllers\AuthController;
-use App\Http\Controllers\BranchControlController;
-use App\Http\Controllers\RoomControlController;
+use App\Http\Controllers\Api\ArtistController;
+use App\Http\Controllers\Api\AuthController;
+use App\Http\Controllers\Api\BranchControlController;
+use App\Http\Controllers\Api\SyncController;
+use App\Http\Controllers\Api\RoomControlController;
 use App\Http\Controllers\Api\RoomSongController;
 use App\Http\Controllers\Api\SongSearchController;
 
-Route::get('/artists/search', [App\Http\Controllers\ArtistController::class, 'search'])->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