[ISSUE #511] Polish the application.properties to solve the misunders…

…tanding 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-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java

@@ -26,8 +26,8 @@
  */
 @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
     )

rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java

@@ -27,7 +27,7 @@
 @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
     )

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

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

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