This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git
The following commit(s) were added to refs/heads/master by this push:
new 694d4a1 [ISSUE #511] Polish the application.properties to solve the
misunderstanding between push consumer and pull consumer (#510)
694d4a1 is described below
commit 694d4a1c4f7f9334927636021433dadf605542cd
Author: rongtong <[email protected]>
AuthorDate: Fri Jan 13 11:23:13 2023 +0800
[ISSUE #511] Polish the application.properties to solve the
misunderstanding between push consumer and pull consumer (#510)
* Polish the application.properties to solve the misunderstanding between
push consumer and pull consumer
* Polish the application.properties to solve the misunderstanding between
push consumer and pull consumer
* Polish the application.properties to solve the misunderstanding between
push consumer and pull consumer
---
.../rocketmq/samples/springboot/ACLStringConsumer.java | 4 ++--
.../samples/springboot/ACLStringTransactionalConsumer.java | 2 +-
.../src/main/resources/application.properties | 12 +++++++-----
.../src/main/resources/application.properties | 8 +++++---
.../src/main/resources/application.properties | 6 +++---
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
index d2d654f..80a3c6b 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
@@ -26,8 +26,8 @@ import org.springframework.stereotype.Service;
*/
@Service
@RocketMQMessageListener(
- topic = "normal_topic_define_in_Aliware_MQ",
- consumerGroup = "group_define_in_Aliware_MQ"
+ topic = "normal_topic_define_in_cloud_MQ",
+ consumerGroup = "group_define_in_cloud_MQ"
//accessKey = "AK" // It will read by `rocketmq.consumer.access-key` key
//secretKey = "SK" // It will read by `rocketmq.consumer.secret-key` key
)
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
index 342f44b..fc1cee1 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
@Service
@RocketMQMessageListener(
topic = "${demo.rocketmq.transTopic}",
- consumerGroup = "group_define_in_Aliware_MQ",
+ consumerGroup = "group_define_in_cloud_MQ",
accessKey = "AK", // if accessKey is empty, it will read by
`rocketmq.consumer.access-key` key
secretKey = "SK" // if accessKey is empty, it will read by
`rocketmq.consumer.secret-key` key
)
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/resources/application.properties
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/resources/application.properties
index 3fe6abb..dbf002e 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/resources/application.properties
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/resources/application.properties
@@ -16,13 +16,15 @@
spring.application.name=rocketmq-consume-acl-demo
-rocketmq.name-server=Endpoint_of_Aliware_MQ
-rocketmq.consumer.group=my-group1
-rocketmq.consumer.topic=test
-rocketmq.topic=normal_topic_define_in_Aliware_MQ
+rocketmq.name-server=Endpoint_of_cloud_MQ
+# When set rocketmq.pull-consumer.group and rocketmq.pull-consumer.topic,
rocketmqTemplate will start lite pull consumer
+# If you do not want to use lite pull consumer, please do not set
rocketmq.pull-consumer.group and rocketmq.pull-consumer.topic
+rocketmq.pull-consumer.group=my-group1
+rocketmq.pull-consumer.topic=test
+rocketmq.topic=normal_topic_define_in_cloud_MQ
# properties used in application code
-demo.rocketmq.transTopic=transaction_topic_define_in_Aliware_MQ
+demo.rocketmq.transTopic=transaction_topic_define_in_cloud_MQ
rocketmq.consumer.access-key=AK
rocketmq.consumer.secret-key=SK
\ No newline at end of file
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
index 3e54413..bf8fc4a 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
@@ -16,8 +16,10 @@
spring.application.name=rocketmq-consume-demo
rocketmq.name-server=localhost:9876
-rocketmq.consumer.group=my-group1
-rocketmq.consumer.topic=test
+# When set rocketmq.pull-consumer.group and rocketmq.pull-consumer.topic,
rocketmqTemplate will start lite pull consumer
+# If you do not want to use lite pull consumer, please do not set
rocketmq.pull-consumer.group and rocketmq.pull-consumer.topic
+rocketmq.pull-consumer.group=my-group1
+rocketmq.pull-consumer.topic=test
# properties used in application code
demo.rocketmq.topic=string-topic
demo.rocketmq.bytesRequestTopic=bytesRequestTopic
@@ -38,6 +40,6 @@ demo.rocketmq.myNameServer=127.0.0.1:9876
# my Consumer TLS Listener
demo.rocketmq.tlsEnable=false
# default LitePullConsumer TLS
-rocketmq.consumer.tlsEnable=false
+rocketmq.pull-consumer.tlsEnable=false
# ext rocketmq consumer template TLS
demo.ext.consumer.tlsEnable=false
diff --git
a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/resources/application.properties
b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/resources/application.properties
index 0872280..ddb4ed0 100644
---
a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/resources/application.properties
+++
b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/resources/application.properties
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-rocketmq.name-server=Endpoint_of_Aliware_MQ
+rocketmq.name-server=Endpoint_of_cloud_MQ
rocketmq.producer.group=my-group1
rocketmq.producer.access-key=AK
rocketmq.producer.secret-key=SK
-demo.rocketmq.topic=normal_topic_define_in_Aliware_MQ
-demo.rocketmq.transTopic=transaction_topic_define_in_Aliware_MQ
+demo.rocketmq.topic=normal_topic_define_in_cloud_MQ
+demo.rocketmq.transTopic=transaction_topic_define_in_cloud_MQ
