Authored by qinchao

Merge branch 'hotfix_20181129_express_mq' into test6.8.2

@@ -82,8 +82,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -82,8 +82,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
82 private CacheCleaner cacheCleaner; 82 private CacheCleaner cacheCleaner;
83 83
84 //private static String EXPRESS_MQ_SEND = "logistics.logistics_data"; 84 //private static String EXPRESS_MQ_SEND = "logistics.logistics_data";
85 - private static String EXPRESS_MQ_SEND = "order.updateChangeRefundOrderExpressInfo";  
86 - 85 + //private static String EXPRESS_MQ_SEND = "order.updateChangeRefundOrderExpressInfo";
  86 + private static String EXPRESS_MQ_SEND = "third.logistics.logistics_data";
87 /** 87 /**
88 * 88 *
89 * @param sellerUid 卖家的uid 89 * @param sellerUid 卖家的uid
@@ -58,8 +58,8 @@ producer: @@ -58,8 +58,8 @@ producer:
58 producers: 58 producers:
59 - bean: yhProducer 59 - bean: yhProducer
60 60
61 - - address: ${rabbit_order}  
62 - username: ${rabbit_order_user}  
63 - password: ${rabbit_order_password} 61 + - address: ${rabbit_common}
  62 + username: ${rabbit_common_user}
  63 + password: ${rabbit_common_password}
64 producers: 64 producers:
65 - bean: ufoExpressInfoProducer 65 - bean: ufoExpressInfoProducer