Merge branch 'dev-1.1.0'

metaphysical-road · Jun 26, 2023 · f93306f · f93306f
2 parents 2d0b17f + 1a85022
commit f93306f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 1 deletion.
diff --git a/chaptereight/use-spring-boot-access-rocketmq/use-spring-boot-consume/pom.xml b/chaptereight/use-spring-boot-access-rocketmq/use-spring-boot-consume/pom.xml
@@ -32,6 +32,12 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>2.3.2.RELEASE</version>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-dubbo</artifactId>
@@ -40,11 +46,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.3.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
+            <version>2.3.2.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -76,6 +84,12 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-validation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/...-boot-consume/src/main/java/com/alibaba/cloud/youxia/UseSpringBootConsumeApplication.java b/...-boot-consume/src/main/java/com/alibaba/cloud/youxia/UseSpringBootConsumeApplication.java
@@ -4,9 +4,15 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
+/**
+ * 第一种消费消息模式：监听器自动消费消息
+ * 第二种消费消息的模式：RocketMQTemplate模式
+ * 线上只允许使用一种
+ */
 @SpringBootApplication
 @EnableDiscoveryClient
-public class UseSpringBootConsumeApplication {
+public class 
+UseSpringBootConsumeApplication {
     public static void main(String[] args) {
         SpringApplication.run(UseSpringBootConsumeApplication.class, args);
     }

diff --git a/...oot-consume/src/main/java/com/alibaba/cloud/youxia/config/UseSpringBootConsumeConfig.java b/...oot-consume/src/main/java/com/alibaba/cloud/youxia/config/UseSpringBootConsumeConfig.java
@@ -21,6 +21,9 @@ public void startConsume(){
         executorService.submit(new ConsumeMessage());
     }
 
+    /**
+     * 第二种消费消息的模式：RocketMQTemplate模式
+     */
     class ConsumeMessage implements Runnable {
         @Override
         public void run() {

diff --git a/...e-spring-boot-consume/src/main/java/com/alibaba/cloud/youxia/consumer/StringConsumer.java b/...e-spring-boot-consume/src/main/java/com/alibaba/cloud/youxia/consumer/StringConsumer.java
@@ -27,6 +27,11 @@
 @Service
 @RocketMQMessageListener(topic = "${rocketmq.consumer.topic}", consumerGroup = "use-spring-boot-access-rocketmq")
 public class StringConsumer implements RocketMQListener<String> {
+
+    /**
+     * 第一种消费消息模式：监听器自动消费消息
+     * @param message
+     */
     @Override
     public void onMessage(String message) {
         System.out.printf("------- StringConsumer received: %s \n", message);

diff --git a/chaptereight/use-spring-boot-access-rocketmq/use-spring-boot-produce/pom.xml b/chaptereight/use-spring-boot-access-rocketmq/use-spring-boot-produce/pom.xml
@@ -40,11 +40,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.3.2.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>2.3.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
+            <version>2.3.2.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -77,6 +85,12 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-validation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>