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

mali
Commit d50ec8b6ea201595598ec71ce8e2b777d799169b 2 parents 23c5e144 06238557
Showing 2 changed files with 4 additions and 4 deletions
web/src/main/resources/rabbitmq.yml
web/src/main/webapp/META-INF/autoconf/rabbitmq.yml
--- a/web/src/main/resources/rabbitmq.yml
View file @d50ec8b
+++ b/web/src/main/resources/rabbitmq.yml
View file @d50ec8b
@@ -8,12 +8,12 @@ consumer:
               topic: ufo.order.updateExpressInfo
 
             - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
-               topic: seller_order_autoCancel
+               topic: sellerOrder.autoCancel
               delay:
                     interval: 15
 
             - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
-               topic: buyer_order_autoCancel
+               topic: buyerOrder.autoCancel
               delay:
                     interval: 15
 
--- a/web/src/main/webapp/META-INF/autoconf/rabbitmq.yml
View file @d50ec8b
+++ b/web/src/main/webapp/META-INF/autoconf/rabbitmq.yml
View file @d50ec8b
@@ -8,12 +8,12 @@ consumer:
               topic: ufo.order.updateExpressInfo
 
             - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
-               topic: seller_order_autoCancel
+               topic: sellerOrder.autoCancel
               delay:
                     interval: 15
 
             - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
-               topic: buyer_order_autoCancel
+               topic: buyerOrder.autoCancel
               delay:
                     interval: 15