From 80e5ee8049eefe7039d77048f43e6e0566a07953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 09:10:43 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
index 77e2d16..1b4c185 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
@@ -3,10 +3,11 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.config.ConfigProperties;
import com.zy.asrs.wcs.common.constant.Constants;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.service.UserLoginService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.UserLoginService;
+import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.HttpUtils;
import com.zy.asrs.wcs.utils.JwtUtil;
import io.jsonwebtoken.Claims;
@@ -36,7 +37,7 @@
@Component
public class JwtAuthenticationFilter extends OncePerRequestFilter {
- public static final ArrayList<String> WHITE_KEY = new ArrayList<String>(){
+ public static final ArrayList<String> WHITE_LIST = new ArrayList<String>(){
private static final long serialVersionUID = 1L;
{
add("xltys1995");
@@ -62,8 +63,9 @@
if (!Cools.isEmpty(access_token)) {
try {
User user;
- if (WHITE_KEY.contains(access_token)) {
- user = userService.getByUsername("openapi", 2);
+ // 鐧藉悕鍗�
+ if (WHITE_LIST.contains(access_token)) {
+ user = userService.getByUsername("root", 1L);
if (user == null) {
throw new UsernameNotFoundException("Username not found");
}
@@ -76,7 +78,7 @@
// 瑙ｆ瀽token
Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey());
JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
- user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
+ user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getHostId());
if (user == null) {
throw new UsernameNotFoundException("Username not found");
}
@@ -91,15 +93,16 @@
String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
configProperties.getTokenKey());
response.addHeader(Constants.TOKEN_HEADER_NAME, token);
- userLoginService.saveAsync(user.getUsername(), LoginRecord.TYPE_REFRESH, null,
- user.getTenantId(), request);
+ userLoginService.saveAsync(user.getId(), token, UserLogin.TYPE_REFRESH, user.getHostId(), null, request);
}
}
} catch (ExpiredJwtException e) {
+// e.printStackTrace();
HttpUtils.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
e.getMessage());
return;
} catch (Exception e) {
+ e.printStackTrace();
HttpUtils.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
e.toString());
return;
--
Gitblit v1.9.1