From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 16:17:12 +0800
Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/utils/websocket.ts | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 1da8413..7add725 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -20,6 +20,7 @@
import { getToken } from '@/utils/auth';
import useNoticeStore from '@/store/modules/notice';
+import { ElNotification } from 'element-plus';
const { addNotice } = useNoticeStore();
@@ -32,6 +33,9 @@
// 鍒濆鍖杝ocket
export const initWebSocket = (url: any) => {
+ if (import.meta.env.VITE_APP_WEBSOCKET === 'false') {
+ return;
+ }
socketUrl = url;
// 鍒濆鍖� websocket
websocket = new WebSocket(url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID);
@@ -131,7 +135,7 @@
message: e.data,
type: 'success',
duration: 3000
- })
+ });
return e.data;
};
};
--
Gitblit v1.9.3