diff --git a/admin-frontend-vue/src/api/envelope.ts b/admin-frontend-vue/src/api/envelope.ts
index 0fe9fe1f0..72f3bef28 100644
--- a/admin-frontend-vue/src/api/envelope.ts
+++ b/admin-frontend-vue/src/api/envelope.ts
@@ -1,4 +1,5 @@
-/** API 响应解包与错误归一化(任务 22):纯函数,无框架依赖。 */
+/** API 响应解包与错误归一化(任务 22):纯函数,无框架依赖(只借 config/app 的 base 常量)。 */
+import { joinAdminPath } from '../config/app.ts'
export const REQUEST_FALLBACK_MESSAGE = '网络异常,请稍后重试'
@@ -78,11 +79,22 @@ export function loginRedirectTarget(location: { pathname: string; search: string
/** 登录页统一入口;401 一律跳此路径。 */
export const LOGIN_PATH = '/login'
+/**
+ * 浏览器地址栏里的登录页形态。
+ *
+ *
LOGIN_PATH 是路由内的相对路径(axios 的 url 也用它比较),而 `window.location.pathname`
+ * 带 History base,生产实际值是 `/admin-vue/login`。少这一条,"已经在登录页就别再跳"
+ * 的守卫在真机上一次都没生效过:2026-10-06 那次登录失败,拦截器把整页重刷成
+ * `/admin-vue/login?redirect=…`,连刚填的用户名和错误原因一起没了。
+ */
+export const LOGIN_LOCATION_PATH = joinAdminPath('login')
+
/** 当前 pathname 是否处于登录页(去掉可能携带的查询串后比较)。 */
export function isLoginLocation(pathname: string): boolean {
if (typeof pathname !== 'string') return false
const queryAt = pathname.indexOf('?')
- return (queryAt >= 0 ? pathname.slice(0, queryAt) : pathname) === LOGIN_PATH
+ const path = queryAt >= 0 ? pathname.slice(0, queryAt) : pathname
+ return path === LOGIN_PATH || path === LOGIN_LOCATION_PATH || path === `${LOGIN_LOCATION_PATH}/`
}
/** 把请求 URL(相对或绝对)规整为相对路径,便于与登录入口比较。 */
diff --git a/admin-frontend-vue/src/pages/login/LoginPage.vue b/admin-frontend-vue/src/pages/login/LoginPage.vue
index c12e7950c..374859d95 100644
--- a/admin-frontend-vue/src/pages/login/LoginPage.vue
+++ b/admin-frontend-vue/src/pages/login/LoginPage.vue
@@ -4,6 +4,7 @@ import { computed, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { http } from '@/api/http'
import { joinAdminPath } from '@/config/app'
+import { loginErrorText, unwrapLoginResponse } from './login-feedback'
import { useAdminSessionStore } from '@/stores/admin-session'
const route = useRoute()
@@ -59,13 +60,19 @@ async function submit() {
loading.value = true
try {
const did = deviceId()
- await http.post('/login', { username: user, password: password.value, deviceId: did })
+ const { data } = await http.post('/login', {
+ username: user,
+ password: password.value,
+ deviceId: did,
+ })
+ // 后端失败是 HTTP 200 + success=false,不解包就等于没提示
+ unwrapLoginResponse(data)
session.$reset()
await session.initialize()
const target = safeRedirect(route.query.redirect)
await router.replace(target)
} catch (error) {
- errorMessage.value = error instanceof Error && error.message ? error.message : '用户名或密码错误'
+ errorMessage.value = loginErrorText(error)
loading.value = false
}
}
diff --git a/admin-frontend-vue/src/pages/login/login-feedback.ts b/admin-frontend-vue/src/pages/login/login-feedback.ts
new file mode 100644
index 000000000..9499f99d1
--- /dev/null
+++ b/admin-frontend-vue/src/pages/login/login-feedback.ts
@@ -0,0 +1,31 @@
+/** 登录失败反馈(纯逻辑):把「Java 的 HTTP 200 + success=false」和各类传输层错误都归一成一句能给人看的文案。 */
+import { REQUEST_FALLBACK_MESSAGE, requestErrorMessage, unwrap } from '../../api/envelope.ts'
+
+/** 没有可展示原因时的兜底文案(不再伪装成「用户名或密码错误」)。 */
+export const LOGIN_FALLBACK_MESSAGE = '登录失败,请稍后重试'
+
+/**
+ * 解包登录响应:后端所有失败(密码错、账号到期、失败次数锁定、缺少设备ID)都是 HTTP 200 +
+ * `success:false`,axios 视为成功。不经过这里,登录页就拿不到失败原因——于是"什么都不提示"。
+ */
+export function unwrapLoginResponse(payload: unknown): void {
+ unwrap(payload)
+}
+
+/** 传输层/网关的技术串,对用户没有信息量;命中则换成兜底文案。 */
+function isTechnicalText(text: string): boolean {
+ if (/^request failed with status code \d+$/i.test(text)) return true
+ if (/^(network error|err_network|timeout of \d+ms exceeded)/i.test(text)) return true
+ // nginx / 网关的 HTML 错误页:axios 未解析时会把整页原样交出来
+ return text.startsWith('<')
+}
+
+/** 登录失败可展示文案:优先服务端原因,缺省回兜底。 */
+export function loginErrorText(error: unknown): string {
+ const message = requestErrorMessage(error).trim()
+ // 通用兜底串意味着"没有拿到任何服务端原因",登录页要换成登录语境的文案
+ if (!message || message === REQUEST_FALLBACK_MESSAGE || isTechnicalText(message)) {
+ return LOGIN_FALLBACK_MESSAGE
+ }
+ return message
+}
diff --git a/admin-frontend-vue/tests/login-failure-must-show-reason.test.ts b/admin-frontend-vue/tests/login-failure-must-show-reason.test.ts
new file mode 100644
index 000000000..b373ec356
--- /dev/null
+++ b/admin-frontend-vue/tests/login-failure-must-show-reason.test.ts
@@ -0,0 +1,120 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { missingImports, readSource } from './helpers.ts'
+import {
+ isLoginLocation,
+ shouldRedirectForbidden,
+ shouldRedirectUnauthorized,
+} from '../src/api/envelope.ts'
+import {
+ LOGIN_FALLBACK_MESSAGE,
+ loginErrorText,
+ unwrapLoginResponse,
+} from '../src/pages/login/login-feedback.ts'
+
+/**
+ * 登录失败必须有提示(2026-10-06)。
+ *
+ * 两个各自独立的"吞掉提示"出口:
+ * 1. Java 的登录失败一律 HTTP 200 + `success:false`(GlobalExceptionHandler 把 BusinessException
+ * 编成 ApiResponse.fail),axios 视为成功 → 登录页不解包就永远走不到 catch,`errorMessage` 恒空;
+ * 2. 紧接着 `session.initialize()` 打 current-user 拿到 401/403,拦截器整页
+ * `window.location.assign('/admin-vue/login?...')` —— 页面重刷,错误文案连同已填用户名一起没了。
+ * 守卫本该拦下"已经在登录页"的跳转,但它只比过路由内的 `/login`,而真实 pathname 是 `/admin-vue/login`。
+ */
+
+/** 线上真实的登录失败响应体(Java:success/message/data/code,HTTP 200)。 */
+const FAIL_BODIES: Array<{ name: string; body: unknown; reason: string }> = [
+ {
+ name: '密码错',
+ body: { success: false, message: '用户名或密码错误', data: null, code: null },
+ reason: '用户名或密码错误',
+ },
+ {
+ name: '撞库锁定',
+ body: { success: false, message: '登录失败次数过多,请 12 分钟后再试', data: null, code: null },
+ reason: '登录失败次数过多,请 12 分钟后再试',
+ },
+ {
+ name: '账号到期',
+ body: { success: false, message: '账号已于 2026-10-01 到期,请联系管理员续费', data: null, code: 403 },
+ reason: '账号已于 2026-10-01 到期,请联系管理员续费',
+ },
+ {
+ name: '正常账号无后台权限',
+ body: { success: false, message: '需要管理员权限', data: null, code: 403 },
+ reason: '需要管理员权限',
+ },
+]
+
+test('解包登录响应:每一种 HTTP 200 失败都要抛出服务端原因', () => {
+ for (const { name, body, reason } of FAIL_BODIES) {
+ assert.throws(() => unwrapLoginResponse(body), (error: unknown) => {
+ assert.ok(error instanceof Error, `${name} 应抛出 Error`)
+ assert.equal(error.message, reason, `${name} 要把服务端文案原样带出来`)
+ return true
+ })
+ }
+})
+
+test('解包登录响应:成功体不得抛错(否则上面四支会恒真)', () => {
+ assert.doesNotThrow(() => unwrapLoginResponse({
+ success: true,
+ message: '登录成功',
+ data: { userId: 1201, token: 'jwt', role: 'admin' },
+ code: null,
+ }))
+})
+
+test('服务端原因空时也有文案,不出现空提示', () => {
+ assert.throws(() => unwrapLoginResponse({ success: false, message: '', data: null }))
+ assert.equal(loginErrorText(new Error('')), LOGIN_FALLBACK_MESSAGE)
+ assert.equal(loginErrorText(undefined), LOGIN_FALLBACK_MESSAGE)
+})
+
+test('传输层技术串不外露:状态码串/网络错/HTML 错误页一律回兜底', () => {
+ const cases: Array<[unknown, string]> = [
+ [new Error('Request failed with status code 500'), LOGIN_FALLBACK_MESSAGE],
+ [{ response: { data: { success: false, message: '服务器内部错误,请稍后重试' } } }, '服务器内部错误,请稍后重试'],
+ [new Error('Network Error'), LOGIN_FALLBACK_MESSAGE],
+ [new Error('Timeout of 30000ms exceeded.'), LOGIN_FALLBACK_MESSAGE],
+ [{ response: { data: '502 Bad Gateway' } }, LOGIN_FALLBACK_MESSAGE],
+ ]
+ for (const [error, expected] of cases) {
+ assert.equal(loginErrorText(error), expected)
+ }
+})
+
+test('登录页上的会话引导失败不再整页重刷:这是"啥都没提示"的那一步', () => {
+ for (const pathname of ['/admin-vue/login', '/admin-vue/login?redirect=%2Fadmin-vue%2Faccount%2Fusers']) {
+ assert.equal(isLoginLocation(pathname), true, `${pathname} 应在登录页判定内`)
+ for (const url of ['/api/admin/current-user', '/api/admin/current-user/menus']) {
+ assert.equal(
+ shouldRedirectUnauthorized(pathname, url),
+ false,
+ `${pathname} 上 ${url} 的 401 不许再跳(跳了就是把提示刷没)`,
+ )
+ }
+ }
+})
+
+test('收窄到登录页之外一律照旧:业务页 401 仍跳、引导端点 403 仍跳', () => {
+ assert.equal(shouldRedirectUnauthorized('/admin-vue/account/users', '/api/admin/current-user'), true)
+ assert.equal(shouldRedirectUnauthorized('/admin-vue/', '/api/admin/current-user'), true)
+ // 10-04 那条 403 分流没动:只有会话引导端点的 403 按"进不了后台"处理
+ assert.equal(shouldRedirectForbidden('/api/admin/current-user'), true)
+ assert.equal(shouldRedirectForbidden('/api/admin/companies'), false)
+ // 相邻路径不许被误判成登录页(尾斜杠才算,/admin-vue/login-x 不算)
+ assert.equal(isLoginLocation('/admin-vue/login-x'), false)
+ assert.equal(isLoginLocation('/admin-vue/account/login'), false)
+})
+
+test('登录页接线:解包 + 归一文案,且不得保留「用户名或密码错误」兜底', () => {
+ const page = readSource('src/pages/login/LoginPage.vue')
+ assert.match(page, /http\.post\('\/login'/, '断言对象必须是那条登录请求')
+ assert.match(page, /unwrapLoginResponse\(data\)/, '失败体必须解包,否则永远走不到 catch')
+ assert.match(page, /errorMessage\.value = loginErrorText\(error\)/)
+ assert.doesNotMatch(page, /errorMessage\.value = error instanceof Error/, '不得再用 instanceof 当失败判据')
+ assert.doesNotMatch(page, /:\s*'用户名或密码错误'/, '任何异常都显示"用户名或密码错误"是在伪造原因')
+ assert.deepEqual(missingImports('src/pages/login/LoginPage.vue'), [])
+})
diff --git a/admin-frontend-vue/tests/task-26.test.ts b/admin-frontend-vue/tests/task-26.test.ts
index e647e4f43..bba7aa894 100644
--- a/admin-frontend-vue/tests/task-26.test.ts
+++ b/admin-frontend-vue/tests/task-26.test.ts
@@ -58,7 +58,9 @@ test('test_task_026_unauthorized_redirect_invalid_input_rejected', () => {
assert.equal(shouldRedirectUnauthorized(undefined as unknown as string, undefined), true)
assert.equal(shouldRedirectUnauthorized(null as unknown as string, null as unknown as string), true)
assert.equal(isAuthEndpointRequest(42 as unknown as string), false)
- assert.equal(isLoginLocation('/admin-vue/login'), false)
+ // 2026-10-06 更正:浏览器地址栏带 History base,登录页的真实 pathname 就是 /admin-vue/login,
+ // 原先钉成 false 让"已在登录页就不再整页跳转"这条守卫在真机上一次都没生效。
+ assert.equal(isLoginLocation('/admin-vue/login'), true)
})
test('test_task_026_unauthorized_redirect_dependency_failure_returns_actionable_message', () => {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java b/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
index 90982714f..e626c87b2 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
@@ -3,7 +3,52 @@ package com.nanri.aiimage.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
@Mapper
public interface AdminUserMapper extends BaseMapper {
+
+ /**
+ * 本公司「公司超级管理员」里最早的到期时间;返回 null = 本公司无此约束(没有公司超管,
+ * 或它们全部永不过期)。到期级联判据见 {@code AccountExpiryService}。
+ *
+ * 刻意用聚合标量而不是 {@code selectList(.select(expiresAt))}:MyBatis 对「所选列全为
+ * NULL」的行返回 null 元素,一家公司只要有任意一个公司超管没设到期,那条列表里就混着 null,
+ * 遍历时解引用即 NPE,而这里正是每次登录与每个鉴权请求都要走的读出口。MIN 忽略 NULL,
+ * 无行时结果集仍是单行单列,直接映射成 null。
+ */
+ @Select("""
+ SELECT MIN(expires_at)
+ FROM users
+ WHERE role = 'company_super_admin'
+ AND company_id = #{companyId}
+ """)
+ LocalDateTime selectCompanySuperAdminEarliestExpiry(@Param("companyId") Long companyId);
+
+ /**
+ * 该账号在本公司那棵树里被授了几条后台(menu_type='admin')菜单;>0 即允许进管理后台。
+ *
+ * 刻意用标量 COUNT 而不是 {@code selectList(.select(columnId))}:与上面那条同样的投影陷阱
+ * (见 {@code AuthChainQueryShapeTest}),而这里是每个后台入口请求都要走的鉴权读。
+ *
+ * 必须带 {@code cm.company_id} 条件:每家公司一套树之后,{@code column_id} 指向别家树的
+ * 残留授权行会让账号"进得了后台、菜单树却是空的"——入口门与 {@code getUserColumnPermissions}
+ * 的下发集要用同一个公司口径,否则两处各判一次就留下静默死链。
+ */
+ @Select("""
+
+ """)
+ Long countAdminMenuGrants(@Param("userId") Long userId, @Param("companyId") Long companyId);
}
diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/security/AccountExpiryService.java b/backend-java/src/main/java/com/nanri/aiimage/common/security/AccountExpiryService.java
index a4fe14953..5927498f9 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/common/security/AccountExpiryService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/common/security/AccountExpiryService.java
@@ -1,6 +1,5 @@
package com.nanri.aiimage.common.security;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
@@ -11,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
-import java.util.List;
/**
* 账号到期(expires_at,V146)的级联判定与拦截。
@@ -113,15 +111,7 @@ public class AccountExpiryService {
if (companyId == null || companyId <= 0) {
return null;
}
- List csas = adminUserMapper.selectList(new LambdaQueryWrapper()
- .select(AdminUserEntity::getExpiresAt)
- .eq(AdminUserEntity::getRole, "company_super_admin")
- .eq(AdminUserEntity::getCompanyId, companyId));
- LocalDateTime earliest = null;
- for (AdminUserEntity csa : csas) {
- earliest = min(earliest, csa.getExpiresAt());
- }
- return earliest;
+ return adminUserMapper.selectCompanySuperAdminEarliestExpiry(companyId);
}
/** 组级:该用户所属分组(成员表)的组长(created_by_id/user_id)若是管理员,取其最早 expires_at。 */
diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java
index 7293befb1..9e4fd0ccd 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java
@@ -114,6 +114,51 @@ public class AdminAuthSupport {
return user;
}
+ /**
+ * 后台入口门:管理员角色恒可进;普通账号持有本公司任意后台菜单授权也可进。
+ *
+ * 2026-10-06 放开。此前"进后台"与"有管理员角色"绑死,超管在权限页给普通账号勾了
+ * 后台菜单也照样 403——授权动作做了,门没跟着开,界面上表现为点了没反应。放开只针对
+ * 入口:每一页仍由该页自己的门把关({@code PermissionMenuService.requireConsolePageAccess}
+ * 按该页菜单键判定),管理类出口(用户/菜单/分组/密钥/公司/版本)一律继续走
+ * {@link #requireAdmin},不在这里放宽。
+ */
+ public AdminUserEntity requireConsoleOperator(HttpServletRequest request) {
+ AdminUserEntity user = requireUser(request);
+ if (!isConsoleOperator(user)) {
+ throw new BusinessException(403, "需要管理员权限");
+ }
+ return user;
+ }
+
+ /** JWT 优先走入口门;内部令牌通道仍要求管理员角色——它绕过到期与会话校验,不随入口一起放宽。 */
+ public AdminUserEntity requireConsoleOperatorOrInternal(HttpServletRequest request) {
+ try {
+ return requireConsoleOperator(request);
+ } catch (BusinessException authFailure) {
+ AdminUserEntity internalOperator = resolveInternalOperator(request, true);
+ if (internalOperator != null) {
+ return internalOperator;
+ }
+ throw authFailure;
+ }
+ }
+
+ /** 入口判定:角色链(super_admin / admin / company_super_admin)或本公司任意一条后台菜单授权。 */
+ public boolean isConsoleOperator(AdminUserEntity user) {
+ if (user == null) {
+ return false;
+ }
+ if (currentRole(user) != null) {
+ return true;
+ }
+ if (user.getId() == null || user.getId() <= 0) {
+ return false;
+ }
+ Long grants = adminUserMapper.countAdminMenuGrants(user.getId(), user.getCompanyId());
+ return grants != null && grants > 0;
+ }
+
/** 计算当前用户的管理角色:super_admin / admin / null。 */
public String currentRole(AdminUserEntity user) {
if (user == null) {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminConsoleController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminConsoleController.java
index 8fbc7cec4..ba9278b58 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminConsoleController.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminConsoleController.java
@@ -67,7 +67,7 @@ public class AdminConsoleController {
@GetMapping("/api/admin/current-user")
@Operation(summary = "获取当前管理员信息")
public ApiResponse