From d36aa25397506dbe20a741d08925ba02f5de8a1d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 18 Oct 2021 12:51:25 +0800
Subject: [PATCH] feat: There is no way the

---
 .../java/com/adc/da/login/util/UserUtils.java | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java
index 8bfaa40b..dec6b6fb 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java
@@ -84,11 +84,11 @@ public class UserUtils {
 	 * 获取当前登录用户名
 	 */
 	public static String getUserName() {
-//		JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal();
-//		if (principal != null) {
-//			return principal.getLoginName();
-//		}
-		return jwtUtils.getUserIdByToken();
+		UserEO userEO = getUser();
+		if (userEO != null) {
+			return userEO.getAccount();
+		}
+		return null;
 	}
 
 	/**
@@ -96,11 +96,7 @@ public class UserUtils {
 	 * @throws Exception 
 	 */
 	public static String getUserId() {
-		UserEO userEO = getUser();
-		if (userEO != null) {
-			return userEO.getUsid();
-		}
-		return null;
+		return jwtUtils.getUserIdByToken();
 	}
 
     /**
@@ -110,13 +106,15 @@ public class UserUtils {
         UserEO user = jwtUtils.getUserByToken();
         if (user == null) {
 			user = new UserEO();
-            String userName = getUserName();
+            String userId = getUserId();
 
-            if (StringUtils.isNotEmpty(userName)) {
-                UserEO userInDb = userService.getUserByLoginNameNotDeleted(userName);
-                user = ObjectUtil.clone(userInDb);
-                user.setPassword("");
-                CacheUtils.putCache(CURRENT_USER, user);
+            if (StringUtils.isNotEmpty(userId)) {
+				List<UserEO> userEOS = userService.getUser(userId);
+				if(!userEOS.isEmpty()){
+					user = ObjectUtil.clone(userEOS.get(0));
+					user.setPassword("");
+					CacheUtils.putCache(CURRENT_USER, user);
+				}
             }
         }
         return user;