From 27cad571591cd546d07ebdbd9c7948821736e198 Mon Sep 17 00:00:00 2001 From: Jethro Lin Date: Wed, 4 Dec 2024 13:53:58 +0800 Subject: [PATCH] fix response --- .../Api/Admin/ClientController.php | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/Admin/ClientController.php b/app/Http/Controllers/Api/Admin/ClientController.php index 6758a43..6642266 100644 --- a/app/Http/Controllers/Api/Admin/ClientController.php +++ b/app/Http/Controllers/Api/Admin/ClientController.php @@ -45,7 +45,14 @@ public function index(): JsonResponse 'created_at', ])->get(); - return $this->success($clients); + return $this->success([ + 'items' => $clients->map(fn($client) => [ + 'id' => $client->id, + 'name' => $client->name, + 'llm_provider_id' => $client->llm_provider_id, + 'created_at' => $client->created_at->toIso8601String(), + ]) + ]); } catch (\Exception $e) { Log::error('Error fetching clients', [ @@ -81,14 +88,11 @@ public function store(Request $request): JsonResponse ]); $validated['status'] = Client::STATUS_ACTIVE; - $validated['rate_limit'] = config('llm.default_rate_limit', 60); // 默認每分鐘 60 次 - $validated['timeout'] = config('llm.default_timeout', 30); // 默認 30 秒 + $validated['rate_limit'] = config('llm.default_rate_limit', 60); + $validated['timeout'] = config('llm.default_timeout', 30); $client = Client::create($validated); - // 加載 LLM 提供商信息 - $client->load('llmProvider:id,name,service_name'); - $this->logService->logOperation( 'admin', $this->admin->id, @@ -153,9 +157,6 @@ public function update(Request $request, int $id): JsonResponse $client->update($validated); - // 加載 LLM 提供商信息 - $client->load('llmProvider:id,name,service_name'); - $this->logService->logOperation( 'admin', $this->admin->id, @@ -257,7 +258,7 @@ public function generateAuthToken(int $id): JsonResponse if (!$this->admin->canManageClient($client->id)) { return $this->error( ErrorCode::FORBIDDEN, - '您無��管理該客戶。' + '您無權管理該客戶。' ); } @@ -277,8 +278,9 @@ public function generateAuthToken(int $id): JsonResponse ); return $this->success([ + 'client_id' => $client->id, 'auth_token' => $result['token'], - 'expires_at' => $result['expires_at'], + 'created_at' => now()->toIso8601String(), ]); } catch (ModelNotFoundException $e) {