From 68408ba6f0ff9c4e7978735818ab12990c957c1a Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期四, 03 十一月 2022 10:47:32 +0800
Subject: [PATCH] 忽略不需要提交的文件

---
 src/main/java/com/qxueyou/scc/base/util/ClientUtils.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java b/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
index 8ede9cf..b113ad5 100644
--- a/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
+++ b/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
@@ -68,10 +68,13 @@
 
 	/** 得到userName*/
 	public static String getUserName(){
-//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-//		HttpSession session = request.getSession();
-		return getUserInfo().getInfo(UserInfoWrapper.INF_USER_NAME);
-//		return (String) session.getAttribute("userName");
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		HttpSession session = request.getSession();
+		String info = getUserInfo().getInfo(UserInfoWrapper.INF_USER_NAME);
+		if(info!=null){
+			info= (String) session.getAttribute(UserInfoWrapper.INF_USER_NAME);
+		}
+		return info;
 	}
 
 	/** 得到用户头像*/
@@ -104,7 +107,13 @@
 
 	/** 得到className*/
 	public static String getClassName(){
-		return getUserInfo().getInfo(UserInfoWrapper.INF_CLASS_NAME);
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		HttpSession session = request.getSession();
+		String info = getUserInfo().getInfo(UserInfoWrapper.INF_CLASS_NAME);
+		if(info!=null){
+			info= (String) session.getAttribute(UserInfoWrapper.INF_CLASS_NAME);
+		}
+		return info;
 //		System.out.println("CLassName"+session.getAttribute("className"));
 //		return (String) session.getAttribute("className");
 	}

--
Gitblit v1.8.0