diff --git a/README.md b/README.md index 5667fb34..d76d16a5 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) -* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) +* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应[labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) * [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) @@ -200,7 +200,7 @@ ## API 网关 -* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) +* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud Netflix 服务网关 Zuul 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Zuul/?github) 对应 对应 [labx-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-21) * [《性能测试 —— Spring Cloud Gateway、Zuul 基准测试》](http://www.iocoder.cn/Performance-Testing/SpringCloudGateway-Zuul-benchmark/?github) 对应 [lab-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-07) diff --git a/labx-08/labx-08-sc-gateway-demo01-test/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo01-test/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml index 7f948e8a..dcf49c18 100644 --- a/labx-08/labx-08-sc-gateway-demo01-test/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo01/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo01/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml index c1d97988..ed268059 100644 --- a/labx-08/labx-08-sc-gateway-demo01/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo01/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo02-registry/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml index 7ae7c813..0fa38bde 100644 --- a/labx-08/labx-08-sc-gateway-demo02-registry/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml index c261dea5..e5ee9b63 100644 --- a/labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml index dbb8dd34..e8a25e6c 100644 --- a/labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml diff --git a/labx-08/labx-08-sc-gateway-demo04/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo04/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml index a197b6eb..1c003ea2 100644 --- a/labx-08/labx-08-sc-gateway-demo04/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo04/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo04/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml index 860c0774..d4549131 100644 --- a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml index 0534a346..23b82b89 100644 --- a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml index 2d6ee395..3f31c139 100644 --- a/labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml index e2d82ac3..9d5d2bf3 100644 --- a/labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml index 1b5b7b27..746889b9 100644 --- a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml index d3303ca6..7f7c7a51 100644 --- a/labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml index 5342efed..0b62af2e 100644 --- a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-user-service/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml similarity index 97% rename from labx-08/labx-08-sc-user-service/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml index 3ed72cce..593cf5e2 100644 --- a/labx-08/labx-08-sc-user-service/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java diff --git a/labx-08/labx-08-sc-user-service/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/resources/application.yaml diff --git a/labx-08/pom.xml b/labx-08-spring-cloud-gateway/pom.xml similarity index 96% rename from labx-08/pom.xml rename to labx-08-spring-cloud-gateway/pom.xml index fd190eed..04bdd794 100644 --- a/labx-08/pom.xml +++ b/labx-08-spring-cloud-gateway/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-08 + labx-08-spring-cloud-gateway pom labx-08-sc-gateway-demo01 diff --git a/labx-08/《芋道 Spring Cloud 网关 Spring Cloud Gateway 入门》.md b/labx-08-spring-cloud-gateway/《芋道 Spring Cloud 网关 Spring Cloud Gateway 入门》.md similarity index 100% rename from labx-08/《芋道 Spring Cloud 网关 Spring Cloud Gateway 入门》.md rename to labx-08-spring-cloud-gateway/《芋道 Spring Cloud 网关 Spring Cloud Gateway 入门》.md diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml b/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml deleted file mode 100644 index f9d50ef0..00000000 --- a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml +++ /dev/null @@ -1,29 +0,0 @@ -server: - port: 8888 - -spring: - application: - name: gateway-application - - cloud: - # Spring Cloud Gateway 配置项，对应 GatewayProperties 类 - gateway: - # 路由配置项，对应 RouteDefinition 数组 - routes: - - id: yudaoyuanma # 路由的编号 - uri: http://www.iocoder.cn # 路由到的目标地址 - predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - - Path=/blog - filters: - - StripPrefix=1 - - id: oschina # 路由的编号 - uri: https://www.oschina.net # 路由的目标地址 - predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - - Path=/oschina - filters: # 过滤器，对请求进行拦截，实现自定义的功能，对应 FilterDefinition 数组 - - StripPrefix=1 - # 默认过滤器，对应 FilterDefinition 数组 - default-filters: - - name: Auth - args: - token-header-name: access-token diff --git a/pom.xml b/pom.xml index 44426682..6f00dbd0 100644 --- a/pom.xml +++ b/pom.xml @@ -87,8 +87,8 @@ - labx-07-spring-cloud-alibaba-dubbo - + +