1.update

@@ -83,7 +83,15 @@ public class MemberServiceImpl implements MemberService {
         if(Objects.isNull(id) && StringUtils.isBlank(memberCode))
             throw new BadRequestException(GlobeExceptionMsg.MEMBER_ID_AND_CODE_ARE_NULL);
 
-        return this.findByIdOrCode(id, memberCode);
+        if (StringUtils.isNotBlank(memberCode)) {
+            MemberDTO memberDTO = this.findByCode(memberCode);
+            return memberDTO;
+        } else if (Objects.nonNull(id)) {
+            MemberDTO memberDTO = this.findById(id);
+            return memberDTO;
+        }
+
+        return null;
     }
 
     @Override

@@ -97,24 +97,44 @@ public class RabbitMqConfig {
         return u;
     }
 
-    /**************************************************uc-getaway-iptv 2 uc-consumer-service*************************************************************/
+    /**************************************************uc-getaway-samll 2 uc-consumer-samll*************************************************************/
+
+    /*public static final String GATEWAY_TO_SMALL_DIRECT = "uc.gateway.small.direct";
+
+    @Bean
+    public Queue eventSmallDirect() {
+        return new Queue(GATEWAY_TO_SMALL_DIRECT);
+    }
+
+    @Bean
+    Binding eventSmallBinding(DirectExchange managementExchange , Queue eventSmallDirect) {
+        BindingBuilder.DirectExchangeRoutingKeyConfigurer directExchangeRoutingKeyConfigurer =
+                BindingBuilder.bind(eventSmallDirect).to(managementExchange);
+        return directExchangeRoutingKeyConfigurer.with(GATEWAY_TO_SMALL_DIRECT);
+    }*/
+
+
+    /**************************************************uc-engine-management 2 uc-consumer-iptv*************************************************************/
+
+
+    /**************************************************uc-getaway-iptv 2 uc-consumer-iptv*************************************************************/
 
     public static final String GATEWAY_TO_SERVICE_DIRECT = "uc.gateway.service.direct";
 
     @Bean
