From 45638f679cfd77644cd2317642e4fed0dd82cc05 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Sat, 11 Sep 2021 11:36:00 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/talkonlineweb/controller/UserContoller.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
index e04357d..097c1a5 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
@@ -22,6 +22,7 @@ import io.jsonwebtoken.Claims;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cglib.beans.BeanMap;
 import org.springframework.util.DigestUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -275,9 +276,16 @@ public class UserContoller {
     public BaseResponse getUserByToken(@RequestHeader String authorization){
         BaseResponse baseResponse=new BaseResponse();
         baseResponse.setErrormsg("");
+        Map<String,Object> rs=new HashMap<>();
         try {
             LymsUser curUser=lymsUserService.getUserByToken(authorization);
-            baseResponse.setObject(curUser);
+            Map<String,Object> hxMap=new HashMap<>();
+            hxMap.put("hxuser",hxuser);
+            hxMap.put("hxpasswd",hxpasswd);
+            rs.put("hx",hxMap);
+            rs.put("curUser",curUser);
+
+            baseResponse.setObject(rs);
             baseResponse.setErrorcode(0);
         } catch (Exception e) {
             log.error(e.getMessage());
-- 
1.8.3.1