diff --git a/rocketmq-spring-boot-samples/pom.xml b/rocketmq-spring-boot-samples/pom.xml index d22899c0..63e6ebe5 100644 --- a/rocketmq-spring-boot-samples/pom.xml +++ b/rocketmq-spring-boot-samples/pom.xml @@ -24,7 +24,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples pom - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT RocketMQ Spring Boot Samples Samples for RocketMQ Spring Boot diff --git a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/pom.xml index 3d9325fa..940e3ffa 100644 --- a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/pom.xml @@ -23,7 +23,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-consume-acl-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-consume-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-consume-demo/pom.xml index b407aee8..6e237e62 100644 --- a/rocketmq-spring-boot-samples/rocketmq-consume-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-consume-demo/pom.xml @@ -23,7 +23,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-consume-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-consumer-pull-simple-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-consumer-pull-simple-demo/pom.xml index fe75ed05..4143b5ce 100644 --- a/rocketmq-spring-boot-samples/rocketmq-consumer-pull-simple-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-consumer-pull-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-consumer-pull-simple-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-consumer-push-simple-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-consumer-push-simple-demo/pom.xml index dd797af1..bedd8f82 100644 --- a/rocketmq-spring-boot-samples/rocketmq-consumer-push-simple-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-consumer-push-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-consumer-push-simple-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/pom.xml index 6eb4c71c..4b6c34eb 100644 --- a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/pom.xml @@ -23,7 +23,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-produce-acl-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-produce-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-produce-demo/pom.xml index 5b59d9db..dee0ee2a 100644 --- a/rocketmq-spring-boot-samples/rocketmq-produce-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-produce-demo/pom.xml @@ -23,7 +23,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-produce-demo diff --git a/rocketmq-spring-boot-samples/rocketmq-producer-simple-demo/pom.xml b/rocketmq-spring-boot-samples/rocketmq-producer-simple-demo/pom.xml index 7ba0f6b1..e90e8157 100644 --- a/rocketmq-spring-boot-samples/rocketmq-producer-simple-demo/pom.xml +++ b/rocketmq-spring-boot-samples/rocketmq-producer-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-spring-boot-samples - 2.3.2-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-producer-simple-demo diff --git a/rocketmq-v5-client-spring-boot-samples/pom.xml b/rocketmq-v5-client-spring-boot-samples/pom.xml index d8559c9a..a9cbae82 100644 --- a/rocketmq-v5-client-spring-boot-samples/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples pom - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-spring-boot-samples rocketmq-v5-client-spring-boot-samples diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-acl-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-acl-demo/pom.xml index cc600607..3321ca40 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-acl-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-acl-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-consume-acl-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-demo/pom.xml index 2b5d46a8..fef6d3b1 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-consume-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo/pom.xml index af13654f..91399f35 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-push-simple-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-push-simple-demo/pom.xml index b67eeead..33da2594 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-push-simple-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-push-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-consumer-push-simple-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-simple-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-simple-demo/pom.xml index 8008c7ec..d6c84831 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-simple-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consumer-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-consumer-simple-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-acl-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-acl-demo/pom.xml index cd97b8bf..1080c10c 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-acl-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-acl-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-producer-acl-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-demo/pom.xml index a4e155a5..fd160d55 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-producer-demo diff --git a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-simple-demo/pom.xml b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-simple-demo/pom.xml index e72039fb..711e699e 100644 --- a/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-simple-demo/pom.xml +++ b/rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-producer-simple-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq rocketmq-v5-client-spring-boot-samples - 2.3.6-SNAPSHOT + 2.3.7-SNAPSHOT rocketmq-v5-client-producer-simple-demo diff --git a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java index 905a08d5..f5e8b193 100644 --- a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java +++ b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java @@ -89,6 +89,7 @@ private void registerTemplate(String beanName, Object bean) { ProducerBuilder producerBuilder = createProducer(annotation); RocketMQClientTemplate rocketMQTemplate = (RocketMQClientTemplate) bean; rocketMQTemplate.setProducerBuilder(producerBuilder); + rocketMQTemplate.initProducer(); rocketMQTemplate.setMessageConverter(rocketMQMessageConverter.getMessageConverter()); String topic = environment.resolvePlaceholders(annotation.topic()); log.info("Set real producer to {} using topic {}", beanName, topic); diff --git a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/core/RocketMQClientTemplate.java b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/core/RocketMQClientTemplate.java index 4213cb4b..3d77b20c 100644 --- a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/core/RocketMQClientTemplate.java +++ b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/core/RocketMQClientTemplate.java @@ -30,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.core.AbstractMessageSendingTemplate; @@ -43,7 +44,7 @@ @SuppressWarnings({"WeakerAccess", "unused"}) -public class RocketMQClientTemplate extends AbstractMessageSendingTemplate implements DisposableBean { +public class RocketMQClientTemplate extends AbstractMessageSendingTemplate implements DisposableBean, InitializingBean { private static final Logger log = LoggerFactory.getLogger(RocketMQClientTemplate.class); @@ -61,15 +62,8 @@ public class RocketMQClientTemplate extends AbstractMessageSendingTemplate