diff --git a/pom.xml b/pom.xml
index 4c7dc45e..b1d6042c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
spring-cloud-alibaba-dependencies
spring-cloud-alibaba-sentinel
spring-cloud-alibaba-sentinel-datasource
- spring-cloud-alibaba-sentinel-zuul
+ spring-cloud-alibaba-sentinel-gateway
spring-cloud-alibaba-nacos-config
spring-cloud-alibaba-nacos-discovery
spring-cloud-alibaba-seata
diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 51a27335..69b9e5ff 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -268,7 +268,7 @@
org.springframework.cloud
- spring-cloud-alibaba-sentinel-zuul
+ spring-cloud-alibaba-sentinel-gateway
${project.version}
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml
index f45c9421..e2979eb1 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml
@@ -40,7 +40,7 @@
org.springframework.cloud
- spring-cloud-alibaba-sentinel-zuul
+ spring-cloud-alibaba-sentinel-gateway
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml
index 0c97ddee..0f0b0c09 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml
@@ -40,7 +40,7 @@
org.springframework.cloud
- spring-cloud-alibaba-sentinel-zuul
+ spring-cloud-alibaba-sentinel-gateway
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java
index dc2f404a..796241a2 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java
@@ -18,45 +18,43 @@ package org.springframework.cloud.alibaba.cloud.examples;
import javax.servlet.http.HttpServletRequest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser;
import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.BlockResponse;
import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
/**
* @author Jim
*/
@Configuration
public class ZuulConfiguration {
- @Bean
- public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() {
- return new ZuulBlockFallbackProvider() {
- @Override
- public String getRoute() {
- return "*";
- }
+ @Bean
+ public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() {
+ return new ZuulBlockFallbackProvider() {
+ @Override
+ public String getRoute() {
+ return "*";
+ }
- @Override
- public BlockResponse fallbackResponse(String route, Throwable cause) {
- if (route.equals("my-service3")) {
- return new BlockResponse(433, "Sentinel Block3", route);
- }
- else if (route.equals("my-service4")) {
- return new BlockResponse(444, "my-service4", route);
- }
- else {
- return new BlockResponse(499, "Sentinel Block 499", route);
- }
- }
- };
- }
+ @Override
+ public BlockResponse fallbackResponse(String route, Throwable cause) {
+ if (route.equals("my-service3")) {
+ return new BlockResponse(433, "Sentinel Block3", route);
+ } else if (route.equals("my-service4")) {
+ return new BlockResponse(444, "my-service4", route);
+ } else {
+ return new BlockResponse(499, "Sentinel Block 499", route);
+ }
+ }
+ };
+ }
- @Bean
- public RequestOriginParser requestOriginParser() {
- return new RequestOriginParser() {
+ @Bean
+ public RequestOriginParser requestOriginParser() {
+ return new RequestOriginParser() {
@Override
public String parseOrigin(HttpServletRequest request) {
diff --git a/spring-cloud-alibaba-sentinel-zuul/README.md b/spring-cloud-alibaba-sentinel-gateway/README.md
similarity index 98%
rename from spring-cloud-alibaba-sentinel-zuul/README.md
rename to spring-cloud-alibaba-sentinel-gateway/README.md
index 2d0d2fd1..8c8c4a02 100755
--- a/spring-cloud-alibaba-sentinel-zuul/README.md
+++ b/spring-cloud-alibaba-sentinel-gateway/README.md
@@ -14,7 +14,7 @@ Sentinel can provide `ServiceId` level and `API Path` level flow control for spr
```xml
org.springframework.cloud
- spring-cloud-alibaba-sentinel-zuul
+ spring-cloud-alibaba-sentinel-gateway
x.y.z
diff --git a/spring-cloud-alibaba-sentinel-zuul/pom.xml b/spring-cloud-alibaba-sentinel-gateway/pom.xml
similarity index 93%
rename from spring-cloud-alibaba-sentinel-zuul/pom.xml
rename to spring-cloud-alibaba-sentinel-gateway/pom.xml
index ee21854e..7675db8f 100644
--- a/spring-cloud-alibaba-sentinel-zuul/pom.xml
+++ b/spring-cloud-alibaba-sentinel-gateway/pom.xml
@@ -10,8 +10,8 @@
4.0.0
org.springframework.cloud
- spring-cloud-alibaba-sentinel-zuul
- Spring Cloud Alibaba Sentinel Zuul
+ spring-cloud-alibaba-sentinel-gateway
+ Spring Cloud Alibaba Sentinel Gateway
diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelSpringCloudGatewayAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelSpringCloudGatewayAutoConfiguration.java
similarity index 98%
rename from spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelSpringCloudGatewayAutoConfiguration.java
rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelSpringCloudGatewayAutoConfiguration.java
index 86969722..2293d1f3 100644
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelSpringCloudGatewayAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelSpringCloudGatewayAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.zuul;
+package org.springframework.cloud.alibaba.sentinel.gateway;
import java.util.Collections;
import java.util.List;
diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelZuulAutoConfiguration.java
similarity index 96%
rename from spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java
rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelZuulAutoConfiguration.java
index c19b1666..54ded615 100644
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelZuulAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.zuul;
+package org.springframework.cloud.alibaba.sentinel.gateway;
import java.util.Optional;
@@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.sentinel.zuul.handler.FallBackProviderHandler;
+import org.springframework.cloud.alibaba.sentinel.gateway.handler.FallBackProviderHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/handler/FallBackProviderHandler.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/handler/FallBackProviderHandler.java
new file mode 100644
index 00000000..e046ad64
--- /dev/null
+++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/handler/FallBackProviderHandler.java
@@ -0,0 +1,44 @@
+package org.springframework.cloud.alibaba.sentinel.gateway.handler;
+
+import java.util.Map;
+
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.DefaultBlockFallbackProvider;
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackManager;
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * @author tiger
+ */
+public class FallBackProviderHandler implements SmartInitializingSingleton {
+
+ private static final Logger logger = LoggerFactory
+ .getLogger(FallBackProviderHandler.class);
+
+ private final DefaultListableBeanFactory beanFactory;
+
+ public FallBackProviderHandler(DefaultListableBeanFactory beanFactory) {
+ this.beanFactory = beanFactory;
+ }
+
+ @Override
+ public void afterSingletonsInstantiated() {
+ Map providerMap = beanFactory
+ .getBeansOfType(ZuulBlockFallbackProvider.class);
+ if (!CollectionUtils.isEmpty(providerMap)) {
+ providerMap.forEach((k, v) -> {
+ logger.info("[Sentinel Zuul] Register provider name:{}, instance: {}", k,
+ v);
+ ZuulBlockFallbackManager.registerProvider(v);
+ });
+ } else {
+ logger.info("[Sentinel Zuul] Register default fallback provider. ");
+ ZuulBlockFallbackManager.registerProvider(new DefaultBlockFallbackProvider());
+ }
+ }
+}
diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..49a280be
--- /dev/null
+++ b/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.alibaba.sentinel.gateway.SentinelZuulAutoConfiguration,\
+org.springframework.cloud.alibaba.sentinel.gateway.SentinelSpringCloudGatewayAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java b/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java
deleted file mode 100644
index 6b3c21f6..00000000
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.zuul.handler;
-
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.util.CollectionUtils;
-
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.DefaultBlockFallbackProvider;
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackManager;
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
-
-/**
- * @author tiger
- */
-public class FallBackProviderHandler implements SmartInitializingSingleton {
-
- private static final Logger logger = LoggerFactory
- .getLogger(FallBackProviderHandler.class);
-
- private final DefaultListableBeanFactory beanFactory;
-
- public FallBackProviderHandler(DefaultListableBeanFactory beanFactory) {
- this.beanFactory = beanFactory;
- }
-
- @Override
- public void afterSingletonsInstantiated() {
- Map providerMap = beanFactory
- .getBeansOfType(ZuulBlockFallbackProvider.class);
- if (!CollectionUtils.isEmpty(providerMap)) {
- providerMap.forEach((k, v) -> {
- logger.info("[Sentinel Zuul] Register provider name:{}, instance: {}", k,
- v);
- ZuulBlockFallbackManager.registerProvider(v);
- });
- }
- else {
- logger.info("[Sentinel Zuul] Register default fallback provider. ");
- ZuulBlockFallbackManager.registerProvider(new DefaultBlockFallbackProvider());
- }
- }
-}
diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel-zuul/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 5917e8ff..00000000
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.sentinel.zuul.SentinelZuulAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.zuul.SentinelSpringCloudGatewayAutoConfiguration
\ No newline at end of file