From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实现方式）。 5. 存货档案、单据管理、库存管理可以支持模糊搜索（各个单据界面）。
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 df659e0..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,11 +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.entity.UserLogin;
-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;
@@ -65,7 +65,7 @@
User user;
// 鐧藉悕鍗�
if (WHITE_LIST.contains(access_token)) {
- user = userService.getByUsername("openapi", null);
+ user = userService.getByUsername("root", 1L);
if (user == null) {
throw new UsernameNotFoundException("Username not found");
}
@@ -93,15 +93,16 @@
String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
configProperties.getTokenKey());
response.addHeader(Constants.TOKEN_HEADER_NAME, token);
- userLoginService.saveAsync(user.getId(), UserLogin.TYPE_REFRESH, null,
- user.getHostId(), 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