merge: 合并 feature/dev_cmj_clean 到 feature/dev_smart02_cmj

apps/smart-pharmacy/src/api/index.ts

@@ -27,7 +27,10 @@ export const http = createRequestClient({
   transform: transformHttpResponse,
 });
 http.interceptor('error', async (error) => {
-  if (error?.code === 401) await useAuthStore().logout();
+  if (error?.code === 401) {
+    await useAuthStore().logout();
+    return;
+  }
   message.error(error.message ?? `服务错误 (${error.code})`).then();
 });
 

apps/smart-pharmacy/src/router/guard.ts

@@ -138,7 +138,24 @@ function setupAccessGuard(router: Router) {
 
     // 生成路由表
     // 当前登录用户拥有的角色标识列表
-    const userInfo = userStore.userInfo || (await authStore.getUserInfo());
+    let userInfo = userStore.userInfo;
+    if (!userInfo) {
+      try {
+        userInfo = await authStore.getUserInfo();
+      } catch (error: any) {
+        if (error?.code === 401) {
+          return {
+            path: LOGIN_PATH,
+            query:
+              isHomeEntryPath(to.fullPath)
+                ? {}
+                : { redirect: encodeURIComponent(to.fullPath) },
+            replace: true,
+          };
+        }
+        throw error;
+      }
+    }
     const userRoles = userInfo.roles ?? [];
 
     // 生成菜单和路由

packages/request/src/index.ts

@@ -63,7 +63,9 @@ export default function createRequestClient(options?: SimpleAlovaOptions) {
       if (response.status > 400) {
         const message = response.statusText;
         // eslint-disable-next-line no-throw-literal
-        throw { message };
+        throw response.status === 401
+          ? { code: 401, message: message || 'Unauthorized' }
+          : { message };
       }
 
       /* prettier-ignore */
@@ -102,12 +104,11 @@ export default function createRequestClient(options?: SimpleAlovaOptions) {
     tokenAuthentication: createServerTokenAuthentication({
       refreshTokenOnSuccess: {
         async isExpired(response) {
-          return response.status === 401;
+          // 无 refreshToken 时不走刷新逻辑，避免 401 被反复重试
+          return response.status === 401 && !!store.refreshToken;
         },
         async handler(response) {
-          if (store.refreshToken) {
-            console.log(response);
-          }
+          console.log(response);
         },
         metaMatches: {
           authRole: 'refreshToken',