diff --git a/apps/web/src/api/client.ts b/apps/web/src/api/client.ts index 389a76ec8..6f1aa2a5c 100644 --- a/apps/web/src/api/client.ts +++ b/apps/web/src/api/client.ts @@ -57,7 +57,21 @@ apiClient.interceptors.response.use( } // 401 → 尝试刷新 Token - if (error.response?.status === 401 && originalRequest && !originalRequest._retry) { + // 排除 auth 端点:登录/注册/找回密码的 401 是正常业务响应(如密码错误), + // 不应触发 token 刷新或登出跳转,走后面的错误提示逻辑即可 + const requestUrl = originalRequest?.url || "" + const isAuthEndpoint = + requestUrl.includes("/auth/login") || + requestUrl.includes("/auth/register") || + requestUrl.includes("/auth/forgot-password") || + requestUrl.includes("/auth/reset-password") + + if ( + error.response?.status === 401 && + originalRequest && + !originalRequest._retry && + !isAuthEndpoint + ) { const refreshToken = useAuthStore.getState().refreshToken // 无 refresh_token → 直接登出 diff --git a/apps/web/src/hooks/useAuth.ts b/apps/web/src/hooks/useAuth.ts index 5e620e3b0..5fa6ba802 100644 --- a/apps/web/src/hooks/useAuth.ts +++ b/apps/web/src/hooks/useAuth.ts @@ -31,8 +31,8 @@ export const useLogin = () => { const user = await authApi.getCurrentUser() setAuth(user, data.access_token, refreshToken) - // 跳转到登录前页面或首页 - const redirect = localStorage.getItem("login_redirect") || "/" + // 跳转到登录前页面或仪表盘(与 Login.tsx onFinish 保持一致) + const redirect = localStorage.getItem("login_redirect") || "/app/dashboard" localStorage.removeItem("login_redirect") navigate(redirect, { replace: true }) return data diff --git a/scripts/ci/vitest_incremental.sh b/scripts/ci/vitest_incremental.sh index b94ec6d0e..cef424ae5 100755 --- a/scripts/ci/vitest_incremental.sh +++ b/scripts/ci/vitest_incremental.sh @@ -61,7 +61,9 @@ set -e echo "$VITEST_OUTPUT" # 如果没有找到测试文件,视为通过(改动的文件没有对应测试) -if echo "$VITEST_OUTPUT" | grep -q "No test files found"; then +# 先用 sed 去掉 ANSI 转义码,避免干扰 grep 匹配 +CLEAN_OUTPUT=$(echo "$VITEST_OUTPUT" | sed 's/\x1b\[[0-9;]*m//g') +if echo "$CLEAN_OUTPUT" | grep -q "No test files found"; then echo "" echo "⚠️ 未找到相关测试文件,跳过(非失败)" exit 0