From 4f8b6729cc78dd70f9e1be01e620111d3c76e498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Fri, 12 Jan 2024 17:49:16 +0800
Subject: [PATCH] 123

---
 .eslintrc-auto-import.json | 2 +-
 src/hooks/websocket.ts     | 5 -----
 types/auto-imports.d.ts    | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index db04d7f..6b0d505 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -77,4 +77,4 @@
     "watchSyncEffect": true,
     "toValue": true
   }
-}
+}
\ No newline at end of file
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index 4f1f39f..405f571 100644
--- a/src/hooks/websocket.ts
+++ b/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: {
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
index 2ad4739..5bd8e1d 100644
--- a/types/auto-imports.d.ts
+++ b/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 {