From d0e6d52ec07365328ca235f948bf5c0c93c72ea7 Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Sun, 20 Nov 2022 23:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/api/wssocket.js |  8 ++++----
 im-ui/src/view/Home.vue   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/im-ui/src/api/wssocket.js b/im-ui/src/api/wssocket.js
index 0bf7300..f860a9a 100644
--- a/im-ui/src/api/wssocket.js
+++ b/im-ui/src/api/wssocket.js
@@ -19,20 +19,20 @@ let initWebSocket = () => {
 		hasLogin = false;
 		websock = new WebSocket(wsurl);
 		websock.onmessage = function(e) {
-			let msg = JSON.parse(e.data)
-			if (msg.cmd == 0) {
+			let sendInfo = JSON.parse(e.data)
+			if (sendInfo.cmd == 0) {
 				hasLogin = true;
 				heartCheck.start()
 				console.log('WebSocket登录成功')
 				// 登录成功才算连接完成
 				openCallBack && openCallBack();
 			}
-			else if(msg.cmd==1){
+			else if(sendInfo.cmd==1){
 				// 重新开启心跳定时
 				heartCheck.reset();
 			} else {
 				// 其他消息转发出去
-				messageCallBack && messageCallBack(JSON.parse(e.data))
+				messageCallBack && messageCallBack(sendInfo.cmd,sendInfo.data)
 			}
 		}
 		websock.onclose = function(e) {
diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index 4bc2a62..86b836e 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -67,20 +67,20 @@
 				this.$wsApi.onopen(() => {
 					this.pullUnreadMessage();
 				});
-				this.$wsApi.onmessage((e) => {
-					if (e.cmd == 2) {
+				this.$wsApi.onmessage((cmd,msgInfo) => {
+					if (cmd == 2) {
 						// 异地登录，强制下线
 						this.$message.error("您已在其他地方登陆，将被强制下线");
 						setTimeout(() => {
 							location.href = "/";
 						}, 1000)
 
-					} else if (e.cmd == 3) {
+					} else if (cmd == 3) {
 						// 插入私聊消息
-						this.handlePrivateMessage(e.data);
-					} else if (e.cmd == 4) {
+						this.handlePrivateMessage(msgInfo);
+					} else if (cmd == 4) {
 						// 插入群聊消息
-						this.handleGroupMessage(e.data);
+						this.handleGroupMessage(msgInfo);
 					}
 				})
 			},