From 8c99e2d8b6c1e0d9cde6abbe80b4df75be19f6d1 Mon Sep 17 00:00:00 2001
From: Administrator <2863138610@qq.com>
Date: 星期二, 29 十一月 2022 16:31:18 +0800
Subject: [PATCH] 课程与课件bug修复

---
 src/main/java/com/qxueyou/scc/base/util/ClientUtils.java |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 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 ca4ad36..b633fbf 100644
--- a/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
+++ b/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
@@ -3,7 +3,11 @@
 import java.util.List;
 import java.util.Map;
 
+import com.qxueyou.scc.base.dao.AbstractRedisTemplate;
+import com.qxueyou.scc.base.dao.CommonRedisTemplate;
 import com.qxueyou.scc.base.model.UserInfoWrapper;
+import com.qxueyou.scc.base.service.impl.RedisCacheBean;
+import com.qxueyou.scc.sys.utils.SpringContextHolder;
 import org.apache.commons.lang3.StringUtils;
 
 import com.qxueyou.scc.base.model.Constants;
@@ -11,9 +15,17 @@
 import com.qxueyou.scc.sys.model.ResponseResult;
 import com.qxueyou.scc.sys.model.SysMenu;
 import com.qxueyou.scc.user.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.cache.RedisCache;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.core.RedisAccessor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -32,10 +44,14 @@
 	private static ThreadLocal<UserInfoWrapper> threadLocalUserInfo = new ThreadLocal<UserInfoWrapper>();
 	private static UserInfoWrapper wrapper = threadLocalUserInfo.get();
 
+	private static RedisTemplate redisTemplate = (RedisTemplate)SpringContextHolder.getBean("redisTemplate");
+
 	/** 得到用户信息*/
 	public static UserInfoWrapper getUserInfo() {
-		UserInfoWrapper wrapper = threadLocalUserInfo.get();
-		if(wrapper == null){
+//		UserInfoWrapper wrapper = threadLocalUserInfo.get();
+//		if(wrapper == null) {
+		wrapper = (UserInfoWrapper)redisTemplate.opsForValue().get(UserInfoWrapper.SESSION_USER_INFO_KEY);
+		if (wrapper == null) {
 			wrapper = new UserInfoWrapper();
 			User user = new User();
 			//默认值,上传可以作为默认上传者
@@ -44,6 +60,10 @@
 			wrapper.setUser(user);
 			setUserInfo(wrapper);
 		}
+//		}
+//		else{
+//			redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY,wrapper);
+//		}
 
 		return wrapper;
 	}
@@ -62,8 +82,6 @@
 		String info = getUserInfo().getInfo(UserInfoWrapper.INF_USER_ID);
 		if(info.equals("visitor_001")){
 			info= (String) session.getAttribute(UserInfoWrapper.INF_USER_ID);
-		}else {
-			session.setAttribute(UserInfoWrapper.INF_USER_ID,info);
 		}
 		return info;
 	}
@@ -73,9 +91,9 @@
 		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);
-		}
+//		if(info!=null){
+//			info= (String) session.getAttribute(UserInfoWrapper.INF_USER_NAME);
+//		}
 		return info;
 	}
 
@@ -100,9 +118,9 @@
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 		HttpSession session = request.getSession();
 		String info = getUserInfo().getInfo(UserInfoWrapper.INF_CLASS_ID);
-		if(info!=null){
-			info= (String) session.getAttribute(UserInfoWrapper.INF_CLASS_ID);
-		}
+//		if(info!=null){
+//			info= (String) session.getAttribute(UserInfoWrapper.INF_CLASS_ID);
+//		}
 		return info;
 //		return getUserInfo().getInfo(UserInfoWrapper.);
 	}
@@ -112,9 +130,9 @@
 		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);
-		}
+//		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