From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java index 8a2d5be..cb284a7 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java +++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java @@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Objects; /** * @author wzy @@ -60,16 +61,14 @@ return false; } - String userStr = LocalCache.get(token); -// redisClient.resetExpire(token); - if (StringUtils.isBlank(userStr)) { + SysUsers sysUsers = LocalCache.get(token); + if (Objects.isNull(sysUsers)) { ajaxResult.setInfo("login time out"); response.getWriter().write(new ObjectMapper().writeValueAsString(ajaxResult)); response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); return false; } - SysUsers sysUsers = JSONObject.parseObject(userStr, SysUsers.class); request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers); return true; } -- Gitblit v1.9.1