From 24a94428e84a67bad22f69ba18e895d584880d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 9 Oct 2026 16:35:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=81=9C=E7=94=A8=E8=B4=A6=E5=8F=B7):=20?= =?UTF-8?q?=E5=81=9C=E7=94=A8/=E5=88=A0=E9=99=A4=E5=8D=B3=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E4=B8=8B=E7=BA=BF=E5=B9=B6=E7=82=B9=E5=90=8D=E6=88=90?= =?UTF-8?q?=E5=9B=A0=E2=80=94=E2=80=94=E5=86=99=E5=85=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?X-Auth-Reason=20=E5=A4=B4=E3=80=81=E4=B8=89=E9=9D=A2=E6=8E=A5?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Java:AdminUserUpdateRequest 加 disabled 开关(不能停自己、归属门沿用既有闸), AccountExpiryService/AdminAuthSupport 抛停用/删除子类型,GlobalExceptionHandler 打 X-Auth-Reason: disabled|deleted 响应头;业务码保持 401 不变,不惊动三个既有消费者 - 后台管理:用户页停用/解除停用按钮 + 已停用徽章;拦截器把成因随 &auth= 带给登录页, 登录页分停用/删除两种文案;源码钉子棘轮基线按正路重生成 - 用户端:kick-handler 按 X-Auth-Reason 分支亮停用/删除标记(互斥清理), 登录页两段专属文案且各自关自动登录;跳转目标仍是 /login?expired=1 - 反假绿:摘掉成因头注入实测 2/4 红(变异自证),还原等值后复跑回绿 --- admin-frontend-vue/src/api/http.ts | 15 +- admin-frontend-vue/src/api/users-model.ts | 2 + admin-frontend-vue/src/api/users.ts | 9 + .../src/pages/account/UsersPage.vue | 47 +++++- .../src/pages/account/user-disable-model.ts | 25 +++ .../src/pages/login/LoginPage.vue | 7 + admin-frontend-vue/src/types/admin.ts | 2 + .../tests/baselines/source-pin-ledger.json | 15 +- .../forbidden-not-login-redirect.test.ts | 5 +- admin-frontend-vue/tests/user-disable.test.ts | 86 ++++++++++ .../exception/AccountDeletedException.java | 14 ++ .../exception/AccountDisabledException.java | 16 ++ .../exception/GlobalExceptionHandler.java | 13 +- .../common/security/AccountExpiryService.java | 4 +- .../common/security/AdminAuthSupport.java | 3 +- .../model/dto/AdminUserUpdateRequest.java | 6 + .../admin/model/vo/AdminUserItemVo.java | 3 + .../admin/service/AdminUserService.java | 17 +- .../GlobalExceptionHandlerAuthReasonTest.java | 57 +++++++ .../security/AccountDisabledGateTest.java | 9 + .../admin/service/AdminUserDisableTest.java | 143 ++++++++++++++++ .../src/pages/login/DesktopLoginPage.vue | 35 +++- frontend-vue/src/shared/api/http.ts | 11 +- frontend-vue/src/shared/auth/kick-handler.ts | 37 ++++- .../tests/account-state-signout.test.ts | 154 ++++++++++++++++++ 25 files changed, 704 insertions(+), 31 deletions(-) create mode 100644 admin-frontend-vue/src/pages/account/user-disable-model.ts create mode 100644 admin-frontend-vue/tests/user-disable.test.ts create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/exception/AccountDeletedException.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/exception/AccountDisabledException.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/common/exception/GlobalExceptionHandlerAuthReasonTest.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/admin/service/AdminUserDisableTest.java create mode 100644 frontend-vue/tests/account-state-signout.test.ts diff --git a/admin-frontend-vue/src/api/http.ts b/admin-frontend-vue/src/api/http.ts index 21d704552..6f2d63bba 100644 --- a/admin-frontend-vue/src/api/http.ts +++ b/admin-frontend-vue/src/api/http.ts @@ -17,12 +17,19 @@ export const http = axios.create({ timeout: 30_000, }) -function redirectToLogin(requestUrl?: string): void { +/** 会话失效成因(后端 X-Auth-Reason 头):disabled=已停用、deleted=已删除;其余 401 无成因。 */ +function authReasonOf(headers: unknown): string { + const value = (headers as Record | undefined)?.['x-auth-reason'] + return value === 'disabled' || value === 'deleted' ? value : '' +} + +function redirectToLogin(requestUrl?: string, reason = ''): void { if (typeof window === 'undefined') return // 已在登录页或失败请求即登录端点时不再跳转,避免登录页循环与吞掉登录失败反馈。 if (!shouldRedirectUnauthorized(window.location.pathname, requestUrl)) return const target = loginRedirectTarget(window.location) - window.location.assign('/admin-vue/login?redirect=' + target) + // 成因随 query 带给登录页点名(停用/删除),登录页据此显示对应提示 + window.location.assign('/admin-vue/login?redirect=' + target + (reason ? `&auth=${reason}` : '')) } /** 403 只在会话引导端点上才当"进不了后台"处理;其余端点的 403 交给页面自己把原因说出来。 */ @@ -47,7 +54,7 @@ http.interceptors.response.use( if (isKicked(response.data)) { redirectToLoginKicked() } else if (isUnauthorized(response.data)) { - redirectToLogin(response.config?.url) + redirectToLogin(response.config?.url, authReasonOf(response.headers)) } else if (isForbidden(response.data)) { redirectToLoginOnForbidden(response.config?.url) } @@ -57,7 +64,7 @@ http.interceptors.response.use( if (isKicked(error?.response?.data)) { redirectToLoginKicked() } else if (error?.response?.status === 401 || isUnauthorized(error?.response?.data)) { - redirectToLogin(error?.config?.url) + redirectToLogin(error?.config?.url, authReasonOf(error?.response?.headers)) } else if (error?.response?.status === 403 || isForbidden(error?.response?.data)) { redirectToLoginOnForbidden(error?.config?.url) } diff --git a/admin-frontend-vue/src/api/users-model.ts b/admin-frontend-vue/src/api/users-model.ts index 45e93b98e..d9ddd2bee 100644 --- a/admin-frontend-vue/src/api/users-model.ts +++ b/admin-frontend-vue/src/api/users-model.ts @@ -29,6 +29,8 @@ export function toAdminUserItem(raw: unknown): AdminUser | null { if (creator) item.creatorUsername = creator const expiresAt = text(r.expires_at) if (expiresAt) item.expiresAt = expiresAt + const disabledAt = text(r.disabled_at) + if (disabledAt) item.disabledAt = disabledAt const abbr = text(r.pinyin_abbr) if (abbr) item.pinyinAbbr = abbr return item diff --git a/admin-frontend-vue/src/api/users.ts b/admin-frontend-vue/src/api/users.ts index bcc3deb13..48264b19e 100644 --- a/admin-frontend-vue/src/api/users.ts +++ b/admin-frontend-vue/src/api/users.ts @@ -24,3 +24,12 @@ export async function deleteUser(uid: number): Promise { const { data } = await http.delete(`/api/admin/user/${uid}`) unwrap(data) } + +/** + * 停用/解除停用:PUT /api/admin/user/{uid} 只带 disabled 开关(V155)。 + * 停用是硬停点:该账号已发令牌在下一次请求就被拒(401),客户端与后台会被强制退出到登录页。 + */ +export async function setUserDisabled(uid: number, disabled: boolean): Promise { + const { data } = await http.put(`/api/admin/user/${uid}`, { disabled }) + unwrap(data) +} diff --git a/admin-frontend-vue/src/pages/account/UsersPage.vue b/admin-frontend-vue/src/pages/account/UsersPage.vue index 67b176dec..3fc2ea3df 100644 --- a/admin-frontend-vue/src/pages/account/UsersPage.vue +++ b/admin-frontend-vue/src/pages/account/UsersPage.vue @@ -8,11 +8,12 @@ import type { AdminUser } from '@/types/admin' import { roleLabel } from '@/types/admin' import { useAdminSessionStore } from '@/stores/admin-session' import { useCompanyTabStore } from '@/stores/company-tab' -import { deleteUser, fetchUserList } from '@/api/users' +import { deleteUser, fetchUserList, setUserDisabled } from '@/api/users' import { fetchCompanies } from '@/api/companies' import { createUserFilterState, toUserListParams, type UserFilterState } from './users-filter' import { totalPageCount } from './user-pagination' import { deleteBlockReason, deleteConfirmMessage } from './user-delete-model' +import { disableBlockReason, disableConfirmMessage, disabledBadgeText } from './user-disable-model' import { listPhaseOf, userListEmptyHint } from './user-list-state' import { editableBy } from './user-edit-model' import { formatExpiryCell } from './user-expiry' @@ -117,6 +118,24 @@ async function removeUser(row: AdminUser) { } } +/** 停用/解除停用:先过身份闸,原生 confirm 说出代价(对方会被强制退出到登录页)后提交。 */ +async function toggleDisable(row: AdminUser) { + const wantDisable = !row.disabledAt + const reason = disableBlockReason(row, currentUserId.value) + if (reason) { + ElMessage.warning(reason) + return + } + if (!window.confirm(disableConfirmMessage(row, wantDisable))) return + try { + await setUserDisabled(row.id, wantDisable) + ElMessage.success(wantDisable ? '已停用,该账号会被强制退出到登录页' : '已解除停用') + await loadUsers() + } catch (error) { + ElMessage.error(error instanceof Error ? error.message : '操作失败') + } +} + function changePage(page: number) { filters.page = page void loadUsers() @@ -203,6 +222,7 @@ onMounted(() => { 角色 所属管理员 到期时间 + 状态 创建时间 更新时间 操作 @@ -218,6 +238,9 @@ onMounted(() => { {{ formatExpiryCell(row).text }} + + {{ disabledBadgeText(row) }} + {{ formatDateTime(row.createdAt) }} {{ formatDateTime(row.updatedAt) }} @@ -230,6 +253,15 @@ onMounted(() => { > 编辑 +