From 7582f2d0476764bc1ec6ec51a4abe6aa70cd2fcd Mon Sep 17 00:00:00 2001
From: javahongxi <javahongxi@qq.com>
Date: Sun, 21 Oct 2018 13:58:59 +0800
Subject: [PATCH] rocketmq-spring optimise

---
 pom.xml                                       | 30 -------------------
 whatsmars-mq/whatsmars-mq-rocketmq/pom.xml    | 12 --------
 .../rocketmq/spring/ConsumerFactoryBean.java  |  2 +-
 .../rocketmq/spring/ProducerFactoryBean.java  |  2 +-
 .../resources/spring/rocketmq-consumer.xml    |  1 -
 .../resources/spring/rocketmq-producer.xml    |  1 -
 6 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 419783df..abf5c12e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
         <netty.version>3.2.5.Final</netty.version>
         <netty4.version>4.1.30.Final</netty4.version>
         <mina.version>1.1.7</mina.version>
-        <netty-tcnative.version>2.0.7.Final</netty-tcnative.version>
 
         <scala.version>2.8.2</scala.version>
         <metrics.version>2.2.0</metrics.version>
@@ -70,7 +69,6 @@
 
         <jedis.version>2.9.0</jedis.version>
 
-        <rocketmq.version>4.2.0</rocketmq.version>
         <activemq.version>5.15.0</activemq.version>
         <rabbitmq.version>4.2.0</rabbitmq.version>
         <kafka.version>0.8.0</kafka.version>
@@ -347,34 +345,6 @@
                 <version>${mina.version}</version>
             </dependency>
 
-            <!-- rocketmq -->
-            <dependency>
-                <groupId>org.apache.rocketmq</groupId>
-                <artifactId>rocketmq-namesrv</artifactId>
-                <version>${rocketmq.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.rocketmq</groupId>
-                <artifactId>rocketmq-broker</artifactId>
-                <version>${rocketmq.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.netty</groupId>
-                        <artifactId>netty-tcnative</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-tcnative</artifactId>
-                <version>${netty-tcnative.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.rocketmq</groupId>
-                <artifactId>rocketmq-client</artifactId>
-                <version>${rocketmq.version}</version>
-            </dependency>
-
             <!-- activemq -->
             <dependency>
                 <groupId>org.springframework</groupId>
diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml b/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml
index 21957c99..b8ae16f5 100644
--- a/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml
+++ b/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml
@@ -11,18 +11,6 @@
 
     <artifactId>whatsmars-mq-rocketmq</artifactId>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.hongxi</groupId>
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 95105329..50160d8f 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,7 +11,7 @@ public class ConsumerFactoryBean implements FactoryBean<DefaultMQPushConsumer>,I
 
     private DefaultMQPushConsumer consumer;
 
-    private String instanceName; // 不同集群不同值
+    private String instanceName = System.getProperty("rocketmq.client.name", "DEFAULT");
 
     private String consumerGroup;
 
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 06491426..d3f7c7eb 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,7 +9,7 @@ public class ProducerFactoryBean implements FactoryBean<DefaultMQProducer>,Initi
 
     private DefaultMQProducer producer;
 
-    private String instanceName; // 不同集群不同值
+    private String instanceName = System.getProperty("rocketmq.client.name", "DEFAULT");
 
     private String producerGroup;
 
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 2801cee6..95da05ad 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,7 +6,6 @@
        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 350addcb..9137e518 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,7 +6,6 @@
        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