Merge remote-tracking branch 'origin/main'

# Conflicts:
#	das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java
This commit is contained in:
chenhaojie 2024-06-21 14:39:14 +08:00
commit 87a3a274e2

View File

@ -20,12 +20,14 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Optional;
public class DecryptingOncePerRequestFilter extends OncePerRequestFilter {
private String aeskey;
public DecryptingOncePerRequestFilter(String aeskey) {
this.aeskey = aeskey;
private String aesKey;
private AdminRedisTemplate adminRedisTemplate;
public DecryptingOncePerRequestFilter(String aesKey, AdminRedisTemplate adminRedisTemplate) {
this.aesKey = aesKey;
this.adminRedisTemplate = adminRedisTemplate;
}
@ -41,10 +43,10 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter {
// token解密
String token = request.getHeader("token");
if (StringUtils.isNotBlank(token)) {
token = AESUtil.decrypt(aeskey, token, iv);
token = AESUtil.decrypt(aesKey, token, iv);
}
if (StringUtils.isNotBlank(encryptedData)) {
encryptedData = AESUtil.decrypt(aeskey, encryptedData, iv);
encryptedData = AESUtil.decrypt(aesKey, encryptedData, iv);
// 使用自定义的请求包装器替换原始请求
filterChain.doFilter(new DecryptingHttpServletRequestWrapper(request, encryptedData, token), response);
} else {