From ae2efe9a1b627fcfbe61020e9e0a82470a3959d7 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 23:07:03 +0800
Subject: [PATCH] Merge branch 'hive2.0' into api
---
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java | 10 +++++-----
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 9 ++++-----
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 1 -
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index f7b9c42..1ea1ccc 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -94,7 +94,6 @@
String token = UUIDUtil.getRandomID();
redisClient.saveValueForever(token, JSONObject.toJSONString(user));
- redisClient.saveValueForever(user.getSuId().toString(), token);
userInfoVo.setId(user.getSuId());
userInfoVo.setName(user.getSuName());
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 4fb6a84..d175ec5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -13,6 +13,7 @@
import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.app.vo.UserInfoDetailVo;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.interceptor.ApiUserLoginInterceptor;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
@@ -31,6 +32,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -101,12 +103,9 @@
@ApiOperation(value = "退出登陆", notes = "退出登陆")
@GetMapping(value = "/loginOut")
- public AjaxResult loginOut() {
- SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- String token = redisClient.getCachedValue(sysUsers.getSuId().toString());
-
+ public AjaxResult loginOut(HttpServletRequest request) {
+ String token=ApiUserLoginInterceptor.resolveToken(request);
redisClient.removeObject(token);
- redisClient.removeObject(sysUsers.getSuId().toString());
return AjaxResult.buildSuccessInstance("退出成功");
}
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 4fe5642..4f0855e 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
@@ -33,7 +33,7 @@
private RedisClient redisClient;
@Value("${login_private_key}")
- private String privateKey;
+ private static String privateKey;
@Value("${evn}")
private String evn;
@@ -41,12 +41,12 @@
@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)) {
+ if ("dev".equals(evn)) {
SysUsers sysUsers = sysUsersDao.selectById(1012L);
request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
return true;
@@ -95,7 +95,7 @@
* @param request
* @return
*/
- private String resolveToken(HttpServletRequest request) {
+ public static String resolveToken(HttpServletRequest request) {
String headToken = request.getHeader(TOKEN_HEADER);
String sb = request.getRequestURI();
--
Gitblit v1.9.1