From 98285e40ccdf697dfab97326a049866867bf9cfd Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 22:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 6 ------ .../pom.xml | 18 +++++------------- .../ConfigServerApplication.java | 2 +- .../src/main/resources/application.yml | 7 ++++--- .../pom.xml | 18 +++++------------- .../userapplication/UserApplication.java | 2 +- .../config/OrderProperties.java | 2 +- .../controller/DemoController.java | 4 ++-- .../src/main/resources/application.yml | 9 +++++++++ .../src/main/resources/bootstrap.yml | 0 labx-29/pom.xml | 3 +++ 11 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus => labx-29-sc-config-server-git-auto-refresh-by-bus}/pom.xml (77%) rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/configserverdemo/ConfigServerApplication.java (87%) rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus => labx-29-sc-config-server-git-auto-refresh-by-bus}/src/main/resources/application.yml (85%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus => labx-29-sc-config-user-application-auto-refresh-by-bus}/pom.xml (76%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/UserApplication.java (84%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/config/OrderProperties.java (93%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/controller/DemoController.java (91%) create mode 100644 labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus => labx-29-sc-config-user-application-auto-refresh-by-bus}/src/main/resources/bootstrap.yml (100%) diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml deleted file mode 100644 index 4bb5b8a8..00000000 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv - -server: - port: 8081 diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml similarity index 77% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml index 12be5248..eb326658 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml @@ -3,20 +3,19 @@ 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-12 + labx-29 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 - labx-20-sc-config-server-git-auto-refresh-by-bus + labx-29-sc-config-server-git-auto-refresh-by-bus 1.8 1.8 2.2.4.RELEASE Hoxton.SR1 - 2.2.0.RELEASE + - com.alibaba.cloud - spring-cloud-starter-bus-rocketmq + org.springframework.cloud + spring-cloud-starter-consul-bus diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java similarity index 87% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java index 8a941740..0c06eaee 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.configserverdemo; +package cn.iocoder.springcloud.labx29.configserverdemo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml similarity index 85% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml index 0b07c33c..08dd620e 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml @@ -19,6 +19,7 @@ spring: # username: ${CODING_USERNAME} # 账号 # password: ${CODING_PASSWORD} # 密码 -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv + # Consul + consul: + host: 127.0.0.1 + port: 8500 diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml similarity index 76% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml index 4a7d09d5..c7b67ab2 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml @@ -3,20 +3,19 @@ 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-12 + labx-29 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 - labx-20-sc-config-user-application-auto-refresh-by-bus + labx-29-sc-config-user-application-auto-refresh-by-bus 1.8 1.8 2.2.4.RELEASE Hoxton.SR1 - 2.2.0.RELEASE + - com.alibaba.cloud - spring-cloud-starter-bus-rocketmq + org.springframework.cloud + spring-cloud-starter-consul-bus diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java similarity index 84% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java index 246d5114..30fbebb9 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.userapplication; +package cn.iocoder.springcloud.labx29.userapplication; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java similarity index 93% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java index 48d3dd53..326ecb68 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.userapplication.config; +package cn.iocoder.springcloud.labx29.userapplication.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java similarity index 91% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java index 4dca3287..fc35e861 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java @@ -1,6 +1,6 @@ -package cn.iocoder.springcloud.labx20.userapplication.controller; +package cn.iocoder.springcloud.labx29.userapplication.controller; -import cn.iocoder.springcloud.labx20.userapplication.config.OrderProperties; +import cn.iocoder.springcloud.labx29.userapplication.config.OrderProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml new file mode 100644 index 00000000..8ed25b84 --- /dev/null +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml @@ -0,0 +1,9 @@ +spring: + cloud: + # Consul + consul: + host: 127.0.0.1 + port: 8500 + +server: + port: 8081 diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml similarity index 100% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml diff --git a/labx-29/pom.xml b/labx-29/pom.xml index 9a715297..0522e4e0 100644 --- a/labx-29/pom.xml +++ b/labx-29/pom.xml @@ -15,6 +15,9 @@ labx-29-sc-bus-consul-demo-publisher labx-29-sc-bus-consul-demo-listener labx-29-sc-bus-consul-demo-listener-actuator + + labx-29-sc-config-server-git-auto-refresh-by-bus + labx-29-sc-config-user-application-auto-refresh-by-bus