Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev

@@ -56,8 +56,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
     @Autowired
     private BuyerOrderMapper buyerOrderMapper;
 
-    @Resource( name = "yhProducer")
-    private YhProducer yhProducer;
+    @Resource( name = "ufoExpressInfoProducer")
+    private YhProducer ufoExpressInfoProducer;
 
     @Autowired
     private AppraiseAddressService appraiseAddressService;
@@ -74,7 +74,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
     @Autowired
     InBoxFacade inBoxFacade;
 
-    private static String EXPRESS_MQ_SEND = "logistics.logistics_data";
+    //private static String EXPRESS_MQ_SEND = "logistics.logistics_data";
+    private static String EXPRESS_MQ_SEND = "order.updateChangeRefundOrderExpressInfo";
 
     /**
      *
@@ -201,7 +202,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         mqInfo.setBusinessType(5);
 
         try{
-            yhProducer.send(EXPRESS_MQ_SEND, mqInfo);
+            ufoExpressInfoProducer.send(EXPRESS_MQ_SEND, mqInfo);
             LOGGER.info("send express mq success. topic is {}, param is {}", EXPRESS_MQ_SEND, mqInfo);
         }catch (Exception e){
             LOGGER.warn("send express mq failed. param is {}, exception is {}", mqInfo, e);

@@ -42,6 +42,10 @@ producer:
       producers:
           - bean: yhProducer
 
+    - address: 192.168.102.45:5672
+      producers:
+          - bean: ufoExpressInfoProducer
+
     - address: 192.168.103.58:5672
       username: yoho
       password: yoho

@@ -3,10 +3,6 @@ consumer:
         username: ${rabbit_order_user}
         password: ${rabbit_order_password}
         consumers:
-            #更新物流调拨信息
-            - class: com.yohoufo.order.mq.consumer.ExpressInfoUpdateConsumer
-              topic: ufo.order.updateExpressInfo
-
             - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
               topic: sellerOrder.autoCancel
               delay:
@@ -38,6 +34,15 @@ consumer:
               delay:
                     interval: 2160
 
+
+      - address: ${rabbit_common}
+        username: ${rabbit_common_user}
+        password: ${rabbit_common_password}
+        consumers:
+            #更新物流调拨信息
+            - class: com.yohoufo.order.mq.consumer.ExpressInfoUpdateConsumer
+              topic: ufo.order.updateExpressInfo
+
 producer:
       - address: ${rabbit_order}
         username: ${rabbit_order_user}
@@ -51,4 +56,10 @@ producer:
         username: ${rabbit_common_user}
         password: ${rabbit_common_password}
         producers:
-            - bean: yhProducer
\ No newline at end of file
+            - bean: yhProducer
+
+      - address: ${rabbit_common}
+        username: ${rabbit_common_user}
+        password: ${rabbit_common_password}
+        producers:
+            - bean: ufoExpressInfoProducer
\ No newline at end of file