123

src/hooks/websocket.ts

@@ -19,11 +19,6 @@ const useAdminWebSocket = () => {
     const baseUri = import.meta.env.VITE_API_URL
     const host = window.location.host
     const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
-<<<<<<< HEAD
-=======
-    console.log(wsUri, 'wsUri')
->>>>>>> 5f87413450a7cc2d78ad58061d92f900031ae1f9
-
     //使用useWebSocket函数创建WebSocket连接，并配置自动重连和心跳机制
     useWebSocketReturn = useWebSocket(wsUri, {
       autoReconnect: {

types/auto-imports.d.ts

@@ -1,7 +1,6 @@
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
-// noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
 export {}
 declare global {