Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomServiceImpl.java

@@ -471,7 +471,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());
 
             // 注册主播用户信息到三方平台
-            pluginService.register(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar());
+            pluginService.register(imGroupService.getImUserId(sysUser.getId(),ClientEnum.TEACHER), sysUser.getUsername(), sysUser.getAvatar());
             // 创建直播间IM群
             pluginService.chatRoomCreate(room.getRoomUid(), room.getRoomTitle(),sysUser.getId().toString());
             // 腾讯云直播，提前生成录制规则

cooleshow-user/user-classroom/src/main/java/com/yonge/cooleshow/classroom/controller/RoomController.java

@@ -98,22 +98,20 @@ public class RoomController extends BaseController {
             String roomId = eventInfo.getEventInfo().getRoomId();
 
             // 网络教室回调整消息
-            if (roomId.startsWith("S") || roomId.startsWith("I")) {
-                // 进出用户信息
-                String userId = eventInfo.getEventInfo().getUserId();
-                switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
-                    case EVENT_TYPE_ENTER_ROOM:
-                        //成员加入
-                        imNetworkRoomService.joinRoomSuccess(roomId, userId);
-                        break;
-                    case EVENT_TYPE_EXIT_ROOM:
-                        //成员退出
-                        imNetworkRoomService.quitRoomSuccess(roomId, userId);
-                        break;
-                    default:
-                        // 默认事件，直接忽略
-                        break;
-                }
+            // 进出用户信息
+            String userId = eventInfo.getEventInfo().getUserId();
+            switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
+                case EVENT_TYPE_ENTER_ROOM:
+                    //成员加入
+                    imNetworkRoomService.joinRoomSuccess(roomId, userId);
+                    break;
+                case EVENT_TYPE_EXIT_ROOM:
+                    //成员退出
+                    imNetworkRoomService.quitRoomSuccess(roomId, userId);
+                    break;
+                default:
+                    // 默认事件，直接忽略
+                    break;
             }
 
             // 直播课回调消息, roomId.startsWith("LIVE")