feat: 退出登录清理缓存

lerry903 · lerry903 · commit ac5f8462a0ff · 2019-06-07T16:45:42.000+08:00
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;
 
 /**
  * &#36864;&#20986;&#36807;&#28388;&#22120;
@@ -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();
                 // &#35760;&#24405;&#29992;&#25143;&#36864;&#20986;&#26085;&#24535;
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
+                // &#28165;&#29702;&#32531;&#23384;
+                cache.remove(loginName);
             }
             // &#36864;&#20986;&#30331;&#24405;
             subject.logout();
@@ -66,4 +75,13 @@ protected String getRedirectUrl(ServletRequest request, ServletResponse response
         }
         return super.getRedirectUrl(request, response, subject);
     }
+
+    /**
+     * &#35774;&#32622;Cache&#30340;key&#30340;&#21069;&#32512;
+     * @param cacheManager &#32531;&#23384;&#31649;&#29702;&#22120;
+     */
+    public void setCacheManager(CacheManager cacheManager) {
+        // &#24517;&#39035;&#21644;ehcache&#32531;&#23384;&#37197;&#32622;&#20013;&#30340;&#32531;&#23384;name&#19968;&#33268;
+        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
@@ -103,7 +103,7 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons
                 try {
                     // &#33719;&#21462;&#34987;&#36386;&#20986;&#30340;sessionId&#30340;session&#23545;&#35937;
                     Session kickoutSession = sessionManager.getSession(new DefaultSessionKey(kickoutSessionId));
-                    if (null != kickoutSession) {
+                    if (ObjectUtil.isNotNull(kickoutSession)) {
                         // &#35774;&#32622;&#20250;&#35805;&#30340;kickout&#23646;&#24615;&#34920;&#31034;&#36386;&#20986;&#20102;
                         kickoutSession.setAttribute("kickout", true);
                     }

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ public SecurityManager securityManager(UserRealm userRealm) {`
`250`	`250`	`*/`
`251`	`251`	`private LogoutFilter logoutFilter() {`
`252`	`252`	`LogoutFilter logoutFilter = new LogoutFilter();`
	`253`	`+ logoutFilter.setCacheManager(getEhCacheManager());`
`253`	`254`	`logoutFilter.setLoginUrl(loginUrl);`
`254`	`255`	`return logoutFilter;`
`255`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons`
`103`	`103`	`try {`
`104`	`104`	`// 获取被踢出的sessionId的session对象`
`105`	`105`	`Session kickoutSession = sessionManager.getSession(new DefaultSessionKey(kickoutSessionId));`
`106`		`- if (null != kickoutSession) {`
	`106`	`+ if (ObjectUtil.isNotNull(kickoutSession)) {`
`107`	`107`	`// 设置会话的kickout属性表示踢出了`
`108`	`108`	`kickoutSession.setAttribute("kickout", true);`
`109`	`109`	`}`