From 3ec8d3625e6fb7614e2ec4bb02ed99a3cdf4cdb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 12 Feb 2026 11:28:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-app/src/hooks/useGlobalWS.js | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/uniapps/work-app/src/hooks/useGlobalWS.js b/uniapps/work-app/src/hooks/useGlobalWS.js
index caaaa94..a337b9e 100644
--- a/uniapps/work-app/src/hooks/useGlobalWS.js
+++ b/uniapps/work-app/src/hooks/useGlobalWS.js
@@ -6,20 +6,23 @@
const userStore = useUserStore();
const appStore = useAppStore();
const callStatus = ref(null)
+ // token 存储
+ const accessToken = ref('')
// 设置默认用户ID为3
- const defaultUserId = '3';
+ const defaultUserId = '2021475329842999298';
// WebSocket基础URL
- const WS_BASE = 'wss://wrj.shuixiongit.com/ws/chat?userId=';
+ // const WS_BASE = 'wss://wrj.shuixiongit.com/ws/chat?userId=';
+ const WS_BASE = 'ws://218.202.104.82:38201/ws/chat';
// 消息处理
function messageHandler(payload) {
- console.log('🌐 全局WebSocket收到消息111111111111111111111:', payload)
+ // console.log('🌐 全局WebSocket收到消息111111111111111111111:', payload)
// 先尝试直接处理消息（适用于mobile-web-view的voiceCallDetail页面的消息格式）
const t = (payload.type || '').toString()
// const bizCode = payload.biz_code || ''
callStatus.value = t
- console.log('📋 消息分析：type=' + t )
+ // console.log('📋 消息分析：type=' + t )
// 处理语音通话请求
if (t === 'call') {
console.log('📞 全局收到来电 call，来自', payload.from)
@@ -76,11 +79,10 @@
// 初始化WebSocket连接
function initWS() {
+ const userStore = useUserStore()
+ accessToken.value =userStore?.userInfo.access_token
try {
- if (callStatus.value === 'accept') {
- console.log('📞 通话中，跳过WebSocket初始化');
- return;
- }
+
websocketService.setOnMessageCallback(messageHandler);
// 获取当前用户ID，优先使用store中的用户信息
--
Gitblit v1.9.3