From 0e31bc6ea2f9e9ce9e3f8d8529e0f59ed0b22ed7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 02:26:22 +0800
Subject: [PATCH] 合并代码

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index 88c08b7..0b10940 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -90,12 +90,7 @@
 	@RequestMapping(value = "/", method = RequestMethod.GET)
 	public String index(Model model, HttpServletRequest request) throws UnsupportedEncodingException {
 		//session中解析用户数据
-		//设置共享session
-		HttpSession session = (HttpSession) redisTemplate.opsForValue().get(request.getSession().getId());
-		if (null != session) {
-			session = request.getSession();
-			redisTemplate.opsForValue().set(request.getSession().getId(), session, 2, TimeUnit.DAYS);
-		}
+		HttpSession session = request.getSession();
 		String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
 		onconParam = new String(Base64.decodeBase64(onconParam), "UTF-8");
 		LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class);
@@ -105,6 +100,7 @@
 		User user = userMapper.getByAccount(loginUser.getImUser());
 		if (null == user) {
 			logOut();
+			return null;
 		}
 		ShiroUser shiroUser = shiro.shiroUser(user);
 		List<Integer> roleList = shiroUser.getRoleList();

--
Gitblit v1.7.1