zouxuan 2 years ago
parent
commit
9448c47846

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/RoomService.java

@@ -23,7 +23,7 @@ public interface RoomService extends IService<ImNetworkRoom> {
     ImNetworkRoom initRoom(String roomId, RoleEnum userRole, Long userId) throws Exception;
 
     //获取腾讯相关房间配置信息
-    RTCRoomConfig getRtcRoomConfig(String serviceProvider, BasicUserInfo basicUserInfo);
+    RTCRoomConfig getRtcRoomConfig(String serviceProvider, ImNetworkRoomMember roomMember);
 
     //用户成功推出房间
     void quitRoomSuccess(RoleEnum roleEnum, ImNetworkRoomMember roomMember, String serviceProvider) throws Exception;

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -157,7 +157,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         imGroupService.joinImGroup(roomId, basicUserInfo,
                 courseSchedule.getServiceProvider(), studentIds);
         //获取腾讯所需基本信息配置
-        joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),sysUser));
+        joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),roomMember));
         joinRoomResult.setGroupId(roomId);
         return BaseResponse.success(joinRoomResult);
     }
@@ -208,7 +208,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         //课程结束后关闭教室的时间
         joinRoomResult.setAutoCloseNetworkRoomTime(sysConfigDao.findConfigValue(SysConfigConstant.DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE));
         //获取腾讯所需基本信息配置
-        joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),sysUser));
+        joinRoomResult.setRtcRoomConfig(roomService.getRtcRoomConfig(courseSchedule.getServiceProvider(),roomMember));
         joinRoomResult.setGroupId(roomId);
         return BaseResponse.success(joinRoomResult);
     }

+ 4 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RoomServiceImpl.java

@@ -89,17 +89,17 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public RTCRoomConfig getRtcRoomConfig(String serviceProvider, BasicUserInfo basicUserInfo) {
+    public RTCRoomConfig getRtcRoomConfig(String serviceProvider, ImNetworkRoomMember roomMember) {
         RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(serviceProvider);
         if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(serviceProvider) || StringUtils.isEmpty(serviceProvider)) {
             // 腾讯云RTC
             // 用户IM帐号创建
             try {
-                pluginService.register(basicUserInfo.getImUserId(), basicUserInfo.getRealName(), basicUserInfo.getAvatar());
+                pluginService.register(roomMember.getImUserId(), roomMember.getUsername(), roomMember.getAvatar());
             } catch (Exception e) {
-                log.error("直播房间用户注册失败: userId={}", basicUserInfo.getUserId(), e);
+                log.error("直播房间用户注册失败: userId={}", roomMember.getImUserId(), e);
             }
-            return rtcRoomPluginContext.getPluginService().getRTCRoomConfig(String.valueOf(basicUserInfo.getUserId()));
+            return rtcRoomPluginContext.getPluginService().getRTCRoomConfig(roomMember.getImUserId());
         }
         return new RTCRoomConfig();
     }