Merge branch 'master-tiande' into dev-tiande

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/config/RabbitTourConfig.java

@@ -21,18 +21,18 @@ public class RabbitTourConfig extends RabbitCommonConfig {
 
 
     //同步企业信息
-    public static final String CORPORATION_UPD_QUEUE = "tourCorporation:upd.queue";
+    public static final String TOUR_CORPORATION_UPD_QUEUE = "tour.corporation:upd.queue";
 
     //同步门店信息
-    public static final String COMPANY_UPD_QUEUE = "tourCompany:upd.queue";
+    public static final String TOUR_COMPANY_UPD_QUEUE = "tour.company:upd.queue";
 
 
     static {
         myQueue = new ArrayList<BindDTO>() {{
             //企业
-            add(new BindDTO(CORPORATION_UPD_QUEUE, VEHICLE_TOPIC, KEY_CORPORATION_UPD));
+            add(new BindDTO(TOUR_CORPORATION_UPD_QUEUE, VEHICLE_TOPIC, KEY_CORPORATION_UPD));
             //门店
-            add(new BindDTO(COMPANY_UPD_QUEUE, VEHICLE_TOPIC, KEY_COMPANY_UPD));
+            add(new BindDTO(TOUR_COMPANY_UPD_QUEUE, VEHICLE_TOPIC, KEY_COMPANY_UPD));
         }};
     }
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/handler/BranchCompanyMQHandler.java

@@ -33,7 +33,7 @@ public class BranchCompanyMQHandler {
      * 同步门店信息
      * @param
      */
-    @RabbitListener(queues = COMPANY_UPD_QUEUE)
+    @RabbitListener(queues = TOUR_COMPANY_UPD_QUEUE)
     public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
         log.info("同步门店信息 messageJson："+ JSONUtil.parse(message));
         ExecutorService executorService = Executors.newCachedThreadPool();

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/handler/CorporationMQHandler.java

@@ -34,7 +34,7 @@ public class CorporationMQHandler {
      * 同步企业信息
      * @param
      */
-    @RabbitListener(queues = CORPORATION_UPD_QUEUE)
+    @RabbitListener(queues = TOUR_CORPORATION_UPD_QUEUE)
     public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
         log.info("同步企业信息 messageJson："+ JSONUtil.parse(message));
         ExecutorService executorService = Executors.newCachedThreadPool();