From 3868b706ee3ee115a400d77abc3b69b83ea448c7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 03 Sep 2021 14:15:36 +0800
Subject: [PATCH] bug123
---
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 f538f16..0d24e53 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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.matrix.component.redis.RedisClient;
-import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
@@ -11,8 +10,6 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysUsersDao;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.system.hive.dao.SysVipInfoDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -33,7 +30,7 @@
private RedisClient redisClient;
@Value("${login_private_key}")
- private String privateKey;
+ private String privateKey;
@Value("${evn}")
private String evn;
@@ -41,18 +38,18 @@
@Autowired
private SysUsersDao sysUsersDao;
- private final String TOKEN_HEADER = "Authorization";
- private final String TOKEN_START_WITH = "Bearer ";
+ private static final String TOKEN_HEADER = "Authorization";
+ private static final String TOKEN_START_WITH = "Bearer ";
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- if ("dev".equals(evn)) {
- SysUsers sysUsers = sysUsersDao.selectById(1012L);
- request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
- return true;
- }
+// if ("dev".equals(evn)) {
+// SysUsers sysUsers = sysUsersDao.selectById(1022L);
+// request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
+// return true;
+// }
- String token = resolveToken(request);
+ String token = resolveToken(request,privateKey);
AjaxResult ajaxResult = new AjaxResult();
ajaxResult.setStatus(AjaxResult.STATUS_LOGIN_INVALID);
@@ -66,7 +63,7 @@
}
String userStr = redisClient.getCachedValue(token);
- redisClient.resetExpire(token);
+// redisClient.resetExpire(token);
if (StringUtils.isBlank(userStr)) {
ajaxResult.setInfo("login time out");
response.getWriter().write(new ObjectMapper().writeValueAsString(ajaxResult));
@@ -95,7 +92,7 @@
* @param request
* @return
*/
- private String resolveToken(HttpServletRequest request) {
+ public static String resolveToken(HttpServletRequest request,String privateKey) {
String headToken = request.getHeader(TOKEN_HEADER);
String sb = request.getRequestURI();
--
Gitblit v1.9.1