From cf5d92c90fa02803a42d9fd9f120b54753efc315 Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Thu, 9 Apr 2020 09:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20spring=20cloud=20bus=20roc?=
=?UTF-8?q?ketmq=20=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pom.xml | 12 ++++++++++--
.../listenerdemo/ListenerDemoApplication.java | 2 +-
.../listenerdemo}/event/UserRegisterEvent.java | 2 +-
.../listenerdemo/listener/UserRegisterListener.java | 4 ++--
.../src/main/resources/application.yml | 8 ++++----
.../pom.xml | 12 ++++++++++--
.../publisherdemo/PublisherDemoApplication.java | 2 +-
.../publisherdemo/controller/DemoController.java | 4 ++--
.../publisherdemo}/event/UserRegisterEvent.java | 2 +-
.../src/main/resources/application.yml | 9 ++++++---
labx-20/pom.xml | 3 +++
11 files changed, 41 insertions(+), 19 deletions(-)
rename labx-20/{labx-19-sc-bus-kafka-demo-listener-actuator => labx-20-sca-bus-rocketmq-demo-listener-actuator}/pom.xml (81%)
rename labx-20/{labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19 => labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20}/listenerdemo/ListenerDemoApplication.java (87%)
rename labx-20/{labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo => labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo}/event/UserRegisterEvent.java (89%)
rename labx-20/{labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19 => labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20}/listenerdemo/listener/UserRegisterListener.java (78%)
rename labx-20/{labx-19-sc-bus-kafka-demo-listener-actuator => labx-20-sca-bus-rocketmq-demo-listener-actuator}/src/main/resources/application.yml (68%)
rename labx-20/{labx-19-sc-bus-kafka-demo-publisher-actuator => labx-20-sca-bus-rocketmq-demo-publisher-actuator}/pom.xml (81%)
rename labx-20/{labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19 => labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20}/publisherdemo/PublisherDemoApplication.java (84%)
rename labx-20/{labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19 => labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20}/publisherdemo/controller/DemoController.java (87%)
rename labx-20/{labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo => labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo}/event/UserRegisterEvent.java (89%)
rename labx-20/{labx-19-sc-bus-kafka-demo-publisher-actuator => labx-20-sca-bus-rocketmq-demo-publisher-actuator}/src/main/resources/application.yml (64%)
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/pom.xml b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/pom.xml
similarity index 81%
rename from labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/pom.xml
rename to labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/pom.xml
index f60a855e..7f2b15e2 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/pom.xml
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/pom.xml
@@ -16,6 +16,7 @@
1.8
2.2.4.RELEASE
Hoxton.SR1
+ 2.2.0.RELEASE
+
- org.springframework.cloud
+ com.alibaba.cloud
spring-cloud-starter-bus-rocketmq
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/ListenerDemoApplication.java b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/ListenerDemoApplication.java
similarity index 87%
rename from labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/ListenerDemoApplication.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/ListenerDemoApplication.java
index f5022908..8b38c301 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/ListenerDemoApplication.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/ListenerDemoApplication.java
@@ -1,4 +1,4 @@
-package cn.iocoder.springcloud.labx19.listenerdemo;
+package cn.iocoder.springcloudalibaba.labx20.listenerdemo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/event/UserRegisterEvent.java b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/event/UserRegisterEvent.java
similarity index 89%
rename from labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/event/UserRegisterEvent.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/event/UserRegisterEvent.java
index 4057d1a1..34c4566b 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/event/UserRegisterEvent.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/event/UserRegisterEvent.java
@@ -1,4 +1,4 @@
-package cn.iocoder.springcloud.labx19.publisherdemo.event;
+package cn.iocoder.springcloudalibaba.labx20.listenerdemo.event;
import org.springframework.cloud.bus.event.RemoteApplicationEvent;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/listener/UserRegisterListener.java b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/listener/UserRegisterListener.java
similarity index 78%
rename from labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/listener/UserRegisterListener.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/listener/UserRegisterListener.java
index 318e0eac..1b6ae694 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/listener/UserRegisterListener.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/listenerdemo/listener/UserRegisterListener.java
@@ -1,6 +1,6 @@
-package cn.iocoder.springcloud.labx19.listenerdemo.listener;
+package cn.iocoder.springcloudalibaba.labx20.listenerdemo.listener;
-import cn.iocoder.springcloud.labx19.listenerdemo.event.UserRegisterEvent;
+import cn.iocoder.springcloudalibaba.labx20.listenerdemo.event.UserRegisterEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/resources/application.yml b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/resources/application.yml
similarity index 68%
rename from labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/resources/application.yml
rename to labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/resources/application.yml
index ace03a51..dfc57213 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/resources/application.yml
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-listener-actuator/src/main/resources/application.yml
@@ -2,13 +2,13 @@ spring:
application:
name: listener-demo
- # Kafka 配置项,对应 KafkaProperties 配置类
- rocketmq:
- bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔
-
server:
port: 18080 # 随机端口,方便启动多个消费者
+# rocketmq 配置项,对应 RocketMQProperties 配置类
+rocketmq:
+ name-server: 127.0.0.1:9876 # RocketMQ Namesrv
+
management:
endpoints:
# Actuator HTTP 配置项,对应 WebEndpointProperties 配置类
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/pom.xml b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/pom.xml
similarity index 81%
rename from labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/pom.xml
rename to labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/pom.xml
index 1ec5943c..1d0b7b30 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/pom.xml
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/pom.xml
@@ -16,6 +16,7 @@
1.8
2.2.4.RELEASE
Hoxton.SR1
+ 2.2.0.RELEASE
+
- org.springframework.cloud
+ com.alibaba.cloud
spring-cloud-starter-bus-rocketmq
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/PublisherDemoApplication.java b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/PublisherDemoApplication.java
similarity index 84%
rename from labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/PublisherDemoApplication.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/PublisherDemoApplication.java
index eb78d9f1..425782e9 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/PublisherDemoApplication.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/PublisherDemoApplication.java
@@ -1,4 +1,4 @@
-package cn.iocoder.springcloud.labx19.publisherdemo;
+package cn.iocoder.springcloudalibaba.labx20.publisherdemo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/controller/DemoController.java b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/controller/DemoController.java
similarity index 87%
rename from labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/controller/DemoController.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/controller/DemoController.java
index ddcb938f..47f9e03a 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/java/cn/iocoder/springcloud/labx19/publisherdemo/controller/DemoController.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/controller/DemoController.java
@@ -1,6 +1,6 @@
-package cn.iocoder.springcloud.labx19.publisherdemo.controller;
+package cn.iocoder.springcloudalibaba.labx20.publisherdemo.controller;
-import cn.iocoder.springcloud.labx19.publisherdemo.event.UserRegisterEvent;
+import cn.iocoder.springcloudalibaba.labx20.publisherdemo.event.UserRegisterEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/event/UserRegisterEvent.java b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/event/UserRegisterEvent.java
similarity index 89%
rename from labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/event/UserRegisterEvent.java
rename to labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/event/UserRegisterEvent.java
index 0967036f..df4800c7 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx19/listenerdemo/event/UserRegisterEvent.java
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx20/publisherdemo/event/UserRegisterEvent.java
@@ -1,4 +1,4 @@
-package cn.iocoder.springcloud.labx19.listenerdemo.event;
+package cn.iocoder.springcloudalibaba.labx20.publisherdemo.event;
import org.springframework.cloud.bus.event.RemoteApplicationEvent;
diff --git a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/resources/application.yml b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/resources/application.yml
similarity index 64%
rename from labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/resources/application.yml
rename to labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/resources/application.yml
index 4c63cb4a..5c54e90e 100644
--- a/labx-20/labx-19-sc-bus-kafka-demo-publisher-actuator/src/main/resources/application.yml
+++ b/labx-20/labx-20-sca-bus-rocketmq-demo-publisher-actuator/src/main/resources/application.yml
@@ -1,10 +1,13 @@
+server:
+ port: 8081
+
spring:
application:
name: publisher-demo
- # Kafka 配置项,对应 KafkaProperties 配置类
- rocketmq:
- bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址,可以设置多个,以逗号分隔
+# rocketmq 配置项,对应 RocketMQProperties 配置类
+rocketmq:
+ name-server: 127.0.0.1:9876 # RocketMQ Namesrv
management:
endpoints:
diff --git a/labx-20/pom.xml b/labx-20/pom.xml
index 73b3ac3b..f4d79dad 100644
--- a/labx-20/pom.xml
+++ b/labx-20/pom.xml
@@ -14,6 +14,9 @@
labx-20-sca-bus-rocketmq-demo-publisher
labx-20-sca-bus-rocketmq-demo-listener
+
+ labx-20-sca-bus-rocketmq-demo-publisher-actuator
+ labx-20-sca-bus-rocketmq-demo-listener-actuator