1

2026-10-17 19:04:05 +08:00
parent 28b11b4365
commit 1253c159f5
43 changed files with 2652 additions and 114 deletions
@@ -199,49 +199,52 @@ class _ErrorInterceptor extends Interceptor {
    final apiError = err.error;
    final status = err.response?.statusCode;

-    // 401：静默刷新重试一次
+    // 401：静默刷新重试一次；无法刷新（无 refresh / 刷新被拒 / 重试仍 401）
+    // 统一按会话失效处理，否则 APP 会卡在"本地有 user 但 access 已过期"的
+    // 僵尸登录态：我的页正常显示资料卡，点会员/钱包等全部 401 加载失败
    if (status == 401 &&
-        err.requestOptions.extra['retried'] != true &&
-        TokenStore.refreshToken != null) {
-      String? newToken;
-      try {
-        newToken = await _refreshToken();
-      } on ApiException catch (refreshErr) {
-        // 刷新请求本身网络失败：不清登录态，透传错误
-        return handler.next(DioException(
-          requestOptions: err.requestOptions,
-          error: refreshErr,
-        ));
-      }
-      if (newToken != null) {
+        err.requestOptions.extra['retried'] != true) {
+      if (TokenStore.refreshToken != null) {
+        String? newToken;
        try {
-          final opts = err.requestOptions;
-          opts.extra['retried'] = true;
-          opts.headers['Authorization'] = 'Bearer $newToken';
-          final resp = await ApiClient._dio.fetch<dynamic>(opts);
-          return handler.resolve(resp);
-        } on DioException catch (retryErr) {
-          final retryApi = retryErr.error;
-          final retryStatus = retryErr.response?.statusCode;
-          // 重试后仍是鉴权失败（401 / 1002）→ 确认会话失效，登出；
-          // 其余失败（网络抖动、业务错误等）不清登录态，直接透传错误
-          final stillAuthFailed = retryStatus == 401 ||
-              (retryApi is ApiException && retryApi.isUnauthorized);
-          if (!stillAuthFailed) {
-            return handler.next(DioException(
-              requestOptions: err.requestOptions,
-              error: retryApi is ApiException
-                  ? retryApi
-                  : ApiException(-1, '网络异常，请稍后重试'),
-            ));
-          }
-        } catch (_) {
-          // 非 Dio 失败：视为网络异常，不清登录态
+          newToken = await _refreshToken();
+        } on ApiException catch (refreshErr) {
+          // 刷新请求本身网络失败：不清登录态，透传错误
          return handler.next(DioException(
            requestOptions: err.requestOptions,
-            error: ApiException(-1, '网络异常，请稍后重试'),
+            error: refreshErr,
          ));
        }
+        if (newToken != null) {
+          try {
+            final opts = err.requestOptions;
+            opts.extra['retried'] = true;
+            opts.headers['Authorization'] = 'Bearer $newToken';
+            final resp = await ApiClient._dio.fetch<dynamic>(opts);
+            return handler.resolve(resp);
+          } on DioException catch (retryErr) {
+            final retryApi = retryErr.error;
+            final retryStatus = retryErr.response?.statusCode;
+            // 重试后仍是鉴权失败（401 / 1002）→ 确认会话失效，登出；
+            // 其余失败（网络抖动、业务错误等）不清登录态，直接透传错误
+            final stillAuthFailed = retryStatus == 401 ||
+                (retryApi is ApiException && retryApi.isUnauthorized);
+            if (!stillAuthFailed) {
+              return handler.next(DioException(
+                requestOptions: err.requestOptions,
+                error: retryApi is ApiException
+                    ? retryApi
+                    : ApiException(-1, '网络异常，请稍后重试'),
+              ));
+            }
+          } catch (_) {
+            // 非 Dio 失败：视为网络异常，不清登录态
+            return handler.next(DioException(
+              requestOptions: err.requestOptions,
+              error: ApiException(-1, '网络异常，请稍后重试'),
+            ));
+          }
+        }
      }
      await TokenStore.clear();
      ApiClient.onSessionExpired?.call();