mq重复问题，配置修改

conf/manager/application.yml

@@ -24,14 +24,14 @@ spring:
     password:
 
   # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-  profiles:
-    include:
-      - activeMQ
+#  profiles:
+#    include:
+#      - activeMQ
   #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
   #activeMQ配置
-  activemq:
-    broker-url: tcp://localhost:61616  #连接地址
+#  activemq:
+#    broker-url: tcp://localhost:61616  #连接地址
 
   #rabbitmq配置
   #  rabbitmq:

conf/merchant/application.yml

@@ -24,14 +24,14 @@ spring:
     password:
 
   # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-  profiles:
-    include:
-      - activeMQ
+#  profiles:
+#    include:
+#      - activeMQ
   #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
   #activeMQ配置
-  activemq:
-    broker-url: tcp://localhost:61616  #连接地址
+#  activemq:
+#    broker-url: tcp://localhost:61616  #连接地址
 
   #rabbitmq配置
   #  rabbitmq:

conf/payment/application.yml

@@ -24,14 +24,14 @@ spring:
     password:
 
   # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-  profiles:
-    include:
-      - activeMQ
+#  profiles:
+#    include:
+#      - activeMQ
   #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
   #activeMQ配置
-  activemq:
-    broker-url: tcp://localhost:61616  #连接地址
+#  activemq:
+#    broker-url: tcp://localhost:61616  #连接地址
 
   #rabbitmq配置
   #  rabbitmq:

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/queue/MqQueue4ModifyMchUserRemove.java

