From edfe1dbd25e71d99328f3211bc288217dd4b8a1e Mon Sep 17 00:00:00 2001
From: mashuai <mashuai@163.com>
Date: Sat, 9 Dec 2023 23:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java   | 2 +-
 .../main/java/com/bonus/zlpt/auth/service/SysLoginService.java  | 2 ++
 .../com/bonus/zlpt/common/security/service/TokenService.java    | 1 +
 .../src/main/resources/mapper/system/SysUserMapper.xml          | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
index d91d6d5..033ad59 100644
--- a/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
+++ b/zlpt-api/zlpt-api-system/src/main/java/com/bonus/zlpt/system/api/domain/vo/UserVo.java
@@ -6,7 +6,7 @@ public class UserVo {
 
 
         //用户id
-        private String userId;
+        private Long userId;
 
         //用户手机号
         private String phonenumber;
diff --git a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
index b188269..56414d5 100644
--- a/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
+++ b/zlpt-auth/src/main/java/com/bonus/zlpt/auth/service/SysLoginService.java
@@ -115,6 +115,8 @@ public class SysLoginService
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         Long userId = user.getUserId();
         R<UserVo> userVoR = remoteUserService.selectUserVo(userId);
+        userVoR.getData().setPhonenumber(user.getPhonenumber());
+        userVoR.getData().setUserId(userId);
         userInfo.setUserVo(userVoR.getData());
         return userInfo;
     }
diff --git a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
index ef431d2..739a381 100644
--- a/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
+++ b/zlpt-common/zlpt-common-security/src/main/java/com/bonus/zlpt/common/security/service/TokenService.java
@@ -67,6 +67,7 @@ public class TokenService
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
         rspMap.put("expires_in", expireTime);
+        rspMap.put("user",loginUser.getUserVo());
         return rspMap;
     }
 
diff --git a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
index ba5d764..9689440 100644
--- a/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/zlpt-modules/zlpt-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>