修复用户端令牌失效后的登录恢复

apps/user_app/lib/app/auth_navigation.dart

@@ -0,0 +1,33 @@
+// 功能描述：提供鉴权页面地址构造与站内回跳地址校验。
+// 版本：1.0.0
+
+/// 构造登录或注册地址，并安全携带原目标页和会话失效原因。
+String buildAuthLocation(
+  String authPath, {
+  String? redirectTarget,
+  bool sessionExpired = false,
+}) {
+  final safeTarget = sanitizeRedirectTarget(redirectTarget);
+  final query = <String, String>{
+    'redirect': ?safeTarget,
+    if (sessionExpired) 'reason': 'expired',
+  };
+  return Uri(
+    path: authPath,
+    queryParameters: query.isEmpty ? null : query,
+  ).toString();
+}
+
+/// 只接受站内绝对路径，阻止外部地址和鉴权页之间形成重定向循环。
+String? sanitizeRedirectTarget(String? value) {
+  final candidate = value?.trim() ?? '';
+  if (candidate.isEmpty) return null;
+
+  final uri = Uri.tryParse(candidate);
+  if (uri == null || uri.hasScheme || uri.hasAuthority || !uri.path.startsWith('/')) {
+    return null;
+  }
+  if (uri.path.startsWith('//') || uri.path.contains(r'\')) return null;
+  if (uri.path == '/login' || uri.path == '/register') return null;
+  return uri.toString();
+}

apps/user_app/lib/app/dependencies.dart

@@ -1,3 +1,6 @@
+// 功能描述：装配用户端依赖，并统一管理登录、退出和失效会话。
+// 版本：1.1.0
+
 import 'package:flutter/foundation.dart';
 
 import '../data/repositories/client_repository.dart';
@@ -5,7 +8,7 @@ import '../data/services/api_client.dart';
 import '../data/services/secure_session_store.dart';
 
 class AppDependencies {
-  AppDependencies._({
+  AppDependencies({
     required this.session,
     required this.repository,
   });
@@ -17,23 +20,32 @@ class AppDependencies {
     final store = SecureSessionStore();
     final session = UserSession(store);
     await session.restore();
-    final api = ApiClient(() => session.token);
-    return AppDependencies._(session: session, repository: ClientRepository(api));
+    final api = ApiClient(
+      () => session.token,
+      onUnauthorized: session.invalidate,
+    );
+    return AppDependencies(session: session, repository: ClientRepository(api));
   }
 }
 
+/// 管理内存令牌、持久化令牌以及会话失效通知。
 class UserSession extends ChangeNotifier {
   UserSession(this._store);
 
   static const _root = '/heqi/client/v1/user';
-  final SecureSessionStore _store;
+  final SessionStore _store;
   String _token = '';
+  bool _expired = false;
+  Future<void> _pendingClear = Future<void>.value();
 
   String get token => _token;
   bool get isAuthenticated => _token.isNotEmpty;
+  bool get hasExpired => _expired;
 
+  /// 从安全存储恢复令牌；是否有效由后续受保护接口响应确认。
   Future<void> restore() async {
     _token = await _store.readToken() ?? '';
+    _expired = false;
   }
 
   Future<void> login({
@@ -57,9 +69,14 @@ class UserSession extends ChangeNotifier {
         },
       ),
     );
-    _token = details['access_token'] as String? ?? '';
-    if (_token.isEmpty) throw const ApiException(500, '登录令牌缺失');
-    await _store.writeToken(_token);
+    final token = details['access_token'] as String? ?? '';
+    if (token.isEmpty) throw const ApiException(500, '登录令牌缺失');
+
+    // 等待旧令牌清理结束，避免迟到的删除任务误删刚写入的新令牌。
+    await _pendingClear;
+    await _store.writeToken(token);
+    _token = token;
+    _expired = false;
     notifyListeners();
   }
 
@@ -77,7 +94,29 @@ class UserSession extends ChangeNotifier {
 
   Future<void> logout() async {
     _token = '';
-    await _store.clear();
+    _expired = false;
     notifyListeners();
+    _pendingClear = _clearStoredToken();
+    await _pendingClear;
+  }
+
+  /// 仅当服务端拒绝的仍是当前令牌时，使会话失效并通知路由。
+  void invalidate(String rejectedToken) {
+    if (rejectedToken.isEmpty || rejectedToken != _token || _expired) return;
+
+    _token = '';
+    _expired = true;
+    notifyListeners();
+    _pendingClear = _clearStoredToken();
+  }
+
+  /// 尽力删除持久化令牌；失败不得阻塞用户返回登录页。
+  Future<void> _clearStoredToken() async {
+    try {
+      await _store.clear();
+    } catch (error, stackTrace) {
+      debugPrint('清理失效登录令牌失败：$error');
+      debugPrintStack(stackTrace: stackTrace);
+    }
   }
 }

apps/user_app/lib/app/router.dart

@@ -1,3 +1,5 @@
+// 功能描述：配置用户端路由、鉴权守卫及登录后安全回跳。
+// 版本：1.1.0
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
@@ -9,25 +11,45 @@ import '../ui/features/profile/profile_page.dart';
 import '../ui/features/shared/record_list_page.dart';
 import '../ui/features/shared/record_list_view_model.dart';
 import '../ui/features/shop/shop_page.dart';
+import 'auth_navigation.dart';
 import 'dependencies.dart';
 
-GoRouter createRouter(AppDependencies dependencies) => GoRouter(
-  initialLocation: '/home',
+GoRouter createRouter(
+  AppDependencies dependencies, {
+  String initialLocation = '/home',
+}) => GoRouter(
+  initialLocation: initialLocation,
   refreshListenable: dependencies.session,
   redirect: (context, state) {
     final authRoute = state.matchedLocation == '/login' || state.matchedLocation == '/register';
-    if (!dependencies.session.isAuthenticated && !authRoute) return '/login';
-    if (dependencies.session.isAuthenticated && state.matchedLocation == '/login') return '/home';
+    if (!dependencies.session.isAuthenticated && !authRoute) {
+      return buildAuthLocation(
+        '/login',
+        redirectTarget: state.uri.toString(),
+        sessionExpired: dependencies.session.hasExpired,
+      );
+    }
+    if (dependencies.session.isAuthenticated && state.matchedLocation == '/login') {
+      return sanitizeRedirectTarget(state.uri.queryParameters['redirect']) ?? '/home';
+    }
     return null;
   },
   routes: [
     GoRoute(
       path: '/login',
-      builder: (context, state) => LoginPage(session: dependencies.session),
+      builder: (context, state) => LoginPage(
+        session: dependencies.session,
+        redirectTarget: sanitizeRedirectTarget(state.uri.queryParameters['redirect']),
+        showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
+      ),
     ),
     GoRoute(
       path: '/register',
-      builder: (context, state) => RegisterPage(session: dependencies.session),
+      builder: (context, state) => RegisterPage(
+        session: dependencies.session,
+        redirectTarget: sanitizeRedirectTarget(state.uri.queryParameters['redirect']),
+        showSessionExpiredMessage: state.uri.queryParameters['reason'] == 'expired',
+      ),
     ),
     GoRoute(
       path: '/records/contracts',

apps/user_app/lib/data/services/api_client.dart

@@ -1,5 +1,5 @@
 // 功能描述：封装用户端 HTTP 请求，并将服务端错误转换为安全、可读的中文提示。
-// 版本：1.1.0
+// 版本：1.2.0
 import 'dart:convert';
 import 'dart:typed_data';
 
@@ -84,12 +84,21 @@ class ApiException implements Exception {
   String toString() => message;
 }
 
+/// 表示鉴权会话已经失效；页面层应等待路由跳转，不再展示普通网络错误。
+class SessionExpiredException extends ApiException {
+  const SessionExpiredException() : super(401, '登录状态已失效，请重新登录');
+}
+
+/// 接收被服务端拒绝的请求令牌，用于安全地失效对应会话。
+typedef UnauthorizedCallback = void Function(String rejectedToken);
+
 /// 负责用户端统一 HTTP 请求、鉴权头和响应解析。
 class ApiClient {
   ApiClient(
     this._tokenProvider, {
     http.Client? client,
     String? baseUrl,
+    this.onUnauthorized,
   }) : _client = client ?? http.Client(),
        baseUrl =
            baseUrl ??
@@ -101,6 +110,7 @@ class ApiClient {
   final String baseUrl;
   final String Function() _tokenProvider;
   final http.Client _client;
+  final UnauthorizedCallback? onUnauthorized;
 
   Future<Object?> get(String path, {bool authenticated = true}) =>
       _send('GET', path, authenticated: authenticated);
@@ -112,6 +122,13 @@ class ApiClient {
     final token = _tokenProvider();
     if (token.isNotEmpty) request.headers['authorization'] = token;
     final response = await _sendRequest(request);
+    if (response.statusCode == 401 && token.isNotEmpty) {
+      _rejectSession(token);
+    }
+    final responseCode = _jsonResponseCode(response);
+    if (token.isNotEmpty && responseCode != null && _isAuthenticationFailure(responseCode)) {
+      _rejectSession(token);
+    }
     if (response.statusCode == 404) return null;
     if (response.statusCode < 200 || response.statusCode >= 300) {
       throw ApiException(response.statusCode, '头像加载失败');
@@ -138,16 +155,21 @@ class ApiClient {
   }) async {
     final request = http.Request(method, Uri.parse('$baseUrl$path'));
     request.headers['accept'] = 'application/json';
+    var requestToken = '';
     if (authenticated) {
-      final token = _tokenProvider();
-      if (token.isNotEmpty) request.headers['authorization'] = token;
+      requestToken = _tokenProvider();
+      if (requestToken.isNotEmpty) request.headers['authorization'] = requestToken;
     }
     if (body != null) {
       request.headers['content-type'] = 'application/json; charset=UTF-8';
       request.body = jsonEncode(body);
     }
     final response = await _sendRequest(request);
-    return _decode(response);
+    return _decode(
+      response,
+      authenticated: authenticated,
+      requestToken: requestToken,
+    );
   }
 
   /// 发送请求并统一处理网络连接异常。
@@ -160,7 +182,14 @@ class ApiClient {
   }
 
   /// 解析统一响应结构，并按错误码生成中文提示。
-  Object? _decode(http.Response response) {
+  Object? _decode(
+    http.Response response, {
+    required bool authenticated,
+    required String requestToken,
+  }) {
+    if (authenticated && response.statusCode == 401 && requestToken.isNotEmpty) {
+      _rejectSession(requestToken);
+    }
     if (response.statusCode < 200 || response.statusCode >= 300) {
       throw ApiException(response.statusCode, '网络请求失败（${response.statusCode}）');
     }
@@ -175,6 +204,9 @@ class ApiClient {
     }
     final code = (decoded['code'] as num?)?.toInt() ?? 500;
     if (code != 0) {
+      if (authenticated && requestToken.isNotEmpty && _isAuthenticationFailure(code)) {
+        _rejectSession(requestToken);
+      }
       throw ApiException(
         code,
         localizeApiErrorMessage(code, decoded['message'] as String?),
@@ -182,8 +214,37 @@ class ApiClient {
     }
     return decoded['details'];
   }
+
+  /// 通知会话层并抛出专用异常，避免页面把鉴权失败误报为网络问题。
+  Never _rejectSession(String rejectedToken) {
+    onUnauthorized?.call(rejectedToken);
+    throw const SessionExpiredException();
+  }
+
+  /// 尝试从二进制接口返回的 JSON 错误体中提取业务码。
+  int? _jsonResponseCode(http.Response response) {
+    final contentType = response.headers['content-type'] ?? '';
+    int? firstContentByte;
+    for (final byte in response.bodyBytes) {
+      if (byte == 0x20 || byte == 0x09 || byte == 0x0a || byte == 0x0d) continue;
+      firstContentByte = byte;
+      break;
+    }
+    if (!contentType.contains('json') && firstContentByte != 0x7b) {
+      return null;
+    }
+    try {
+      final decoded = jsonDecode(response.body);
+      return decoded is Map ? (decoded['code'] as num?)?.toInt() : null;
+    } on FormatException {
+      return null;
+    }
+  }
 }
 
+/// 判断服务端稳定错误码是否表示登录会话无效。
+bool _isAuthenticationFailure(int code) => (code >= 1301 && code <= 1314) || code == 1715;
+
 Map<String, Object?> jsonMap(Object? value) {
   if (value is Map<String, Object?>) return value;
   if (value is Map) return value.map((key, item) => MapEntry(key.toString(), item));

apps/user_app/lib/data/services/secure_session_store.dart

@@ -1,15 +1,30 @@
+// 功能描述：封装用户端登录令牌的安全持久化接口与平台实现。
+// 版本：1.1.0
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
-class SecureSessionStore {
+/// 定义登录令牌持久化能力，便于会话逻辑隔离具体存储实现。
+abstract interface class SessionStore {
+  Future<String?> readToken();
+
+  Future<void> writeToken(String token);
+
+  Future<void> clear();
+}
+
+/// 使用平台安全存储保存用户端登录令牌。
+class SecureSessionStore implements SessionStore {
   SecureSessionStore({FlutterSecureStorage? storage})
     : _storage = storage ?? const FlutterSecureStorage();
 
   static const _tokenKey = 'user_app_access_token';
   final FlutterSecureStorage _storage;
 
+  @override
   Future<String?> readToken() => _storage.read(key: _tokenKey);
 
+  @override
   Future<void> writeToken(String token) => _storage.write(key: _tokenKey, value: token);
 
+  @override
   Future<void> clear() => _storage.delete(key: _tokenKey);
 }

apps/user_app/lib/ui/features/auth/login_page.dart

@@ -3,14 +3,22 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
+import '../../../app/auth_navigation.dart';
 import '../../../app/dependencies.dart';
 import '../../../data/services/api_client.dart';
 
 /// 用户端手机号密码登录页面。
 class LoginPage extends StatefulWidget {
-  const LoginPage({required this.session, super.key});
+  const LoginPage({
+    required this.session,
+    this.redirectTarget,
+    this.showSessionExpiredMessage = false,
+    super.key,
+  });
 
   final UserSession session;
+  final String? redirectTarget;
+  final bool showSessionExpiredMessage;
 
   @override
   State<LoginPage> createState() => _LoginPageState();
@@ -27,6 +35,14 @@ class _LoginPageState extends State<LoginPage> {
   String? _phoneError;
   bool _obscurePassword = true;
 
+  @override
+  void initState() {
+    super.initState();
+    if (widget.showSessionExpiredMessage) {
+      _error = '登录状态已失效，请重新登录';
+    }
+  }
+
   @override
   void dispose() {
     _phone.dispose();
@@ -174,7 +190,13 @@ class _LoginPageState extends State<LoginPage> {
                       : const Text('安全登录'),
                 ),
                 TextButton(
-                  onPressed: () => context.push('/register'),
+                  onPressed: () => context.push(
+                    buildAuthLocation(
+                      '/register',
+                      redirectTarget: widget.redirectTarget,
+                      sessionExpired: widget.showSessionExpiredMessage,
+                    ),
+                  ),
                   child: const Text('首次使用？注册账号'),
                 ),
                 const SizedBox(height: 8),

apps/user_app/lib/ui/features/auth/register_page.dart

@@ -1,12 +1,24 @@
+// 功能描述：提供用户注册流程，并在注册后保留原登录目标页。
+// 版本：1.1.0
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
+import '../../../app/auth_navigation.dart';
 import '../../../app/dependencies.dart';
 import '../../../data/services/api_client.dart';
 
+/// 用户端账号注册页面。
 class RegisterPage extends StatefulWidget {
-  const RegisterPage({required this.session, super.key});
+  const RegisterPage({
+    required this.session,
+    this.redirectTarget,
+    this.showSessionExpiredMessage = false,
+    super.key,
+  });
 
   final UserSession session;
+  final String? redirectTarget;
+  final bool showSessionExpiredMessage;
 
   @override
   State<RegisterPage> createState() => _RegisterPageState();
@@ -51,7 +63,19 @@ class _RegisterPageState extends State<RegisterPage> {
           'request_identity': _requestIdentity,
         },
       );
-      if (mounted) Navigator.of(context).pop();
+      if (mounted) {
+        if (Navigator.of(context).canPop()) {
+          Navigator.of(context).pop();
+        } else {
+          context.go(
+            buildAuthLocation(
+              '/login',
+              redirectTarget: widget.redirectTarget,
+              sessionExpired: widget.showSessionExpiredMessage,
+            ),
+          );
+        }
+      }
     } catch (error) {
       if (mounted) setState(() => _message = error.toString());
     } finally {

apps/user_app/lib/ui/features/home/home_page.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../data/repositories/client_repository.dart';
+import '../../../data/services/api_client.dart';
 import '../../../domain/models/client_models.dart';
 import '../../core/widgets.dart';
 import 'service_relation_card.dart';
@@ -47,6 +48,9 @@ class _HomePageState extends State<HomePage> {
             return const Center(child: CircularProgressIndicator());
           }
           if (snapshot.hasError) {
+            if (snapshot.error is SessionExpiredException) {
+              return const SizedBox.shrink();
+            }
             return EmptyState(
               title: '首页加载失败',
               description: snapshot.error.toString(),

apps/user_app/lib/ui/features/orders/orders_page.dart

@@ -1,8 +1,11 @@
+// 功能描述：展示用户订单、退款和工单，并处理显式确认后的业务操作。
+// 版本：1.1.0
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 
 import '../../../data/repositories/client_repository.dart';
+import '../../../data/services/api_client.dart';
 import '../../../data/services/payment_launcher.dart';
 import '../../../domain/models/client_models.dart';
 import '../shared/record_list_page.dart';
@@ -93,6 +96,7 @@ class OrdersPage extends StatelessWidget {
         );
       }
     } catch (error) {
+      if (error is SessionExpiredException) return;
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(error.toString())),

apps/user_app/lib/ui/features/profile/profile_page.dart

@@ -8,6 +8,7 @@ import 'package:uuid/uuid.dart';
 
 import '../../../app/dependencies.dart';
 import '../../../data/repositories/client_repository.dart';
+import '../../../data/services/api_client.dart';
 import '../../../domain/models/client_models.dart';
 import '../../core/widgets.dart';
 import 'profile_avatar.dart';
@@ -65,7 +66,11 @@ class _ProfilePageState extends State<ProfilePage> {
     );
     controller.dispose();
     if (address == null || address.isEmpty) return;
-    await widget.repository.addAddress(address, isDefault: true);
+    try {
+      await widget.repository.addAddress(address, isDefault: true);
+    } on SessionExpiredException {
+      return;
+    }
     if (mounted) ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('地址已保存')));
   }
 
@@ -91,11 +96,15 @@ class _ProfilePageState extends State<ProfilePage> {
     );
     controller.dispose();
     if (description == null || description.isEmpty) return;
-    await widget.repository.createTicket(
-      requestNo: const Uuid().v7(),
-      category: 'repair',
-      description: description,
-    );
+    try {
+      await widget.repository.createTicket(
+        requestNo: const Uuid().v7(),
+        category: 'repair',
+        description: description,
+      );
+    } on SessionExpiredException {
+      return;
+    }
     if (mounted) ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('工单已提交')));
   }
 
@@ -107,6 +116,9 @@ class _ProfilePageState extends State<ProfilePage> {
       builder: (context, snapshot) {
         if (!snapshot.hasData) {
           if (snapshot.hasError) {
+            if (snapshot.error is SessionExpiredException) {
+              return const SizedBox.shrink();
+            }
             return EmptyState(
               title: '个人信息加载失败',
               description: '请检查网络后重新进入本页',

apps/user_app/lib/ui/features/shared/record_list_view_model.dart

@@ -1,5 +1,8 @@
+// 功能描述：管理通用记录列表的加载、数据和非鉴权错误状态。
+// 版本：1.1.0
 import 'package:flutter/foundation.dart';
 
+import '../../../data/services/api_client.dart';
 import '../../../domain/models/client_models.dart';
 
 typedef RecordLoader = Future<List<ClientRecord>> Function();
@@ -23,7 +26,8 @@ class RecordListViewModel extends ChangeNotifier {
     try {
       _records = await _loader();
     } catch (error) {
-      _error = error;
+      // 会话失效由统一路由接管，不在列表中重复展示网络错误。
+      if (error is! SessionExpiredException) _error = error;
     } finally {
       _loading = false;
       notifyListeners();

apps/user_app/lib/ui/features/shop/shop_page.dart

@@ -1,7 +1,10 @@
+// 功能描述：展示商城商品并处理用户确认后的下单流程。
+// 版本：1.1.0
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 
 import '../../../data/repositories/client_repository.dart';
+import '../../../data/services/api_client.dart';
 import '../../../domain/models/client_models.dart';
 import '../../core/widgets.dart';
 
@@ -80,6 +83,7 @@ class _ShopPageState extends State<ShopPage> {
         ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('订单已创建，请前往订单页支付')));
       }
     } catch (error) {
+      if (error is SessionExpiredException) return;
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(error.toString())));
       }
@@ -96,6 +100,9 @@ class _ShopPageState extends State<ShopPage> {
           return const Center(child: CircularProgressIndicator());
         }
         if (snapshot.hasError) {
+          if (snapshot.error is SessionExpiredException) {
+            return const SizedBox.shrink();
+          }
           return EmptyState(title: '商品加载失败', description: snapshot.error.toString());
         }
         final products = snapshot.data ?? const [];