From 490037e66e46160021e2ee9d172206a6d77be011 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 一月 2024 09:24:03 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..8409a3b 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
@@ -5,6 +5,7 @@
 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.entity.UserLogin;
 import com.zy.asrs.wcs.sys.service.UserLoginService;
 import com.zy.asrs.wcs.sys.service.UserService;
 import com.zy.asrs.wcs.utils.HttpUtils;
@@ -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("openapi", null);
                     if (user == null) {
                         throw new UsernameNotFoundException("Username not found");
                     }
@@ -76,7 +78,7 @@
                     // 瑙f瀽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,8 +93,7 @@
                         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(), UserLogin.TYPE_REFRESH, null, user.getHostId(), request);
                     }
                 }
             } catch (ExpiredJwtException e) {

--
Gitblit v1.9.1