From 391ffd7e21f5e1d8ef6b7a55331bf13ec5682599 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 5 Jun 2019 19:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=B8=85?= =?UTF-8?q?=E7=90=86=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/ShiroConstants.java | 10 ++++++++++ .../ruoyi/framework/config/ShiroConfig.java | 1 + .../shiro/service/SysPasswordService.java | 3 ++- .../shiro/web/filter/LogoutFilter.java | 16 +++++++++++++++ .../filter/kickout/KickoutSessionFilter.java | 20 +++++++++++++------ 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java index 7acf2fa0..c5027c24 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java @@ -61,4 +61,14 @@ public interface ShiroConstants * 验证码错误 */ public static final String CAPTCHA_ERROR = "captchaError"; + + /** + * 登录记录缓存 + */ + public static final String LOGINRECORDCACHE = "loginRecordCache"; + + /** + * 系统活跃用户缓存 + */ + public static final String SYS_USERCACHE = "sys-userCache"; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index a3dd77d3..721baf37 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -219,6 +219,7 @@ public class ShiroConfig public LogoutFilter logoutFilter() { LogoutFilter logoutFilter = new LogoutFilter(); + logoutFilter.setCacheManager(getEhCacheManager()); logoutFilter.setLoginUrl(loginUrl); return logoutFilter; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java index d8a76326..96da6cde 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.exception.user.UserPasswordNotMatchException; import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; import com.ruoyi.common.utils.MessageUtils; @@ -35,7 +36,7 @@ public class SysPasswordService @PostConstruct public void init() { - loginRecordCache = cacheManager.getCache("loginRecordCache"); + loginRecordCache = cacheManager.getCache(ShiroConstants.LOGINRECORDCACHE); } public void validate(SysUser user, String password) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java index 5970838f..f5aa9664 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java @@ -1,12 +1,17 @@ package com.ruoyi.framework.shiro.web.filter; +import java.io.Serializable; +import java.util.Deque; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.shiro.cache.Cache; +import org.apache.shiro.cache.CacheManager; import org.apache.shiro.session.SessionException; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.manager.AsyncManager; @@ -28,6 +33,8 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter */ private String loginUrl; + private Cache> cache; + public String getLoginUrl() { return loginUrl; @@ -53,6 +60,8 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter String loginName = user.getLoginName(); // 记录用户退出日志 AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success"))); + // 清理缓存 + cache.remove(loginName); } // 退出登录 subject.logout(); @@ -83,4 +92,11 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter } return super.getRedirectUrl(request, response, subject); } + + // 设置Cache的key的前缀 + public void setCacheManager(CacheManager cacheManager) + { + // 必须和ehcache缓存配置中的缓存name一致 + this.cache = cacheManager.getCache(ShiroConstants.SYS_USERCACHE); + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java index 87a69f9c..2c94499e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java @@ -17,6 +17,7 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.AccessControlFilter; import org.apache.shiro.web.util.WebUtils; import com.fasterxml.jackson.databind.ObjectMapper; +import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.framework.util.ShiroUtils; @@ -108,12 +109,19 @@ public class KickoutSessionFilter extends AccessControlFilter // 踢出后再更新下缓存队列 cache.put(loginName, deque); - // 获取被踢出的sessionId的session对象 - Session kickoutSession = sessionManager.getSession(new DefaultSessionKey(kickoutSessionId)); - if (kickoutSession != null) + try { - // 设置会话的kickout属性表示踢出了 - kickoutSession.setAttribute("kickout", true); + // 获取被踢出的sessionId的session对象 + Session kickoutSession = sessionManager.getSession(new DefaultSessionKey(kickoutSessionId)); + if (null != kickoutSession) + { + // 设置会话的kickout属性表示踢出了 + kickoutSession.setAttribute("kickout", true); + } + } + catch (Exception e) + { + // 面对异常，我们选择忽略 } } @@ -173,6 +181,6 @@ public class KickoutSessionFilter extends AccessControlFilter public void setCacheManager(CacheManager cacheManager) { // 必须和ehcache缓存配置中的缓存name一致 - this.cache = cacheManager.getCache("sys-userCache"); + this.cache = cacheManager.getCache(ShiroConstants.SYS_USERCACHE); } }