update

.env.development

@@ -4,8 +4,8 @@ VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
 VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.5.0
-# VITE_APP_SOCKET_URL=ws://127.0.0.1:8889
-VITE_APP_SOCKET_URL=wss://testws.4dkankan.com
+VITE_APP_SOCKET_URL=ws://127.0.0.1:8889
+# VITE_APP_SOCKET_URL=wss://testws.4dkankan.com
 # VITE_APP_SOCKET_URL=wss://221.4.210.172:16666
 # 静态资源目录
 VITE_APP_STATIC_DIR=viewer

src/components/chatRoom/roomControl.ts

@@ -7,6 +7,7 @@ import type { SocketParams } from '/@/store/modules/rtc';
 import Dialog from '/@/components/basic/dialog';
 import { useRoom } from '/@/hooks/useRoom';
 import { useI18n } from '/@/hooks/useI18n';
+import dayjs from 'dayjs';
 // 所有socket业务事件集中点
 const { t } = useI18n();
 export function initSocketEvent(socket: SocketIOClient.Socket): void {
@@ -24,10 +25,23 @@ export function initSocketEvent(socket: SocketIOClient.Socket): void {
       if (rtcStore.role === 'leader') {
         const { room } = useRoom();
         const limit = unref(room)?.maxMan || 10;
-        params.roomConfig = {
-          masterId: rtcStore.userId,
-          limit: limit,
-        };
+        const useEndTime = unref(room)?.useEndTime || '';
+        console.log('unref(room)', unref(room));
+        if (useEndTime) {
+          const now = dayjs();
+          const roomEnd = dayjs(useEndTime);
+          const ttl = roomEnd.diff(now, 'second');
+          params.roomConfig = {
+            masterId: rtcStore.userId,
+            limit: limit,
+            ttl: ttl,
+          };
+        } else {
+          params.roomConfig = {
+            masterId: rtcStore.userId,
+            limit: limit,
+          };
+        }
       }
       socket.emit('join', params);
     });

src/hooks/useRoom.ts

@@ -28,6 +28,7 @@ export interface SceneItemType {
   bind: boolean;
   takeLookLock: number;
   maxMan: number;
+  useEndTime: string;
 }
 
 export const room = ref<Nullable<roomDataType>>(null);
@@ -109,7 +110,6 @@ const shopAxios = axios.create({
 export const initialRoom = async () => {
   const res = await shopAxios.get('/takelook/roomInfo', { params: { roomId } });
   room.value = res.data.data;
-  console.log('initialRoom', unref(room));
 };
 
 export const enterRoom = async () => {

src/store/modules/rtc.ts

@@ -74,6 +74,7 @@ export type RoleType = 'leader' | 'customer';
 interface RoomConfigType {
   limit: number;
   masterId: string;
+  ttl?: number;
 }
 
 // type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N