From ec6b61aefc9c1369cd28934df191719b78035ad5 Mon Sep 17 00:00:00 2001
From: javahongxi <javahongxi@qq.com>
Date: Wed, 17 Oct 2018 20:47:40 +0800
Subject: [PATCH] RocketMQ instanceName

---
 .../whatsmars/mq/rocketmq/spring/ConsumerFactoryBean.java  | 7 +++++++
 .../whatsmars/mq/rocketmq/spring/ProducerFactoryBean.java  | 7 +++++++
 .../src/main/resources/spring/rocketmq-consumer.xml        | 1 +
 .../src/main/resources/spring/rocketmq-producer.xml        | 1 +
 4 files changed, 16 insertions(+)

diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ConsumerFactoryBean.java b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ConsumerFactoryBean.java
index e8450e43..95105329 100644
--- a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ConsumerFactoryBean.java
+++ b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ConsumerFactoryBean.java
@@ -11,6 +11,8 @@ public class ConsumerFactoryBean implements FactoryBean<DefaultMQPushConsumer>,I
 
     private DefaultMQPushConsumer consumer;
 
+    private String instanceName; // 不同集群不同值
+
     private String consumerGroup;
 
     private String namesrvAddr;
@@ -21,6 +23,10 @@ public class ConsumerFactoryBean implements FactoryBean<DefaultMQPushConsumer>,I
 
     private MessageListenerConcurrently messageListener;
 
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
     public void setConsumerGroup(String consumerGroup) {
         this.consumerGroup = consumerGroup;
     }
@@ -59,6 +65,7 @@ public class ConsumerFactoryBean implements FactoryBean<DefaultMQPushConsumer>,I
     @Override
     public void afterPropertiesSet() throws Exception {
         consumer = new DefaultMQPushConsumer(consumerGroup);
+        consumer.setInstanceName(instanceName);
         consumer.setNamesrvAddr(namesrvAddr);
         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
         consumer.subscribe(topic, tags);
diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ProducerFactoryBean.java b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ProducerFactoryBean.java
index 25040993..06491426 100644
--- a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ProducerFactoryBean.java
+++ b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/java/org/hongxi/whatsmars/mq/rocketmq/spring/ProducerFactoryBean.java
@@ -9,10 +9,16 @@ public class ProducerFactoryBean implements FactoryBean<DefaultMQProducer>,Initi
 
     private DefaultMQProducer producer;
 
+    private String instanceName; // 不同集群不同值
+
     private String producerGroup;
 
     private String namesrvAddr;
 
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
     public void setProducerGroup(String producerGroup) {
         this.producerGroup = producerGroup;
     }
@@ -39,6 +45,7 @@ public class ProducerFactoryBean implements FactoryBean<DefaultMQProducer>,Initi
     @Override
     public void afterPropertiesSet() throws Exception {
         producer = new DefaultMQProducer(producerGroup);
+        producer.setInstanceName(instanceName);
         producer.setNamesrvAddr(namesrvAddr);
         producer.start();
     }
diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-consumer.xml b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-consumer.xml
index 95da05ad..2801cee6 100644
--- a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-consumer.xml
+++ b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-consumer.xml
@@ -6,6 +6,7 @@
        default-autowire="byName">
 
     <bean class="org.hongxi.whatsmars.mq.rocketmq.spring.ConsumerFactoryBean">
+        <property name="instanceName" value="DEFAULT" />
         <property name="consumerGroup" value="quick_start_consumer_group" />
         <property name="namesrvAddr" value="127.0.0.1:9876" />
         <property name="topic" value="TopicTest" />
diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-producer.xml b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-producer.xml
index 9137e518..350addcb 100644
--- a/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-producer.xml
+++ b/whatsmars-mq/whatsmars-mq-rocketmq/src/main/resources/spring/rocketmq-producer.xml
@@ -6,6 +6,7 @@
        default-autowire="byName">
 
     <bean id="defaultMQProducer" class="org.hongxi.whatsmars.mq.rocketmq.spring.ProducerFactoryBean">
+        <property name="instanceName" value="DEFAULT" />
         <property name="producerGroup" value="quick_start_producer_group" />
         <property name="namesrvAddr" value="127.0.0.1:9876" />
     </bean>
-- 
GitLab