feat: 退出登录清理缓存

lerry903 · Jun 7, 2019 · ac5f846 · ac5f846
1 parent 64fdf3b
commit ac5f846
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
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
@@ -250,6 +250,7 @@ public SecurityManager securityManager(UserRealm userRealm) {
      */
     private 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
@@ -3,6 +3,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.PostConstruct;
 
+import com.ruoyi.common.constant.ShiroConstants;
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.crypto.hash.Md5Hash;
@@ -39,7 +40,7 @@ public SysPasswordService(CacheManager cacheManager) {
 
     @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
@@ -2,17 +2,22 @@
 
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.ShiroConstants;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.framework.util.ShiroUtils;
 import com.ruoyi.system.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.shiro.cache.Cache;
+import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.subject.Subject;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import java.io.Serializable;
+import java.util.Deque;
 
 /**
  * 退出过滤器
@@ -27,6 +32,8 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
      */
     private String loginUrl;
 
+    private Cache<String, Deque<Serializable>> cache;
+
     public String getLoginUrl() {
         return loginUrl;
     }
@@ -45,6 +52,8 @@ protected boolean preHandle(ServletRequest request, ServletResponse response){
                 String loginName = user.getLoginName();
                 // 记录用户退出日志
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
+                // 清理缓存
+                cache.remove(loginName);
             }
             // 退出登录
             subject.logout();
@@ -66,4 +75,13 @@ protected String getRedirectUrl(ServletRequest request, ServletResponse response
         }
         return super.getRedirectUrl(request, response, subject);
     }
+
+    /**
+     * 设置Cache的key的前缀
+     * @param cacheManager 缓存管理器
+     */
+    public void setCacheManager(CacheManager cacheManager) {
+        // 必须和ehcache缓存配置中的缓存name一致
+        this.cache = cacheManager.getCache(ShiroConstants.SYS_USERCACHE);
+    }
 }
diff --git a/...work/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java b/...work/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java
@@ -103,7 +103,7 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons
                 try {
                     // 获取被踢出的sessionId的session对象
                     Session kickoutSession = sessionManager.getSession(new DefaultSessionKey(kickoutSessionId));
-                    if (null != kickoutSession) {
+                    if (ObjectUtil.isNotNull(kickoutSession)) {
                         // 设置会话的kickout属性表示踢出了
                         kickoutSession.setAttribute("kickout", true);
                     }