From 7b55e2cd82647b87d79a778ed70fdbddb39ac00a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 24 九月 2024 13:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
index 11816ce..5b865dc 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
@@ -3,27 +3,21 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
-import io.jsonwebtoken.Claims;
+import com.ruoyi.gateway.config.properties.SignProperties;
import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.core.Ordered;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
@@ -37,7 +31,6 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
/**
* 网关鉴权
@@ -48,11 +41,11 @@
public class SignFilter implements GlobalFilter, Ordered {
private static final Logger log = LoggerFactory.getLogger(SignFilter.class);
- @Value("${security.sign}")
- private boolean parameter_signature;
-
@Autowired
private IgnoreWhiteProperties ignoreWhite;
+
+ @Autowired
+ private SignProperties signProperties;
@Override
@@ -71,13 +64,13 @@
}
String sign = request.getHeaders().getFirst(TokenConstants.SIGN);
String nonce_str = request.getHeaders().getFirst(TokenConstants.NONCE_STR);
- if (parameter_signature && StringUtils.isEmpty(sign)) {
+ if (signProperties.getEnable() && StringUtils.isEmpty(sign)) {
return unauthorizedResponse(exchange, "签名不能为空！");
}
- if (parameter_signature && StringUtils.isEmpty(nonce_str)) {
+ if (signProperties.getEnable() && StringUtils.isEmpty(nonce_str)) {
return unauthorizedResponse(exchange, "签名不能为空！");
}
- if(parameter_signature){
+ if(signProperties.getEnable()){
return authSign(exchange, chain, sign, nonce_str);
}
return chain.filter(exchange.mutate().request(mutate.build()).build());
--
Gitblit v1.7.1