From 2f4c46dc167f1ecc195e5d2bfd2c4359b086b8f7 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 10 Oct 2019 09:14:48 +0800 Subject: [PATCH] 2.3.1 --- .../sop/gatewaycommon/gateway/route/GatewayRouteCache.java | 7 ++++++- .../sop/gatewaycommon/manager/AbstractConfiguration.java | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteCache.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteCache.java index 3903f7d9..dfb8e464 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteCache.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteCache.java @@ -27,7 +27,12 @@ public class GatewayRouteCache extends BaseRouteCache { protected GatewayTargetRoute buildTargetRoute(ServiceRouteInfo serviceRouteInfo, RouteDefinition routeDefinition) { org.springframework.cloud.gateway.route.RouteDefinition targetRoute = new org.springframework.cloud.gateway.route.RouteDefinition(); targetRoute.setId(routeDefinition.getId()); - targetRoute.setUri(URI.create(routeDefinition.getUri() + "#" + routeDefinition.getPath())); + String path = routeDefinition.getPath(); + if (path != null && path.contains("{") && path.contains("}")) { + path = path.replace('{', '?'); + path = path.replace('}', '?'); + } + targetRoute.setUri(URI.create(routeDefinition.getUri() + "#" + path)); targetRoute.setOrder(routeDefinition.getOrder()); // 添加过滤器 List filterDefinitionList = routeDefinition.getFilters() diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/AbstractConfiguration.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/AbstractConfiguration.java index 5e33a863..e9edb014 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/AbstractConfiguration.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/AbstractConfiguration.java @@ -64,6 +64,7 @@ public class AbstractConfiguration implements ApplicationContextAware { } @Bean + @ConditionalOnProperty("zuul.servlet-path") PropertiesFactory propertiesFactory() { return new SopPropertiesFactory(); }