From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/websocket/util/config.ts | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/websocket/util/config.ts b/src/websocket/util/config.ts
index 46c8c2e..23b708b 100644
--- a/src/websocket/util/config.ts
+++ b/src/websocket/util/config.ts
@@ -1,8 +1,18 @@
import { ELocalStorageKey } from '/@/types/enums'
import { CURRENT_CONFIG } from '/@/api/http/config'
+const user = localStorage.getItem('user_info')
+
export function getWebsocketUrl () {
const token: string = localStorage.getItem(ELocalStorageKey.Token) || '' as string
- const url = CURRENT_CONFIG.websocketURL + '?x-auth-token=' + encodeURI(token)
+ const url = CURRENT_CONFIG.websocketURL
+ // const url = CURRENT_CONFIG.websocketURL + '?Authorization=' + encodeURI(token)
+ return url
+}
+
+// 我们自己的webSocket逻辑
+export function getMyWebSocketUrl () {
+ const obj = JSON.parse(user)
+ const url = CURRENT_CONFIG.websocketURL + '/' + obj.id
return url
}
--
Gitblit v1.9.3