From a0fed6b8bca4e071aa382131a43f01333f88df11 Mon Sep 17 00:00:00 2001 From: Jolie <412895109@qq.com> Date: Tue, 4 Nov 2025 15:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config/env_config.dart | 2 +- lib/main.dart | 2 +- lib/network/api_urls.dart | 2 +- lib/network/network_config.dart | 2 +- lib/network/user_api.dart | 7 +++++-- lib/network/user_api.g.dart | 14 ++++++++------ lib/pages/mine/login_controller.dart | 21 ++++++++++++++++++++- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/lib/config/env_config.dart b/lib/config/env_config.dart index 64debbd..7015a08 100644 --- a/lib/config/env_config.dart +++ b/lib/config/env_config.dart @@ -14,7 +14,7 @@ class EnvConfig { // 生产环境配置 static const Map _releaseConfig = { - 'mainBaseUrl': 'https://dating-agency-api-test.qniao.cn/', + 'mainBaseUrl': 'https://dating-agency-api.quzhaoqin.com/', 'fileBaseUrl': 'https://dating-agency-api-test.qniao.cn/', }; diff --git a/lib/main.dart b/lib/main.dart index 9897114..8cddfed 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -72,6 +72,6 @@ class MyApp extends StatelessWidget { final token = storage.read('token'); // 如果token为空，显示登录页面，否则显示主页 - return token == null || token.isEmpty ? LoginPage() : MainPage(); + return LoginPage(); } } diff --git a/lib/network/api_urls.dart b/lib/network/api_urls.dart index 39e395f..35bb873 100644 --- a/lib/network/api_urls.dart +++ b/lib/network/api_urls.dart @@ -6,7 +6,7 @@ class ApiUrls { static const String getVerificationCode = 'dating-agency-uec/authorize/get/auth-captcha'; // 用户相关接口 - static const String getUserInfo = 'dating-agency-uec/user/get/base-info'; + static const String getBaseUserInfo = 'dating-agency-uec/user/get/base-info'; // 后续可以在此添加更多API端点 } \ No newline at end of file diff --git a/lib/network/network_config.dart b/lib/network/network_config.dart index 57d57d6..4cc28a3 100644 --- a/lib/network/network_config.dart +++ b/lib/network/network_config.dart @@ -67,7 +67,7 @@ class AuthInterceptor extends Interceptor { // 添加token等认证信息 final token = _getToken(); if (token != null && token.isNotEmpty) { - options.headers['Authorization'] = 'Bearer $token'; + options.headers['Authorization'] = token; } // 添加其他通用请求头 diff --git a/lib/network/user_api.dart b/lib/network/user_api.dart index dd0af19..20e7c48 100644 --- a/lib/network/user_api.dart +++ b/lib/network/user_api.dart @@ -1,4 +1,5 @@ import 'package:dating_touchme_app/model/mine/login_data.dart'; +import 'package:dating_touchme_app/model/mine/user_base_data.dart'; import 'package:dating_touchme_app/network/response_model.dart'; import 'package:dating_touchme_app/network/api_urls.dart'; import 'package:retrofit/retrofit.dart'; @@ -15,8 +16,10 @@ abstract class UserApi { @Body() Map data, ); - @GET(ApiUrls.getUserInfo) - Future>> getUserInfo(); + @GET(ApiUrls.getBaseUserInfo) + Future>> getBaseUserInfo( + @Query('userId') String userId, + ); @POST(ApiUrls.getVerificationCode) Future>> getVerificationCode( diff --git a/lib/network/user_api.g.dart b/lib/network/user_api.g.dart index 4b7c40f..c9c5021 100644 --- a/lib/network/user_api.g.dart +++ b/lib/network/user_api.g.dart @@ -54,12 +54,14 @@ class _UserApi implements UserApi { } @override - Future>> getUserInfo() async { + Future>> getBaseUserInfo( + String userId, + ) async { final _extra = {}; - final queryParameters = {}; + final queryParameters = {r'userId': userId}; final _headers = {}; const Map? _data = null; - final _options = _setStreamType>>( + final _options = _setStreamType>>( Options(method: 'GET', headers: _headers, extra: _extra) .compose( _dio.options, @@ -70,11 +72,11 @@ class _UserApi implements UserApi { .copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)), ); final _result = await _dio.fetch>(_options); - late BaseResponse _value; + late BaseResponse _value; try { - _value = BaseResponse.fromJson( + _value = BaseResponse.fromJson( _result.data!, - (json) => json as dynamic, + (json) => UserBaseData.fromJson(json as Map), ); } on Object catch (e, s) { errorLogger?.logError(e, s, _options); diff --git a/lib/pages/mine/login_controller.dart b/lib/pages/mine/login_controller.dart index 641c0e5..618aac3 100644 --- a/lib/pages/mine/login_controller.dart +++ b/lib/pages/mine/login_controller.dart @@ -111,10 +111,13 @@ class LoginController extends GetxController { // 保存token和用户信息 if (response.data.data != null) { final loginData = response.data.data!; - // await storage.write('token', loginData.token); + await storage.write('token', loginData.token); // await storage.write('userId', loginData.userId); // // 保存用户信息 // await storage.write('userInfo', loginData.toJson()); + + // 登录成功后获取用户基础信息 + await _getBaseUserInfo(loginData.userId); } } else { SmartDialog.showToast(response.data.message); @@ -125,4 +128,20 @@ class LoginController extends GetxController { isLoggingIn.value = false; } } + + // 获取用户基础信息 + Future _getBaseUserInfo(String userId) async { + try { + final response = await _userApi.getBaseUserInfo(userId); + + if (response.data.isSuccess && response.data.data != null) { + // 可以在这里处理用户基础信息，比如更新UI状态 + } else { + SmartDialog.showToast(response.data.message); + } + } catch (e) { + // 获取用户信息失败不影响登录流程 + // SmartDialog.showToast('获取用户信息失败'); + } + } } \ No newline at end of file