-    public Queue eventDirect() {
+    public Queue eventServiceDirect() {
         return new Queue(GATEWAY_TO_SERVICE_DIRECT);
     }
 
     @Bean
-    Binding eventBinding(DirectExchange managementExchange , Queue eventDirect) {
+    Binding eventBinding(DirectExchange managementExchange, Queue eventServiceDirect) {
         BindingBuilder.DirectExchangeRoutingKeyConfigurer directExchangeRoutingKeyConfigurer =
-                BindingBuilder.bind(eventDirect).to(managementExchange);
+                BindingBuilder.bind(eventServiceDirect).to(managementExchange);
         return directExchangeRoutingKeyConfigurer.with(ENGINE_TO_SERVICE_DIRECT);
     }
 
 
-    /**************************************************uc-engine-management 2 uc-consumer-service*************************************************************/
+    /**************************************************uc-engine-management 2 uc-consumer-iptv*************************************************************/
 
     public static final String UC_DIRECT_MANAGEMENT = "uc.direct.management";
     // uc-service-management 2 uc-consumer-iptv
@@ -138,8 +158,7 @@ public class RabbitMqConfig {
     }
 
 
-    /**************************************************uc-engine-service 2 uc-consumer-management*************************************************************/
-
+    /**************************************************uc-engine-iptv 2 uc-consumer-management*************************************************************/
 
     public static final String UC_DIRECT_SERVICE = "uc.direct";
     // uc-service-iptv 2 uc-consumer-management

@@ -16,7 +16,7 @@ import org.springframework.util.Assert;
 
 @Component
 @Slf4j
-public class UcEngineServiceIptvEventConsumer {
+public class UcEngineIptv2ManagementConsumer {
 
     @Autowired
     AutoRoute autoUser;
@@ -33,7 +33,7 @@ public class UcEngineServiceIptvEventConsumer {
      */
     /*@RabbitHandler
     @RabbitListener(bindings = {
-            @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_IPTV_CONSUMER_MEMBER_DIRECT),
+            @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_MANAGEMENT_DIRECT),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))
     }, containerFactory = "serviceRabbitListenerContainerFactory")*/
     public void ucEventConsumer(String content) {

@@ -13,7 +13,7 @@ import org.springframework.util.Assert;
 
 @Component
 @Slf4j
-public class UcEngineManagementEventConsumer {
+public class UcEngineManagement2IptvConsumer {
 
     @Autowired
     AutoRoute autoUser;
@@ -28,11 +28,11 @@ public class UcEngineManagementEventConsumer {
      * @author Hongyan Wang
      * @date 2021/9/7 11:26 上午
      */
-    /*@RabbitHandler
+    @RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_SERVICE_DIRECT),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))
-    }, containerFactory = "serviceRabbitListenerContainerFactory")*/
+    }, containerFactory = "serviceRabbitListenerContainerFactory")
     public void ucEventConsumer(String content) {
         log.info(" receive dataSync msg , content is : {} ", content);
         TableOperationMsg tableOperationMsg = this.parseContent(content);

@@ -24,7 +24,7 @@ import java.util.Objects;
 
 @Component
 @Slf4j
-public class UcEventBusConsumer {
+public class UcEventBusIptv2IptvConsumer {
 
     @Autowired
     RestTemplateClient restTemplateClient;
@@ -38,9 +38,9 @@ public class UcEventBusConsumer {
      * @author Hongyan Wang
      * @date 2021/9/7 11:26 上午
      */
-    /*@RabbitHandler
+    @RabbitHandler
     @RabbitListener(queues = RabbitMqConfig.UC_EVENTBUS_TOPIC,
-            containerFactory = "managementRabbitListenerContainerFactory")*/
+            containerFactory = "managementRabbitListenerContainerFactory")
     public void ucEventConsumer(String content) {
         log.info(" receive dataSync msg , content is : {} ", content);
         DataSyncMsg dataSyncMsg = this.parseContent(content);

@@ -13,7 +13,7 @@ import org.springframework.util.Assert;
 
 @Component
 @Slf4j
-public class UcGatewayEventConsumer {
+public class UcGatewayIptv2IptvConsumer {
 
     @Autowired
     RestTemplateClient restTemplateClient;
@@ -28,11 +28,11 @@ public class UcGatewayEventConsumer {
      * @author Hongyan Wang
      * @date 2021/9/7 11:26 上午
      */
-    /*@RabbitHandler
+    @RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.GATEWAY_TO_SERVICE_DIRECT),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))
-    }, containerFactory = "managementRabbitListenerContainerFactory")*/
+    }, containerFactory = "managementRabbitListenerContainerFactory")
     public void ucEventConsumer(String content) {
         log.info(" receive dataSync msg , content is : {} ", content);
         DataSyncMsg dataSyncMsg = this.parseContent(content);

@@ -32,11 +32,11 @@ public class WeiXinEventConsumer {
      * @description 删除用户收藏记录
      * @param content 消息内容
      */
-    @RabbitHandler
+    /*@RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_DELETE_QUEUE),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))},
-            containerFactory = "managementRabbitListenerContainerFactory")
+            containerFactory = "managementRabbitListenerContainerFactory")*/
     public void deleteCollection(String content) {
         try {
             log.info("receive UserCollection delete message, content {}", content);
@@ -50,11 +50,11 @@ public class WeiXinEventConsumer {
      * @description 删除全部收藏记录
      * @param content 消息内容
      */
-    @RabbitHandler
+    /*@RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_DELETE_ALL_QUEUE),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))},
-            containerFactory = "managementRabbitListenerContainerFactory")
+            containerFactory = "managementRabbitListenerContainerFactory")*/
     @Transactional
     public void deleteAllCollection(String content) {
         try {
@@ -74,11 +74,11 @@ public class WeiXinEventConsumer {
      * }
      * @param content
      */
-    @RabbitHandler
+    /*@RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.WEIXIN_SUBORUNSUB_QUEUE),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))},
-            containerFactory = "managementRabbitListenerContainerFactory")
+            containerFactory = "managementRabbitListenerContainerFactory")*/
     @Transactional
     public void subOrUnSubEvent(String content) {
         try {
@@ -120,11 +120,11 @@ public class WeiXinEventConsumer {
      * @description 添加收藏记录
      * @param content 消息内容
      */
-    @RabbitHandler
+    /*@RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_ADD_QUEUE),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))},
-            containerFactory = "managementRabbitListenerContainerFactory")
+            containerFactory = "managementRabbitListenerContainerFactory")*/
     @Transactional
     public void addCollection(String content) {
         try {

@@ -119,9 +119,9 @@ mutil-mq:
 # 服务属性
 service:
   #平台类型    service: 服务侧  management: 管理侧
-  platform: management
+  platform: service
   # 服务域     mobile:小屏侧    vis:大屏侧
-  type:
+  type: vis
 
 # uc-engine服务地址
 api: