diff --git a/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/config/properties/IgnoreWhiteProperties.java b/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/config/properties/IgnoreWhiteProperties.java index 89ed4a5..bb66ee7 100644 --- a/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/config/properties/IgnoreWhiteProperties.java +++ b/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/config/properties/IgnoreWhiteProperties.java @@ -1,5 +1,7 @@ package com.chushang.gateway.config.properties; +import lombok.Getter; +import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; @@ -13,6 +15,8 @@ import java.util.List; * * @author ruoyi */ +@Setter +@Getter @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.ignore") @@ -23,13 +27,4 @@ public class IgnoreWhiteProperties */ private List whites = new ArrayList<>(); - public List getWhites() - { - return whites; - } - - public void setWhites(List whites) - { - this.whites = whites; - } } diff --git a/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/handler/SentinelFallbackHandler.java b/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/handler/SentinelFallbackHandler.java index f7fbcb7..c882c34 100644 --- a/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/handler/SentinelFallbackHandler.java +++ b/chushang-modules/chushang-module-gateway/src/main/java/com/chushang/gateway/handler/SentinelFallbackHandler.java @@ -15,10 +15,6 @@ import reactor.core.publisher.Mono; */ public class SentinelFallbackHandler implements WebExceptionHandler { - private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) - { - return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍候再试"); - } @Override public Mono handle(ServerWebExchange exchange, Throwable ex) @@ -34,6 +30,12 @@ public class SentinelFallbackHandler implements WebExceptionHandler return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange)); } + private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) + { + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍候再试", 429); + } + + private Mono handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) { return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable); diff --git a/chushang-modules/chushang-module-gateway/src/main/resources/application.yml b/chushang-modules/chushang-module-gateway/src/main/resources/application.yml index a8adc7b..08b5f47 100644 --- a/chushang-modules/chushang-module-gateway/src/main/resources/application.yml +++ b/chushang-modules/chushang-module-gateway/src/main/resources/application.yml @@ -64,7 +64,11 @@ spring: - Path=/api/job/** filters: - StripPrefix=1 - #default-filters: +# default-filters: +# - name: BlackListUrlFilter +# args: +# blacklistUrl: +# - /test # - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin # # 默认限流 # - name: RequestRateLimiter @@ -79,6 +83,8 @@ spring: # # 一个请求需要多少令牌 这是为每个请求从桶中获取的令牌数量,默认为1。 # redis-rate-limiter.requestedTokens: 1 # key-resolver: "#{@remoteAddrKeyResolver}" + + # 安全配置 security: # 验证码 @@ -96,7 +102,7 @@ security: - /auth/logout - /auth/login - /auth/register - - /manager/remote/** + - /feign/** - /demo/** logging: config: classpath:logback-nacos.xml