强制上线

src/controller/room/index.js

@@ -1,5 +1,5 @@
 import { ROLES, CODEMEG, EVENT, FROMTYPE } from "../../enum/index.js";
-import { getCurrentUser, updateUser, removeRoomAllUsers, getAllRoomUsers, updateRoomUser, removeRoomUser, isUserInRooms } from "../../service/userService.js";
+import { getCurrentUser, updateUser, removeRoomAllUsers, getAllRoomUsers, updateRoomUser, removeRoomUser, isUserInRoom } from "../../service/userService.js";
 // import { watchRoomService } from "../../service/watchRoomService.js";
 import { setRoomConfig, getRoomConfig, updateRoomConfigByKey, isRoomMaster } from "../../service/roomConfigService.js";
 
@@ -131,7 +131,7 @@ export class RoomController extends BasicController {
       console.log("roomId", this.roomId);
       this.socket.join(this.roomId);
 
-      const isInRoom = await isUserInRooms(this.roomId, this.userId);
+      const isInRoom = await isUserInRoom(this.roomId, this.userId);
       console.log("测试-强制上线", isInRoom, this.roomId, this.userId);
       if (isInRoom) {
         if (Number(isInRoom.onlineStatus) === 0) {

src/service/userService.js

@@ -52,14 +52,16 @@ const getAllRoomUsers = async (roomId) => {
   });
 };
 
-const isUserInRooms = async (roomId, userId) => {
+const isUserInRoom = async (roomId, userId) => {
   return new Promise(async (resolve) => {
     const AllRoomUsers = await pubClient.hVals(getInKey(roomId));
+    console.log("isUserInRoom-1", AllRoomUsers);
     const hasUser = Array.from(AllRoomUsers)
       .map((i) => JSON.parse(i))
       .find((u) => u.userId === userId);
+    console.log("isUserInRoom-2", hasUser);
     return resolve(hasUser || false);
   });
 };
 
-export { getCurrentUser, updateUser, updateRoomUser, removeRoomAllUsers, removeRoomUser, getAllRoomUsers, isUserInRooms };
+export { getCurrentUser, updateUser, updateRoomUser, removeRoomAllUsers, removeRoomUser, getAllRoomUsers, isUserInRoom };