xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 使用 ApiMessage 统一错误响应格式

Browse Source 
- 在多个控制器中引入 ApiMessage，替换原有的 ApiResponse 错误处理逻辑，确保错误信息的一致性与可读性。
- 更新错误返回信息，使用更具语义的键值，提升 API 的可维护性与用户体验。
- 适配相关控制器的请求参数，确保在处理错误时能够正确返回相应的错误信息。
This commit is contained in:
kang
2026-06-01 14:23:48 +08:00
parent e547e2b4a6
commit e6cf94af46
59 changed files with 518 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Api/V1/Admin/User/AdminRoleDestroyController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User;
use App\Models\AdminRole;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Services\AuditLogger;
@@ -16,13 +17,13 @@ final class AdminRoleDestroyController extends Controller
public function __invoke(Request $request, AdminRole $admin_role): JsonResponse
{
if ($admin_role->slug === AdminRole::ROLE_SUPER_ADMIN) {
return ApiResponse::error('不能删除超级管理员角色', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_cannot_delete_super_admin', ErrorCode::ValidationFailed->value, null, 422);
}
if ((bool) $admin_role->is_system) {
return ApiResponse::error('系统内置角色不允许删除', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_builtin_cannot_delete', ErrorCode::ValidationFailed->value, null, 422);
}
if ($admin_role->assignedUserCount() > 0) {
return ApiResponse::error('该角色下仍有关联管理员，不能删除', ErrorCode::ValidationFailed->value, null, 422);
return ApiMessage::errorResponse($request, 'admin.role_has_users_cannot_delete', ErrorCode::ValidationFailed->value, null, 422);
}
$before = AdminRoleApiPresenter::item($admin_role);

15
app/Http/Controllers/Api/V1/Admin/User/AdminUserDestroyController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use App\Services\AuditLogger;
@@ -20,12 +21,7 @@ final class AdminUserDestroyController extends Controller
$actor = $request->lotteryAdmin();
if ((int) $actor->getKey() === (int) $admin_user->getKey()) {
return ApiResponse::error(
'不能删除当前登录账号',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_self', ErrorCode::ValidationFailed->value, null, 422);
}
$admin_user->load('roles');
@@ -35,12 +31,7 @@ final class AdminUserDestroyController extends Controller
->whereHas('roles', static fn ($q) => $q->where('admin_roles.slug', AdminUser::ROLE_SUPER_ADMIN))
->exists();
if (! $hasOther) {
return ApiResponse::error(
'不能删除最后一个超级管理员',
ErrorCode::ValidationFailed->value,
null,
422,
);
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_last_super_admin', ErrorCode::ValidationFailed->value, null, 422);
}
}

8
app/Http/Controllers/Api/V1/Admin/User/Concerns/EnsuresSuperAdminActor.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin\User\Concerns;
use App\Models\AdminUser;
use App\Lottery\ErrorCode;
use App\Support\ApiMessage;
use App\Support\ApiResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -15,12 +16,7 @@ trait EnsuresSuperAdminActor
/** @var AdminUser $actor */
$actor = $request->lotteryAdmin();
if (! $actor->isSuperAdmin()) {
return ApiResponse::error(
'仅超级管理员可管理角色',
ErrorCode::AdminForbidden->value,
null,
403,
);
return ApiMessage::errorResponse($request, 'admin.super_admin_only_for_roles', ErrorCode::AdminForbidden->value, null, 403);
}
return null;