@@ -45,14 +45,14 @@ public class MqQueue4ModifyMchUserRemove extends MqMchUserRemoveService {
 
     @Autowired private JmsTemplate jmsTemplate;
 
-    @Bean("modifyMchUserRemove")
+    @Bean("activeModifyMchUserRemove")
     public Queue mqQueue4ModifyMchUserRemove(){
         return new ActiveMQQueue(CS.MQ.QUEUE_MODIFY_MCH_USER_REMOVE);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("modifyMchUserRemove")
+    @Qualifier("activeModifyMchUserRemove")
     private Queue mqQueue4ModifyMchUserRemove;
 
     @Override

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/queue/MqQueue4PayOrderMchNotify.java

@@ -43,14 +43,14 @@ public class MqQueue4PayOrderMchNotify extends MqPayOrderNotifyService {
 
     @Autowired private JmsTemplate jmsTemplate;
 
-    @Bean("payOrderMchNotify")
+    @Bean("activePayOrderMchNotify")
     public Queue mqQueue4PayOrderMchNotify(){
         return new ActiveMQQueue(CS.MQ.QUEUE_PAYORDER_MCH_NOTIFY);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("payOrderMchNotify")
+    @Qualifier("activePayOrderMchNotify")
     private Queue mqQueue4PayOrderMchNotify;
 
 

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/topic/MqTopic4ModifyIsvInfo.java

@@ -41,14 +41,14 @@ public class MqTopic4ModifyIsvInfo extends MqModifyIsvInfoService {
 
     @Autowired private JmsTemplate jmsTemplate;
 
-    @Bean("modifyIsvInfo")
+    @Bean("activeModifyIsvInfo")
     public ActiveMQTopic mqTopic4ModifyIsvInfo(){
         return new ActiveMQTopic(CS.MQ.TOPIC_MODIFY_ISV_INFO);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("modifyIsvInfo")
+    @Qualifier("activeModifyIsvInfo")
     private ActiveMQTopic mqTopic4ModifyIsvInfo;
 
     @Override

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/topic/MqTopic4ModifyMchApp.java

@@ -43,14 +43,14 @@ public class MqTopic4ModifyMchApp extends MqModifyMchAppService {
 
     @Autowired private JmsTemplate jmsTemplate;
 
-    @Bean("modifyMchApp")
+    @Bean("activeModifyMchApp")
     public ActiveMQTopic mqTopic4ModifyMchApp(){
         return new ActiveMQTopic(CS.MQ.TOPIC_MODIFY_MCH_APP);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("modifyMchApp")
+    @Qualifier("activeModifyMchApp")
     private ActiveMQTopic mqTopic4ModifyMchApp;
 
     /** 推送消息到各个节点 **/

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/topic/MqTopic4ModifyMchInfo.java

@@ -41,14 +41,14 @@ public class MqTopic4ModifyMchInfo extends MqModifyMchInfoService {
 
     @Autowired private JmsTemplate jmsTemplate;
 
-    @Bean("modifyMchInfo")
+    @Bean("activeModifyMchInfo")
     public ActiveMQTopic mqTopic4ModifyMchInfo(){
         return new ActiveMQTopic(CS.MQ.TOPIC_MODIFY_MCH_INFO);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("modifyMchInfo")
+    @Qualifier("activeModifyMchInfo")
     private ActiveMQTopic mqTopic4ModifyMchInfo;
 
     @Override

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/mq/topic/MqTopic4ModifySysConfig.java

@@ -44,14 +44,14 @@ public class MqTopic4ModifySysConfig extends MqModifySysConfigService {
     @Autowired private JmsTemplate jmsTemplate;
     @Autowired private SysConfigService sysConfigService;
 
-    @Bean("modifySysConfig")
+    @Bean("activeModifySysConfig")
     public ActiveMQTopic mqTopic4ModifySysConfig(){
         return new ActiveMQTopic(CS.MQ.TOPIC_MODIFY_SYS_CONFIG);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("modifySysConfig")
+    @Qualifier("activeModifySysConfig")
     private ActiveMQTopic mqTopic4ModifySysConfig;
 
     /** 接收 更新系统配置项的消息 **/

jeepay-manager/src/main/resources/application.yml

@@ -52,22 +52,22 @@ spring:
         password:
 
     # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-    profiles:
-        include:
-            - activeMQ
-    #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
+#    profiles:
+#        include:
+#            - activeMQ
+#          - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
     #activeMQ配置
-    activemq:
-        broker-url: tcp://localhost:61616  #连接地址
+#    activemq:
+#        broker-url: tcp://localhost:61616  #连接地址
 
         #rabbitmq配置
-        #  rabbitmq:
-        #    addresses: 127.0.0.1:5672
-        #    username: guest
-        #    password: guest
-        #    dynamic: true
-        #    virtual-host: /
+#          rabbitmq:
+#            addresses: 127.0.0.1:5672
+#            username: guest
+#            password: guest
+#            dynamic: true
+#            virtual-host: /
 
 #日志配置参数。
     # 当存在logback-spring.xml文件时： 该配置将引进到logback配置，  springboot配置不生效。

jeepay-merchant/src/main/resources/application.yml

@@ -52,14 +52,14 @@ spring:
         password:
 
     # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-    profiles:
-        include:
-            - activeMQ
+#    profiles:
+#        include:
+#            - activeMQ
     #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
     #activeMQ配置
-    activemq:
-        broker-url: tcp://localhost:61616  #连接地址
+#    activemq:
+#        broker-url: tcp://localhost:61616  #连接地址
 
         #rabbitmq配置
         #  rabbitmq:

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/queue/MqQueue4ChannelOrderQuery.java

@@ -55,14 +55,14 @@ public class MqQueue4ChannelOrderQuery extends MqChannelOrderQueryService {
     @Autowired private PayOrderService payOrderService;
     @Autowired private ChannelOrderReissueService channelOrderReissueService;
 
-    @Bean("channelOrderQuery")
+    @Bean("activeChannelOrderQuery")
     public Queue mqQueue4ChannelOrderQuery(){
         return new ActiveMQQueue(CS.MQ.QUEUE_CHANNEL_ORDER_QUERY);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("channelOrderQuery")
+    @Qualifier("activeChannelOrderQuery")
     private Queue mqQueue4ChannelOrderQuery;
 
     /** 发送MQ消息 **/

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/queue/MqQueue4PayOrderMchNotify.java

@@ -51,14 +51,14 @@ import javax.jms.TextMessage;
 @Profile(CS.MQTYPE.ACTIVE_MQ)
 public class MqQueue4PayOrderMchNotify extends MqPayOrderMchNotifyService {
 
-    @Bean("payOrderMchNotifyInner")
+    @Bean("activePayOrderMchNotifyInner")
     public Queue mqQueue4PayOrderMchNotifyInner(){
         return new ActiveMQQueue(CS.MQ.QUEUE_PAYORDER_MCH_NOTIFY);
     }
 
     @Lazy
     @Autowired
-    @Qualifier("payOrderMchNotifyInner")
+    @Qualifier("activePayOrderMchNotifyInner")
     private Queue mqQueue4PayOrderMchNotifyInner;
     @Autowired private JmsTemplate jmsTemplate;
     @Autowired private MchNotifyRecordService mchNotifyRecordService;

jeepay-payment/src/main/resources/application.yml

@@ -52,14 +52,14 @@ spring:
         password:
 
     # 注意：以下MQ配置需注意【如需使用activeMQ则需将rabbitMQ配置注释即可】
-    profiles:
-        include:
-            - activeMQ
+#    profiles:
+#        include:
+#            - activeMQ
     #      - rabbitMQ # 需要安装延迟队列插件：https://www.rabbitmq.com/blog/2015/04/16/scheduling-messages-with-rabbitmq/
 
     #activeMQ配置
-    activemq:
-        broker-url: tcp://localhost:61616  #连接地址
+#    activemq:
+#        broker-url: tcp://localhost:61616  #连接地址
 
         #rabbitmq配置
         #  rabbitmq: