From d397952b3de772db979e962c35d47f4268b6896b Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 13 Jul 2026 14:12:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E4=BA=8C=E6=AC=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=9B=B8=E5=85=B3=E6=B3=A8=E9=87=8A=E5=8E=BB=E3=80=8C?= =?UTF-8?q?=E6=8C=91=E6=88=98=E3=80=8D=E6=9C=BA=E7=BF=BB=E8=A1=A8=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一为二次验证/补验口径，清理中文注释前缀，不改运行时逻辑。 --- apps/daxpay-admin/src/api/core/auth.api.ts | 2 +- apps/daxpay-admin/src/api/request.ts | 6 +++--- apps/daxpay-admin/src/store/auth.ts | 12 ++++++------ .../views/_core/authentication/oauth-callback.vue | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/daxpay-admin/src/api/core/auth.api.ts b/apps/daxpay-admin/src/api/core/auth.api.ts index de73259b5..eddd29fef 100644 --- a/apps/daxpay-admin/src/api/core/auth.api.ts +++ b/apps/daxpay-admin/src/api/core/auth.api.ts @@ -114,5 +114,5 @@ export interface SecondVerifyParams { codeType?: string; } -/** 双因素认证挑战响应码(后端 TwoFactorRequiredException.CODE) */ +/** 需双因素二次验证的业务码(后端 TwoFactorRequiredException.CODE) */ export const TWO_FACTOR_REQUIRED_CODE = 40_101; diff --git a/apps/daxpay-admin/src/api/request.ts b/apps/daxpay-admin/src/api/request.ts index 71317deea..0e86ad7fa 100644 --- a/apps/daxpay-admin/src/api/request.ts +++ b/apps/daxpay-admin/src/api/request.ts @@ -20,8 +20,8 @@ import { useAuthStore } from '#/store'; const { apiURL } = useAppConfig(import.meta.env, import.meta.env.PROD); -// 双因素认证挑战响应码(与后端 TwoFactorRequiredException.CODE 对齐) -// 此码代表"密码通过但需二次验证", 非真正错误, 需放行返回 body(含 preAuthToken) +// 需双因素二次验证的业务码(与后端 TwoFactorRequiredException.CODE 对齐) +// 表示密码已通过但仍需二次验证, 不是真正错误; 应把响应体(含 preAuthToken)交给业务层 const TWO_FACTOR_REQUIRED_CODE = 40_101; function createRequestClient(baseURL: string, options?: RequestClientOptions) { @@ -76,7 +76,7 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { }), ); - // 双因素认证挑战拦截器: code=40101 时不当错误处理, 返回 body 供业务层识别切换二次验证 + // 双因素二次验证拦截器: code=40101 时不按错误处理, 返回 body 供业务层切换二次验证页 client.addResponseInterceptor({ rejected: (error: any) => { const body = error?.response?.data; diff --git a/apps/daxpay-admin/src/store/auth.ts b/apps/daxpay-admin/src/store/auth.ts index ed121dafb..06372681a 100644 --- a/apps/daxpay-admin/src/store/auth.ts +++ b/apps/daxpay-admin/src/store/auth.ts @@ -23,7 +23,7 @@ export const useAuthStore = defineStore('auth', () => { const loginLoading = ref(false); - // 双因素认证挑战状态 + // 是否处于双因素二次验证 const twoFactorRequired = ref(false); const twoFactorPreAuthToken = ref(''); @@ -36,9 +36,9 @@ export const useAuthStore = defineStore('auth', () => { let userInfo: null | UserInfo = null; try { loginLoading.value = true; - // 中文注释：对密码进行RSA加密 + // 对密码进行 RSA 加密 const encryptedPassword = await encryptPassword(params.password); - // 中文注释：登录协议固定对齐后端真实接口，避免继续命中 Mock 参数结构。 + // 登录协议对齐后端真实接口, 避免命中 Mock 参数结构 const loginResult = await AuthApi.login({ account: params.account, client: CLIENT_CODE, @@ -49,7 +49,7 @@ export const useAuthStore = defineStore('auth', () => { captchaCode: params.captchaCode, }); - // 双因素认证挑战: 密码通过但需二次验证, 记录预认证令牌并切到验证界面 + // 密码通过但需二次验证: 记录预认证令牌并切到验证界面 if (loginResult.code === TWO_FACTOR_REQUIRED_CODE) { enterTwoFactor((loginResult.data as any)?.preAuthToken ?? ''); return { userInfo: null }; @@ -106,7 +106,7 @@ export const useAuthStore = defineStore('auth', () => { accessStore.setAccessToken(accessToken); userInfo = await fetchUserInfo(); userStore.setUserInfo(userInfo!); - // 清除 2FA 挑战状态 + // 清除双因素二次验证状态 twoFactorRequired.value = false; twoFactorPreAuthToken.value = ''; await router.push(HOME_PATH); @@ -126,7 +126,7 @@ export const useAuthStore = defineStore('auth', () => { } /** - * 进入双因素挑战(密码登录或社交登录回调共用) + * 进入双因素二次验证(密码登录或社交登录回调共用) */ function enterTwoFactor(preAuthToken: string) { twoFactorPreAuthToken.value = preAuthToken ?? ''; diff --git a/apps/daxpay-admin/src/views/_core/authentication/oauth-callback.vue b/apps/daxpay-admin/src/views/_core/authentication/oauth-callback.vue index 02589d413..d5509273a 100644 --- a/apps/daxpay-admin/src/views/_core/authentication/oauth-callback.vue +++ b/apps/daxpay-admin/src/views/_core/authentication/oauth-callback.vue @@ -23,7 +23,7 @@ const accessStore = useAccessStore(); const authStore = useAuthStore(); - // 是否展示页内 2FA 面板(社交登录触发挑战) + // 是否展示页内 2FA 面板(社交登录触发二次验证) const showTwoFactor = ref(false); // 路径参数中的平台编码(如 gitee), 可能为空(旧地址兼容) @@ -63,7 +63,7 @@ } try { const res = await SocialApi.exchangeLogin(oauthCode, state as string, source.value, CLIENT_CODE); - // 双因素挑战: 拦截器对 40101 返回 body, 不当 reject + // 需二次验证: 拦截器对 40101 返回 body, 不按失败 reject if (res.code === TWO_FACTOR_REQUIRED_CODE) { const preAuthToken = (res.data as any)?.preAuthToken ?? ''; authStore.enterTwoFactor(preAuthToken);