Merge branch 'fix/0907' into master_saas

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -130,6 +130,12 @@ public class UserController {
             callbackOnMemberStateChange.setClientIP(clientIP);
             callbackOnMemberStateChange.setOptPlatform(optPlatform);
             if (callbackOnMemberStateChange.getGroupId().startsWith("LIVE")) {
+                for (TencentData.MemberListDTO memberListDTO : callbackOnMemberStateChange.getMemberList()) {
+
+                    if (!imGroupService.checkImUserId(memberListDTO.getMemberAccount())) {
+                        return new TencentImCallbackResult();
+                    }
+                }
                 // 直播间成员状态变更
                 imLiveBroadcastRoomService.callbackOnMemberStateChange(callbackOnMemberStateChange);
 
@@ -183,6 +189,12 @@ public class UserController {
             callbackAfterMemberExit.setOptPlatform(optPlatform);
 
             if (callbackAfterMemberExit.getGroupId().startsWith("LIVE")) {
+                for (TencentData.MemberListDTO memberListDTO : callbackAfterMemberExit.getExitMemberList()) {
+
+                    if (!imGroupService.checkImUserId(memberListDTO.getMemberAccount())) {
+                        return new TencentImCallbackResult();
+                    }
+                }
                 // 直播间成员状态变更
                 imLiveBroadcastRoomService.callbackAfterMemberExit(callbackAfterMemberExit);
 
@@ -219,6 +231,12 @@ public class UserController {
             callbackAfterNewMemberJoin.setOptPlatform(optPlatform);
 
             if (callbackAfterNewMemberJoin.getGroupId().startsWith("LIVE")) {
+                for (TencentData.MemberListDTO memberListDTO : callbackAfterNewMemberJoin.getNewMemberList()) {
+
+                    if (!imGroupService.checkImUserId(memberListDTO.getMemberAccount())) {
+                        return new TencentImCallbackResult();
+                    }
+                }
                 // 直播间成员状态变更
                 imLiveBroadcastRoomService.callbackAfterNewMemberJoin(callbackAfterNewMemberJoin);
 
@@ -233,9 +251,6 @@ public class UserController {
                     // 学生编号
                     String userId = callbackAfterNewMemberJoin.getNewMemberList().get(0).getMemberAccount();
 
-                    if (!imGroupService.checkImUserId(userId)) {
-                        return new TencentImCallbackResult();
-                    }
                     try {
                         roomService.joinRoomSuccess(roomId, userId, null);
                     } catch (Exception e) {