From 5d79b0085d3b1535ba5a1351f4b2884889501092 Mon Sep 17 00:00:00 2001
From: Leo <98382335+gaoziman@users.noreply.github.com>
Date: Sun, 6 Jul 2025 22:10:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新fetchLoginUserInfo返回类型为UserInfoResponse
- 添加UserInfoResponse接口定义，匹配后端实际返回结构
- 在User实体中添加userId字段支持后端字段映射
- 确保类型安全和前后端数据结构一致性
---
 src/service/api/auth/index.ts  |  2 +-
 src/typings/api/login.d.ts     | 14 ++++++++++++++
 src/typings/entities/user.d.ts |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/service/api/auth/index.ts b/src/service/api/auth/index.ts
index 6cb7de9..0ebfbb4 100644
--- a/src/service/api/auth/index.ts
+++ b/src/service/api/auth/index.ts
@@ -60,7 +60,7 @@ export function fetchUserRoutesOld(params: { id: number }) {
 }
 
 export function fetchLoginUserInfo() {
-  return request.Get<Service.ResponseResult<Api.Login.Info>>('/coder/sysLoginUser/getLoginUserInformation')
+  return request.Get<Service.ResponseResult<Api.Login.UserInfoResponse>>('/coder/sysLoginUser/getLoginUserInformation')
 }
 
 // 验证码相关接口
diff --git a/src/typings/api/login.d.ts b/src/typings/api/login.d.ts
index 13e20fc..f0c9aef 100644
--- a/src/typings/api/login.d.ts
+++ b/src/typings/api/login.d.ts
@@ -13,5 +13,19 @@ namespace Api {
       /** 访问token */
       refreshToken: string
     }
+
+    /* 获取登录用户信息接口返回的数据结构 */
+    interface UserInfoResponse {
+      /** 登录用户基本信息 */
+      loginUser: {
+        userId: number
+        userName: string
+        avatar?: string
+      }
+      /** 用户角色列表 */
+      roles: string[]
+      /** 用户权限按钮列表 */
+      buttons: string[]
+    }
   }
 }
diff --git a/src/typings/entities/user.d.ts b/src/typings/entities/user.d.ts
index 2ffd5ac..a4705b4 100644
--- a/src/typings/entities/user.d.ts
+++ b/src/typings/entities/user.d.ts
@@ -5,6 +5,8 @@ namespace Entity {
   interface User {
     /** 用户id */
     id?: number
+    /** 用户id (后端字段) */
+    userId?: number
     /** 用户名 */
     userName?: string
     /* 用户头像 */