刘俊驰 11 meses atrás
pai
commit
63fa1d0061

+ 5 - 8
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -251,10 +251,8 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         if(userRole.RoleTeacher == userRole){
             clientType = "TEACHER";
         }
-        if (StringUtils.isNotBlank(imConfig.getAppPrefix()) && !imUserId.startsWith(imConfig.getAppPrefix())) {
-            imUserId = MessageFormat.format("{0}_{1}_{2}", imConfig.getAppPrefix(), userId.toString(), clientType);
-        }
-        return imUserId;
+
+        return getImUserId(imUserId,clientType);
     }
 
     @Override
@@ -264,10 +262,9 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         if(clientEnum.TEACHER == clientEnum){
             clientType = "TEACHER";
         }
-        if (StringUtils.isNotBlank(imConfig.getAppPrefix()) && !imUserId.startsWith(imConfig.getAppPrefix())) {
-            imUserId = MessageFormat.format("{0}_{1}_{2}", imConfig.getAppPrefix(), userId.toString(), clientType);
-        }
-        return imUserId;
+
+
+        return getImUserId(imUserId,clientType);
     }
 
 

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

@@ -548,7 +548,10 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 
                 }
                 // 设置直播间房间属性默认值
-                setDefaultRoomDefinedInfo(room);
+                List<TencentWrapper.ChatRoomGroupCounter> chatRoomGroupDefinedData = pluginService.getChatRoomGroupDefinedData(room.getRoomUid());
+                if (CollectionUtils.isEmpty(chatRoomGroupDefinedData)) {
+                    setDefaultRoomDefinedInfo(room);
+                }
             }
         } catch (Exception e) {
             throw new BizException("创建直播间失败!", e);