From 321f21c4982c9cec198a27264d722180c79ef913 Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 18:04:35 +0800
Subject: [PATCH] !73 修复全局属性找不到的问题 * Merge remote-tracking branch 'origin/dev' into dev * fix 修复全局属性找不到的问题 * fix 修复变量问题 * 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 | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index b0c6911..d4dd8a8 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -20,6 +20,7 @@
import { getToken } from '@/utils/auth';
import { ElNotification } from 'element-plus';
+import useNoticeStore from '@/store/modules/notice';
let socketUrl: any = ''; // socket鍦板潃
let websocket: any = null; // websocket 瀹炰緥
@@ -27,14 +28,12 @@
let socketHeart = 0 as number; // 蹇冭烦娆℃暟
const HeartTimeOut = 10000; // 蹇冭烦瓒呮椂鏃堕棿 10000 = 10s
let socketError = 0 as number; // 閿欒娆℃暟
-let noticeStore: any = null;
// 鍒濆鍖杝ocket
-export const initWebSocket = (url: any, store: any) => {
+export const initWebSocket = (url: any) => {
if (import.meta.env.VITE_APP_WEBSOCKET === 'false') {
return;
}
- noticeStore = store;
socketUrl = url;
// 鍒濆鍖� websocket
websocket = new WebSocket(url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID);
@@ -99,7 +98,7 @@
export const reconnect = () => {
if (socketError <= 2) {
clearInterval(heartTime);
- initWebSocket(socketUrl, noticeStore);
+ initWebSocket(socketUrl);
socketError = socketError + 1;
// eslint-disable-next-line prettier/prettier
console.log('socket閲嶈繛', socketError);
@@ -124,7 +123,7 @@
if (e.data.indexOf('ping') > 0) {
return;
}
- noticeStore.addNotice({
+ useNoticeStore().addNotice({
message: e.data,
read: false,
time: new Date().toLocaleString()
--
Gitblit v1.9.3