Merge branch 'dev_20230222_live' into master_saas

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

@@ -927,8 +927,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 // 直播间用户离开状态
                 roomMember.setLiveRoomStatus(0);
 
-                // 直播间用户离开直播间消息
-                sendLiveRoomLoginOutMessage(userid, roomVo);
             }
 
             // 更新用户在线状态为离线
@@ -939,6 +937,10 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                     .update(roomMember);
 
             log.info("opsRoom>>>> looker userInfo: {}", JSONObject.toJSONString(userInfo));
+
+            // 直播间用户离开直播间消息
+            sendLiveRoomLoginOutMessage(userid, roomVo);
+
             // 在线用户消息同步
             sendOnlineUserCount(roomVo, userId, onlineUserInfo.size());
 
@@ -1033,9 +1035,9 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         try {
             // 黑名单才发送退出消息
             //用户离开直播间发送退出房间消息给主讲人
-            if (!imLiveRoomBlackService.checkBlackUser(Integer.parseInt(userid), roomVo.getRoomUid())) {
-                return;
-            }
+            // if (!imLiveRoomBlackService.checkBlackUser(Integer.parseInt(userid), roomVo.getRoomUid())) {
+            //     return;
+            // }
             LivePluginService pluginService = livePluginContext.getPluginService(roomVo.getServiceProvider());
             pluginService.sendChatRoomMessage(message);