1

src/main/java/com/fdkankan/tk/controller/RoomController.java

@@ -43,7 +43,7 @@ public class RoomController extends BaseController{
      */
     @GetMapping("/roomInfo")
     public ResultData roomInfo(@RequestParam(required = false) String roomId){
-        return ResultData.ok(roomService.getRoomInfo(roomId,getToken(),getWxToken(),request.getSession().getId()));
+        return ResultData.ok(roomService.getRoomInfo(roomId,getToken(),getWxToken()));
     }
     /**
      * 房间访问次数 +1
@@ -159,7 +159,7 @@ public class RoomController extends BaseController{
         String pwd = MD5.create().digestHex(room.getVisitPassword());
         Boolean flag = pwd.equals(param.getPassword());
         if(flag){
-            String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(), request.getSession().getId());
+            String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(),param.getWxToken());
             redisUtil.set(redisKey,"1",60 * 60);
         }
         return ResultData.ok(flag);

src/main/java/com/fdkankan/tk/request/CheckRoomPasswordParam.java

@@ -6,4 +6,5 @@ import lombok.Data;
 public class CheckRoomPasswordParam {
     private String  roomId;
     private String password;
+    private String wxToken;
 }

src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -30,7 +30,7 @@ public interface IRoomService extends IService<Room> {
 
     void deleteById(String roomId);
 
-    RoomVo getRoomInfo(String roomId,String token,String wxToken,String sessionId);
+    RoomVo getRoomInfo(String roomId,String token,String wxToken);
     Boolean checkCanDel(Room room);
 
     String getWxQrCode(String roomId,String type);

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -222,7 +222,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public RoomVo getRoomInfo(String roomId,String token,String wxToken,String sessionId) {
+    public RoomVo getRoomInfo(String roomId,String token,String wxToken) {
         log.info("getRoomInfo-request-roomId:{},token:{},wxToken:{}",roomId,token,wxToken);
         String roomUserId = null;
         if(roomId.contains("_")){
@@ -246,7 +246,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         }
         try {
             if(StringUtils.isNotBlank(wxToken)){
-                String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(), sessionId);
+                String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(), wxToken);
                 if(redisUtil.hasKey(redisKey)){
                     roomVo.setTakeLookLock(0);
                 }
@@ -296,7 +296,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             }
         }
         if(type.equals("leader")){                          //检查房间场景可用性
-            RoomVo roomVo = this.getRoomInfo(roomId,null,null,null);
+            RoomVo roomVo = this.getRoomInfo(roomId,null,null);
             List<SceneVo> sceneData = roomVo.getSceneData();
             for (SceneVo sceneDatum : sceneData) {
                 if(sceneDatum.getStatus() != 2){