123

ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RedisConstant.java

@@ -2,6 +2,7 @@ package com.ruoyi.cai.ws.constant;
 
 public class RedisConstant {
     public static final String REDIS_P = "caiws-";
+    public static final String WS_TOKEN = REDIS_P + "wxToken:%s";
     public static final String ONLINE_ROOM_DATA = REDIS_P + "onlineRoomData";
     public static final String ROOM_DATA = REDIS_P + "roomData:%s";
     public static final String FDCTX_DATA = REDIS_P + "fdctx:%s";

ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RoomStatusEnums.java

@@ -8,7 +8,7 @@ public enum RoomStatusEnums {
     /**
      * 刚创建
      */
-    STATUS_CREATE(0,"刚创建"),
+    STATUS_CREATE(0,"创建通话"),
     /**
      * 呼叫方连接上
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/ws/dto/WsToken.java

@@ -0,0 +1,10 @@
+package com.ruoyi.cai.ws.dto;
+
+import lombok.Data;
+
+@Data
+public class WsToken {
+    private Long roomId;
+    private Long fromUid;
+    private Long toUid;
+}

ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java

@@ -59,7 +59,7 @@ public class WebSocketManager {
         if(userCall == null){
             throw new ServiceException("无效房间");
         }
-        Room room = checkOnlineRoom(userCall.getFromUid(), userCall.getToUid());
+        Room room = this.checkOnlineRoom(userCall.getFromUid(), userCall.getToUid());
         if(room != null && room.isCanCall()){ // 缓存中存在旧房间，直接返回
             return room.getRoomId();
         }