diff --git a/pom.xml b/pom.xml index 419783dfb0620e2310ac27c1f50e67ff11b02580..abf5c12ed46b6b12f78e519c52ff0aca33177ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,6 @@ 3.2.5.Final 4.1.30.Final 1.1.7 - 2.0.7.Final 2.8.2 2.2.0 @@ -70,7 +69,6 @@ 2.9.0 - 4.2.0 5.15.0 4.2.0 0.8.0 @@ -347,34 +345,6 @@ ${mina.version} - - - org.apache.rocketmq - rocketmq-namesrv - ${rocketmq.version} - - - org.apache.rocketmq - rocketmq-broker - ${rocketmq.version} - - - io.netty - netty-tcnative - - - - - io.netty - netty-tcnative - ${netty-tcnative.version} - - - org.apache.rocketmq - rocketmq-client - ${rocketmq.version} - - org.springframework diff --git a/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml b/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml index 21957c99a0793d551f5a3b2a170a568d149f79e1..b8ae16f55b7f561fabf731b928fd6feae40123c7 100644 --- a/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml +++ b/whatsmars-mq/whatsmars-mq-rocketmq/pom.xml @@ -11,18 +11,6 @@ whatsmars-mq-rocketmq - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.hongxi 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 951053291a34bf3a907e31acde544d927e3249e3..50160d8f1b252361e9c51200ad62bffaf6184089 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,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 0649142687a19542b87a36cfbdb95184229d8588..d3f7c7eb6cb3e3a2a85be5fb16faf1a568f58a91 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,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 2801cee65a8213b891d453289c160df8317c2a20..95da05ad4895e12ed66ea6b9172962299d4700ed 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"> - 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 350addcb9b1380714731ce6f0bc7b253f73510a8..9137e518bd231e2b3279195cb7d61e1801188c8f 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"> -