1.兼容1.0.0版本

@@ -80,4 +80,7 @@ public interface MemberService {
     MemberDTO doUpdateMemberExpAndLevel(Member resources);
 
     MemberDTO unbindUserIpTv(Member member);
+
+
+    void unbind(Member resources);
 }

@@ -147,6 +147,27 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void unbind(Member resources) {
+        try {
+            String code = resources.getCode();
+            MemberDTO memberDTO = this.findByCode(code);
+//            Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
+            ValidationUtil.isNull(memberDTO.getId(), "Member", "id", resources.getId());
+            Member member = new Member();
+            BeanUtils.copyProperties(memberDTO,member);
+
+            member.setUserIptvId(null);
+            member.setBindIptvTime(null);
+            member.setBindIptvPlatformType(null);
+            this.save(member);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public MemberDTO update(Member resources) {
 
         log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources);
@@ -201,4 +222,6 @@ public class MemberServiceImpl implements MemberService {
 
     }
 
+
+
 }

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -120,6 +121,13 @@ public class UserTvServiceImpl implements UserTvService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void unbindPriorityMemberCode(UserTv resources) {
+        String platformAccount = resources.getPlatformAccount();
+        if (StringUtils.isNotBlank(platformAccount)) {
+            UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
+            Long id = userTvDTO.getId();
+            resources.setId(id);
+            resources.setMemberId(userTvDTO.getMemberId());
+        }
         this.userTvRepository.save(resources);
     }
 

@@ -226,6 +226,18 @@ public class RabbitMqSourceConfig {
         return COLLECTION_QUEUE;
     }
 
+    public String getUcgCollectionQueueAdd(){
+        return "queue.collection.add";
+    }
+
+    public String getUcgCollectionQueueDelete(){
+        return "queue.collection.delete";
+    }
+
+    public String getUcgCollectionQueueDeleteAll(){
+        return "queue.collection.deleteall";
+    }
+
     public String getUcgCollectionSource(){
         if (Objects.nonNull(ucgIptvCollectionInfo)) {
             if (MapUtils.isNotEmpty(ucgIptvCollectionInfo)) {
@@ -346,6 +358,12 @@ public class RabbitMqSourceConfig {
         return "false";
     }
 
+
+
+    public String getMemberInfoAsyncQueue(){
+        return "queue.MemberInfoSync";
+    }
+
     /**************************************************eventBus*************************************************************/
     public static final String UC_EVENTBUS_EXCHANGE = "uc.eventbus";
     public static final String UC_EVENTBUS_KEY = "uc.eventbus.*.topic";

@@ -31,6 +31,43 @@ public class UcEngineManagement2IptvConsumer {
     @Value("#{rabbitMqErrorLogConfig.getUceError()}")
     private Map<String, String> error;
 
+    @RabbitHandler
+    @RabbitListener(queues = "#{rabbitMqSourceConfig.getMemberInfoAsyncQueue()}",
+            containerFactory = "#{rabbitMqSourceConfig.getUceSource()}",
+            autoStartup = "#{rabbitMqSourceConfig.getUceStartUp()}",
+            ackMode = "AUTO")
+    public void ucEventConsumer2(Channel channel, Message message, String content) throws IOException {
+        log.info(" receive MemberInfoAsync msg , content is : {} ", content);
+
+        try {
+            TableOperationMsg tableOperationMsg = this.parseContent(content);
+
+            autoUser.route(tableOperationMsg);
+
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        } catch (Exception e) {
+
+            channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
+
+            if (MapUtils.isNotEmpty(error)) {
+                String errorStart = this.error.get("start");
+
+                if (errorStart.equalsIgnoreCase("true")) {
+                    String fileName = this.error.get("fileName")+"_"+ LocalDate.now() +".log";
+                    String filePath = this.error.get("filePath");
+                    String filePath1 = filePath+fileName;
+                    FileUtil.writeStringToFile2(filePath1, content, e.getMessage());
+                }
+
+            }
+
+            e.printStackTrace();
+        }
+
+        log.info("ucEventConsumer ====>>>> end");
+    }
+
     /**
      * 事件
      * @param content
@@ -44,7 +81,7 @@ public class UcEngineManagement2IptvConsumer {
             autoStartup = "#{rabbitMqSourceConfig.getUceStartUp()}",
             ackMode = "MANUAL")
     public void ucEventConsumer(Channel channel, Message message, String content) throws IOException {
-        log.info(" receive dataSync msg , content is : {} ", content);
+        log.info(" receive ucEventConsumer msg , content is : {} ", content);
 
         try {
             TableOperationMsg tableOperationMsg = this.parseContent(content);

@@ -239,4 +239,185 @@ public class UcGatewayIptv2IptvConsumer {
             e.printStackTrace();
         }
     }
+
+
+
+
+
+    /**
+     * @description 添加收藏记录
+     * @param content 消息内容
+     */
+    @RabbitHandler
+    @RabbitListener(queues = "#{rabbitMqSourceConfig.getUcgCollectionQueueAdd()}",
+            containerFactory = "#{rabbitMqSourceConfig.getUcgCollectionSource()}",
+            autoStartup = "#{rabbitMqSourceConfig.getUcgCollectionStartUp()}",
+            ackMode = "MANUAL")
+    public void collectionConsumerAdd(Channel channel, Message message, String content) throws IOException {
+        log.info("receive collectionConsumerAdd add message, content {}", content);
+
+        try {
+
+            JSONObject jsonObject = JSON.parseObject(content, JSONObject.class);
+            if (Objects.nonNull(content)) {
+                String evt = jsonObject.get("evt").toString();
+                String msgData = jsonObject.get("msgData").toString();
+                switch (evt.toUpperCase()) {
+                    // 添加收藏
+                    case "ADDCOLLECTION":
+                        this.restTemplateClient.addCollection(msgData);
+                        break;
+                    // 删除收藏
+                    case "DELETECOLLECTION":
+                        this.restTemplateClient.deleteCollection(msgData);
+                        break;
+                    // 删除全部收藏
+                    case "DELETEALLCOLLECTION":
+                        this.restTemplateClient.deleteAllCollection(msgData);
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        } catch (Exception e) {
+
+            channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
+
+            if (MapUtils.isNotEmpty(error)) {
+                String errorStart = this.error.get("start");
+
+                if (errorStart.equalsIgnoreCase("true")) {
+                    String fileName = this.error.get("fileName")+"_"+ LocalDate.now() +".log";
+                    String filePath = this.error.get("filePath");
+                    String filePath1 = filePath+fileName;
+                    FileUtil.writeStringToFile2(filePath1, content, e.getMessage());
+                }
+
+            }
+
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @description 添加收藏记录
+     * @param content 消息内容
+     */
+    @RabbitHandler
+    @RabbitListener(queues = "#{rabbitMqSourceConfig.getUcgCollectionQueueDelete()}",
+            containerFactory = "#{rabbitMqSourceConfig.getUcgCollectionSource()}",
+            autoStartup = "#{rabbitMqSourceConfig.getUcgCollectionStartUp()}",
+            ackMode = "MANUAL")
+    public void collectionConsumerDelete(Channel channel, Message message, String content) throws IOException {
+        log.info("receive collectionConsumerDelete add message, content {}", content);
+
+        try {
+
+            JSONObject jsonObject = JSON.parseObject(content, JSONObject.class);
+            if (Objects.nonNull(content)) {
+                String evt = jsonObject.get("evt").toString();
+                String msgData = jsonObject.get("msgData").toString();
+                switch (evt.toUpperCase()) {
+                    // 添加收藏
+                    case "ADDCOLLECTION":
+                        this.restTemplateClient.addCollection(msgData);
+                        break;
+                    // 删除收藏
+                    case "DELETECOLLECTION":
+                        this.restTemplateClient.deleteCollection(msgData);
+                        break;
+                    // 删除全部收藏
+                    case "DELETEALLCOLLECTION":
+                        this.restTemplateClient.deleteAllCollection(msgData);
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        } catch (Exception e) {
+
+            channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
+
+            if (MapUtils.isNotEmpty(error)) {
+                String errorStart = this.error.get("start");
+
+                if (errorStart.equalsIgnoreCase("true")) {
+                    String fileName = this.error.get("fileName")+"_"+ LocalDate.now() +".log";
+                    String filePath = this.error.get("filePath");
+                    String filePath1 = filePath+fileName;
+                    FileUtil.writeStringToFile2(filePath1, content, e.getMessage());
+                }
+
+            }
+
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @description 添加收藏记录
+     * @param content 消息内容
+     */
+    @RabbitHandler
+    @RabbitListener(queues = "#{rabbitMqSourceConfig.getUcgCollectionQueueDeleteAll()}",
+            containerFactory = "#{rabbitMqSourceConfig.getUcgCollectionSource()}",
+            autoStartup = "#{rabbitMqSourceConfig.getUcgCollectionStartUp()}",
+            ackMode = "MANUAL")
+    public void collectionConsumerDeleteAll(Channel channel, Message message, String content) throws IOException {
+        log.info("receive collectionConsumerDeleteAll add message, content {}", content);
+
+        try {
+
+            JSONObject jsonObject = JSON.parseObject(content, JSONObject.class);
+            if (Objects.nonNull(content)) {
+                String evt = jsonObject.get("evt").toString();
+                String msgData = jsonObject.get("msgData").toString();
+                switch (evt.toUpperCase()) {
+                    // 添加收藏
+                    case "ADDCOLLECTION":
+                        this.restTemplateClient.addCollection(msgData);
+                        break;
+                    // 删除收藏
+                    case "DELETECOLLECTION":
+                        this.restTemplateClient.deleteCollection(msgData);
+                        break;
+                    // 删除全部收藏
+                    case "DELETEALLCOLLECTION":
+                        this.restTemplateClient.deleteAllCollection(msgData);
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+
+//            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        } catch (Exception e) {
+
+            channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
+
+            if (MapUtils.isNotEmpty(error)) {
+                String errorStart = this.error.get("start");
+
+                if (errorStart.equalsIgnoreCase("true")) {
+                    String fileName = this.error.get("fileName")+"_"+ LocalDate.now() +".log";
+                    String filePath = this.error.get("filePath");
+                    String filePath1 = filePath+fileName;
+                    FileUtil.writeStringToFile2(filePath1, content, e.getMessage());
+                }
+
+            }
+
+            e.printStackTrace();
+        }
+    }
 }

@@ -142,11 +142,17 @@ service:
 #        routing-key: uc.eventbus.*.topic
 #        active: service
       - source: uce
-        exchange: uce.exchange
-        queue: uce.queue
+        exchange: uc.direct
+        queue: uc.route.key.direct.event.bbb
         exchange-type: direct
         routing-key:
-        active: management
+        active: service
+      - source: uce
+        exchange: exchange.MemberInfoSync
+        queue: queue.MemberInfoSync
+        exchange-type: direct
+        routing-key:
+        active: service
 #      - source: wechat
 #        exchange: weixin.subOrUnSub.direct
 #        queue: weixin.subOrUnSub.queue