1

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

@@ -159,11 +159,16 @@ 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(),getWxToken());
-            String redisKey2 = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(),request.getSession().getId());
-            log.info("rediskey:{},redisKey2:{}",redisKey,redisKey2);
-            redisUtil.set(redisKey,"1",60 * 60);
-            redisUtil.set(redisKey2,"1",60 * 60);
+            if(StringUtils.isNotBlank(getWxToken())){
+                String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(),getWxToken());
+                redisUtil.set(redisKey,getWxToken(),60 * 60);
+                log.info("rediskey:{}",redisKey);
+            }
+            if(StringUtils.isNotBlank(request.getSession().getId())){
+                String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(),request.getSession().getId());
+                redisUtil.set(redisKey,request.getSession().getId(),60 * 60);
+                log.info("rediskey:{}",redisKey);
+            }
         }
         return ResultData.ok(flag);
     }