From d034236ce3a4ef8fee932683aab636fd72565459 Mon Sep 17 00:00:00 2001
From: Lau <1807121535@qq.com>
Date: 星期四, 16 十一月 2023 11:25:35 +0800
Subject: [PATCH] fix: 修改环境变量类型原因导致websocket无法关闭问题
---
src/utils/websocket.ts | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 90e86bf..a4529f9 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);
@@ -115,18 +119,23 @@
// socket 鎺ユ敹鏁版嵁
export const websocketonmessage = () => {
websocket.onmessage = function (e: any) {
- const msg = JSON.parse(e.data) as any;
- if (msg.type === 'heartbeat') {
+ if (e.data.indexOf('heartbeat') > 0) {
resetHeart();
}
- if (msg.type === 'ping') {
+ if (e.data.indexOf('ping') > 0) {
return;
}
addNotice({
- message: msg,
+ message: e.data,
read: false,
time: new Date().toLocaleString()
});
- return msg;
+ ElNotification({
+ title: '娑堟伅',
+ message: e.data,
+ type: 'success',
+ duration: 3000
+ })
+ return e.data;
};
};
--
Gitblit v1.9.3