Merge branch 'feature/1020-tencent-im' into test

mec-application/src/main/java/com/ym/mec/web/controller/education/SysMusicCompareRecordController.java

@@ -42,7 +42,7 @@ public class SysMusicCompareRecordController extends BaseController {
             return failed("请设置功能点");
         }
         record.setUserId(sysUser.getId());
-        record.setClientId("com/ym/app/web/controller/education");
+        record.setClientId("education");
         return succeed(sysMusicCompareRecordService.insert(record));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -6231,7 +6231,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
             for (CourseSchedule courseSchedule : scheduleList) {
                 try {
-                    RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(courseSchedule.getServiceProvider());
+                    RTCRoomPluginService pluginService;
+                    if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
+                        pluginService = rtcRoomPluginContext.getPluginService();
+                    } else {
+                        pluginService = rtcRoomPluginContext.getPluginService(courseSchedule.getServiceProvider());
+                    }
                     // 群组帐号注册
                     Teacher teacher = teacherDao.get(courseSchedule.getTeacherId());
                     if (Objects.nonNull(teacher)) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -1481,7 +1481,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             String content = jsonObject.getString("content");
 
             // http开头的链接 扩展字段没有值 放在扩展字段里
-            if (content.startsWith("http")) {
+            if (StringUtils.isNotBlank(content) && content.startsWith("http")) {
                 String extra = jsonObject.getString("extra");
                 if (StringUtils.isEmpty(extra)) {
                     jsonObject.put("extra", content);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -2263,6 +2263,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                     throw new BizException("当前用户存在更早的待直播的房间");
                 }*/
 
+                ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
                 //去融云创建房间
                 LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());
 
@@ -2272,6 +2273,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 // 创建直播间IM群
                 pluginService.chatRoomCreate(room.getRoomUid(), room.getRoomTitle(),imGroupCoreService.getImUserId(sysUser.getId().toString(),room.getClientType().getCode()));
 
+                // 设置直播间房间属性默认值
+                setDefaultRoomDefinedInfo(roomVo);
                 createSpeakerInfo(room, sysUser);
                 Boolean whetherVideoFlag = getRoomConfig(room.getRoomConfig()).map(o -> o.getWhether_video() == 0).orElse(true);
 
@@ -2320,15 +2323,12 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                                                                         .eq(ImLiveRoomBlack::getRoomUid, room.getRoomUid())
                                                                         .list();
 
-                ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
                 if (CollectionUtils.isNotEmpty(blackList)) {
                     // 将黑名单人员踢出房间
                     for (ImLiveRoomBlack black : blackList) {
                         imLiveRoomBlackService.setBlack(black.getUserId(),roomVo);
                     }
                 }
-                // 设置直播间房间属性默认值
-                setDefaultRoomDefinedInfo(roomVo);
             } finally {
                 if (lock.getHoldCount() != 0 && lock.isHeldByCurrentThread()) {
                     lock.unlock();
@@ -2398,6 +2398,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                                                                                    .groupId(roomVo.getRoomUid())
                                                                                    .appDefinedData(appDefinedData)
                                                                                    .build());
+            log.info("设置直播群配置成功 roomUid:{}", roomVo.getRoomUid());
         } catch (Exception e) {
             log.error("设置直播群配置失败", e);
         }