1.为关注、绑定功能添加必要的参数校验和日志输出

@@ -360,6 +360,12 @@ public class UserOperationController {
                     // 大屏账户
                     // 大屏账户
                     String platformAccount = iptvUserInfo.getString("platformAccount");
                     String platformAccount = iptvUserInfo.getString("platformAccount");
 
 
+                    if (StringUtils.isBlank(platformAccount)) {
+                        log.warn("绑定失败，platformAccount is null ");
+                        return ResultInfo.failure("绑定失败");
+                    }
+
+
                     try {
                     try {
                         String headimgurl = iptvUserInfo.get("headimgurl").toString();
                         String headimgurl = iptvUserInfo.get("headimgurl").toString();
 
 

@@ -472,18 +472,29 @@ public class UserOperationServiceImpl implements UserOperationService {
 
 
         // 修改会员信息
         // 修改会员信息
         MemberDTO _memberDTO1 = this.doUpdateMemberByMemberDTO(memberDTO);
         MemberDTO _memberDTO1 = this.doUpdateMemberByMemberDTO(memberDTO);
+        log.info("发送关注消息至大屏侧，发送的账号信息 ==>> {} || 会员信息 ==>> {}", _userWeixinDTO , _memberDTO1);
         // 同步至iptv
         // 同步至iptv
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncSubscribe(new MemberAndWeixinUserDTO(_memberDTO1, _userWeixinDTO));
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncSubscribe(new MemberAndWeixinUserDTO(_memberDTO1, _userWeixinDTO));
 
 
+
         // 大屏信息
         // 大屏信息
         JSONObject iptvUserInfo = resources.getIptvUserInfo();
         JSONObject iptvUserInfo = resources.getIptvUserInfo();
-        if (Objects.nonNull(iptvUserInfo)) {
+        log.info("存储的大小屏账号信息 iptvUserInfo ==>> {}" , iptvUserInfo);
 
 
+        if (Objects.nonNull(iptvUserInfo)) {
             // 大屏账户
             // 大屏账户
             String platformAccount = iptvUserInfo.getString("platformAccount");
             String platformAccount = iptvUserInfo.getString("platformAccount");
+            log.info("存储的大屏账号信息 platformAccount ==>> {}" , platformAccount);
+            log.info("绑定开始");
+
+            if (StringUtils.isBlank(platformAccount)) {
+                log.warn("绑定失败，platformAccount is null ");
+                return false;
+            }
+
             // 绑定
             // 绑定
             this.bind(memberDTO, platformAccount);
             this.bind(memberDTO, platformAccount);
-
+            log.info("绑定结束");
         }
         }
 
 
         // 保存关注记录
         // 保存关注记录
@@ -559,6 +570,7 @@ public class UserOperationServiceImpl implements UserOperationService {
         // 会员
         // 会员
         MemberDTO memberDTO = this.findMemberByUserWeixinDTO(userWeixinDTO);
         MemberDTO memberDTO = this.findMemberByUserWeixinDTO(userWeixinDTO);
 
 
+        memberDTO.setUserIptvId(null);
         // 修改会员vip,如果没有购买会员则取消团粉
         // 修改会员vip,如果没有购买会员则取消团粉
         MemberDTO _memberDTO = this.doUpdateMemberVip(memberDTO, 0);
         MemberDTO _memberDTO = this.doUpdateMemberVip(memberDTO, 0);
 
 
@@ -1017,6 +1029,10 @@ public class UserOperationServiceImpl implements UserOperationService {
     @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
     @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
     public void bind(MemberDTO memberDTO, UserTvDTO userTvDTO) {
     public void bind(MemberDTO memberDTO, UserTvDTO userTvDTO) {
         String platformAccount = userTvDTO.getPlatformAccount();
         String platformAccount = userTvDTO.getPlatformAccount();
+
+        if (StringUtils.isBlank(platformAccount)) {
+            return;
+        }
         // 绑定
         // 绑定
         this.bind(memberDTO,platformAccount);
         this.bind(memberDTO,platformAccount);
     }
     }
@@ -1029,8 +1045,9 @@ public class UserOperationServiceImpl implements UserOperationService {
      */
      */
     @Override
     @Override
     public UserTvDTO bind(MemberDTO memberDTO, String platformAccount) {
     public UserTvDTO bind(MemberDTO memberDTO, String platformAccount) {
-
+        log.info("bind start");
         MemberDTO memberDTO1 = this.memberService.findByCode(memberDTO.getCode());
         MemberDTO memberDTO1 = this.memberService.findByCode(memberDTO.getCode());
+        log.info("查询会员信息 ==>> {}", memberDTO1);
         if (Objects.nonNull(memberDTO1.getUserIptvId())) {
         if (Objects.nonNull(memberDTO1.getUserIptvId())) {
             UserTvDTO userTvDTO = this.userTvService.findById(memberDTO1.getUserIptvId());
             UserTvDTO userTvDTO = this.userTvService.findById(memberDTO1.getUserIptvId());
             return userTvDTO;
             return userTvDTO;
@@ -1038,6 +1055,7 @@ public class UserOperationServiceImpl implements UserOperationService {
 
 
         // 大屏账户
         // 大屏账户
         UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
         UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
+        log.info("查询大屏账号信息 ==>> {}", userTvDTO);
         if (Objects.isNull(userTvDTO)) {
         if (Objects.isNull(userTvDTO)) {
             throw new BadRequestException(GlobeExceptionMsg.IPTV_IS_NULL);
             throw new BadRequestException(GlobeExceptionMsg.IPTV_IS_NULL);
         }
         }
@@ -1074,6 +1092,10 @@ public class UserOperationServiceImpl implements UserOperationService {
         // 修改会员
         // 修改会员
         MemberDTO _memberDTO = this.doUpdateMemberByMemberDTO(memberDTO);
         MemberDTO _memberDTO = this.doUpdateMemberByMemberDTO(memberDTO);
 
 
+        _memberDTO.setPlatformAccount(platformAccount);
+
+
+        log.info("发送到大屏侧的消息对象 会员信息 ==>> {} || 账号信息 ==>> {}", _memberDTO , _userTvDTO);
         // 同步至iptv
         // 同步至iptv
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncAppletBind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncAppletBind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
 
 

@@ -2,9 +2,12 @@
 spring:
 spring:
   datasource:
   datasource:
 #    测试/演示库url:
 #    测试/演示库url:
-    url: jdbc:log4jdbc:mysql://139.196.192.242:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#    url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_admin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#    username: root
+#    password: root
+    url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_admin_chongshu?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
     username: root
     username: root
-    password: Tjlh@2017
+    password: Tjlh@2021
 
 
     driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     #Druid
     #Druid
@@ -66,7 +69,7 @@ spring:
 #    publisher-confirms: true #如果对异步消息需要回调必须设置为true
 #    publisher-confirms: true #如果对异步消息需要回调必须设置为true
     host: 122.112.214.149 # rabbitmq的连接地址
     host: 122.112.214.149 # rabbitmq的连接地址
     port: 5672 # rabbitmq的连接端口号
     port: 5672 # rabbitmq的连接端口号
-    virtual-host: member_center # rabbitmq的虚拟hosthhh
+    virtual-host: member_center_small_chongshu # rabbitmq的虚拟hosthhh
     username: guest # rabbitmq的用户名
     username: guest # rabbitmq的用户名
     password: guest # rabbitmq的密码
     password: guest # rabbitmq的密码
     publisher-confirms: true #如果对异步消息需要回调必须设置为true
     publisher-confirms: true #如果对异步消息需要回调必须设置为true
@@ -104,8 +107,8 @@ file:
 
 
 service:
 service:
     mq:
     mq:
-      exchange: uce.exchange
-      queue: uce.queue
+      exchange: exchange.MemberInfoSync
+      queue: queue.MemberInfoSync
 
 
 weixin:
 weixin:
   list:
   list: