修复使用RedisSessionManager时logout的bug

Author: xlongwei

api-web/src/main/java/com/dev/base/controller/BaseController.java

@@ -5,6 +5,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.dev.base.constant.AppConstants;
@@ -22,6 +24,7 @@
 public class BaseController {
 	@Autowired
 	private AuthService authService;
+	protected Logger log = LoggerFactory.getLogger(getClass());
 
 	/**
 	 * 

api-web/src/main/java/com/dev/base/filter/AopCache.java

@@ -24,14 +24,14 @@
 import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeansException;
 import org.springframework.cache.Cache;
 import org.springframework.cache.Cache.ValueWrapper;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.guava.GuavaCacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
-import org.springframework.core.annotation.Order;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -45,16 +45,29 @@
 
 @Aspect
 @Component
-@Order(200)
-public class AopCache implements InitializingBean {
+public class AopCache implements ApplicationContextAware {
+	public static CacheManager cacheManager = null;
+	public static ApplicationContext springContext = null;
 	private static Logger log = LoggerFactory.getLogger(AopCache.class);
-	private @Autowired(required=false) CacheManager cacheManager;
 	private int cacheStatus = -1;//-1待初始化 0不可用 1可用
 	private String[] cacheMethods = {"list", "count", "get"};
 	private String[] evictMethods = {"add", "batchAdd", "update", "delete", "delBy"};
 	private Map<String, Boolean> classNames = new HashMap<>();
 	private Map<String, Class<?>> returnTypes = new HashMap<>();
 
+	/**
+	 * 尝试获取bean，或者返回null
+	 * @param clazz
+	 * @return
+	 */
+	public static <T> T getBean(Class<T> clazz) {
+		try {
+			return springContext.getBean(clazz);
+		}catch(Exception e) {
+			return null;
+		}
+	}
+	
     @Pointcut("within(com.dev.base.mybatis.service.BaseMybatisService+)")
     public void cacheService(){}
 
@@ -108,7 +121,9 @@ public void run() {
     }
 
     @Override
-	public void afterPropertiesSet() throws Exception {
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    	springContext = applicationContext;
+		cacheManager = getBean(CacheManager.class);
     	initCacheManager();
 	}
 
@@ -204,7 +219,7 @@ public RedisCacheManager(JedisPool jedisPool, int expire) {
 
 		@Override
 		public Cache getCache(String name) {
-			RedisCache redisCache = redisCaches.get(name);
+			RedisCache redisCache = redisCaches.get(name=StringUtils.trimToEmpty(name));
 			if(redisCache==null) {
 				redisCache = new RedisCache(this, name);
 				redisCaches.put(name, redisCache);
@@ -226,7 +241,7 @@ public <T> T execute(JedisCallback<T> callback) {
 		}
 
 		public static byte[] byteKey(String cache, String key) {
-			return (cache+":"+key).getBytes(StandardCharsets.UTF_8);
+			return (StringUtils.isBlank(cache) ? key : cache+":"+key).getBytes(StandardCharsets.UTF_8);
 		}
 
 		public static byte[] byteValue(Object value) {
@@ -334,7 +349,7 @@ public String doInJedis(Jedis jedis) {
 			});
 		}
 		private String keystr(Object key) {
-			return new StringBuilder(name).append(":").append(key).toString();
+			return StringUtils.isBlank(name) ? String.valueOf(key) : name+":"+String.valueOf(key);
 		}
 	}
 

api-web/src/main/java/com/dev/base/listener/SessionListener.java

@@ -13,6 +13,7 @@
 
 import com.dev.base.constant.AppConstants;
 import com.dev.base.enums.LoginStatus;
+import com.dev.base.filter.AopCache;
 import com.dev.base.utils.DateUtil;
 import com.dev.user.entity.UserLogin;
 import com.dev.user.service.UserLoginService;
@@ -47,6 +48,9 @@ public void sessionDestroyed(HttpSessionEvent event) {
 			userLogin.setLoginStatus(LoginStatus.offline);
 			userLoginService.update(userLogin);
 		}
+		if(AopCache.cacheManager!=null) {
+			AopCache.cacheManager.getCache(null).evict(event.getSession().getId());
+		}
 	}
 
 	@Override
@@ -70,7 +74,8 @@ public void attributeReplaced(HttpSessionBindingEvent event) {
 			*@Description  
 			*@CreateDate 2015年10月10日下午11:45:05
 	 */
-    private Object getBean(ServletContext servletContext,Class beanClass){  
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	private Object getBean(ServletContext servletContext,Class beanClass){  
         //通过WebApplicationContextUtils 得到Spring容器的实例。  
         ApplicationContext application = WebApplicationContextUtils.getWebApplicationContext(servletContext);  
 

api-web/src/main/java/com/dev/user/controller/LoginController.java

@@ -15,8 +15,6 @@
 import com.dev.base.constant.CfgConstants;
 import com.dev.base.controller.BaseController;
 import com.dev.base.enums.LoginType;
-import com.dev.base.exception.TipException;
-import com.dev.base.exception.ValidateException;
 import com.dev.base.exception.code.ErrorCode;
 import com.dev.base.json.JsonUtils;
 import com.dev.base.util.WebUtil;
@@ -81,13 +79,17 @@ public String login(HttpServletRequest request,HttpServletResponse response,
 		paramInfo.setAutoLogin(autoLogin);
 
 		UserInfo userInfo = null;
-		try {
-			ValidateUtils.isTrue(validCode.equals(WebUtil.getSessionAttr(request, AppConstants.CAPTCHA_LOGIN)), ErrorCode.LOGIN_003);
+//		try {
+			Object code = WebUtil.getSessionAttr(request, AppConstants.CAPTCHA_LOGIN);
+			boolean valid = validCode.equals(code);
+			log.info("validCode={}, code={}, valid={}", validCode, code, valid);
+//			if(valid==false) return "forward:/forwardLogin.htm";
+//			ValidateUtils.isTrue(valid, ErrorCode.LOGIN_003);
 			userInfo = loginService.loginByEmail(paramInfo);
-		} 
-		catch (ValidateException e) {
-			throw new TipException("forward:/forwardLogin.htm", e);
-		}
+//		} 
+//		catch (ValidateException e) {
+//			throw new TipException("forward:/forwardLogin.htm", e);
+//		}
 
 		//保存登陆用户信息
 		WebUtil.setSessionAttr(request, AppConstants.SESSION_KEY_USER, userInfo);
@@ -166,6 +168,7 @@ public String logout(HttpServletRequest request,HttpServletResponse response,Mod
 			*@Description  
 			*@CreateDate 2015年8月22日下午2:58:59
 	 */
+	@SuppressWarnings("rawtypes")
 	@RequestMapping("/json/sendResetCode.htm")
 	public @ResponseBody Map sendResetCode(HttpServletRequest request,String email){
 		ValidateUtils.isTrue(RegexUtil.isEmail(email), ErrorCode.SYS_001,"邮箱格式不正确");