diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 3a52e92..034eefb 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -25,12 +25,12 @@ 2.17.2 1.7.36 3.12.0 - 1.18.22 + 1.18.24 2.7.7 1.16.1 3.4.6 4.0.1 - 3.5.9 + 3.5.10 1.15 2.11.1 2.8.9 diff --git a/fizz-bootstrap/src/main/resources/log4j2-spring.xml b/fizz-bootstrap/src/main/resources/log4j2-spring.xml index e904fe5..eb8d908 100644 --- a/fizz-bootstrap/src/main/resources/log4j2-spring.xml +++ b/fizz-bootstrap/src/main/resources/log4j2-spring.xml @@ -8,9 +8,8 @@ - - - + + @@ -56,7 +55,10 @@ - + + + + diff --git a/fizz-core/src/main/java/we/filter/AggregateFilter.java b/fizz-core/src/main/java/we/filter/AggregateFilter.java index 8bd8b4f..a87536f 100644 --- a/fizz-core/src/main/java/we/filter/AggregateFilter.java +++ b/fizz-core/src/main/java/we/filter/AggregateFilter.java @@ -86,7 +86,7 @@ public class AggregateFilter implements WebFilter { } else { byte act = WebUtils.getApiConfigType(exchange); if (act == ApiConfig.Type.UNDEFINED) { - String p = exchange.getRequest().getPath().value(); + String p = exchange.getRequest().getURI().getPath(); if (StringUtils.startsWith(p, SystemConfig.DEFAULT_GATEWAY_TEST_PREFIX0)) { if (systemConfig.isAggregateTestAuth()) { return chain.filter(exchange); diff --git a/fizz-core/src/main/java/we/filter/FlowControlFilter.java b/fizz-core/src/main/java/we/filter/FlowControlFilter.java index 2295943..34a1d34 100644 --- a/fizz-core/src/main/java/we/filter/FlowControlFilter.java +++ b/fizz-core/src/main/java/we/filter/FlowControlFilter.java @@ -114,7 +114,7 @@ public class FlowControlFilter extends FizzWebFilter { public Mono doFilter(ServerWebExchange exchange, WebFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); - String path = request.getPath().value(); + String path = request.getURI().getPath(); boolean adminReq = false, proxyTestReq = false, fizzApiReq = false, favReq = false; if (path.equals(favPath)) { exchange.getAttributes().put(WebUtils.FAV_REQUEST, Consts.S.EMPTY); diff --git a/fizz-core/src/main/java/we/util/WebUtils.java b/fizz-core/src/main/java/we/util/WebUtils.java index 608c978..f0b46a2 100644 --- a/fizz-core/src/main/java/we/util/WebUtils.java +++ b/fizz-core/src/main/java/we/util/WebUtils.java @@ -331,7 +331,8 @@ public abstract class WebUtils { public static String getClientReqPath(ServerWebExchange exchange) { String p = exchange.getAttribute(clientRequestPath); if (p == null) { - p = exchange.getRequest().getPath().value(); + // p = exchange.getRequest().getPath().value(); + p = exchange.getRequest().getURI().getPath(); int secFS = p.indexOf(Consts.S.FORWARD_SLASH, 1); if (StringUtils.isBlank(gatewayPrefix) || Consts.S.FORWARD_SLASH_STR.equals(gatewayPrefix)) { p = p.substring(secFS); diff --git a/pom.xml b/pom.xml index 9fb2785..c8ccef1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.16.1 3.4.6 4.0.1 - 3.5.9 + 3.5.10 0.8.2 0.9.11 2.11.1 @@ -294,7 +294,7 @@ org.noear snack3 - 3.2.24 + 3.2.29 @@ -343,7 +343,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.24