diff --git a/im-platform/src/main/resources/application-dev.yml b/im-platform/src/main/resources/application-dev.yml index 51defb0..63ea7d1 100644 --- a/im-platform/src/main/resources/application-dev.yml +++ b/im-platform/src/main/resources/application-dev.yml @@ -8,6 +8,7 @@ spring: redis: host: localhost port: 6379 + database: 1 minio: endpoint: http://127.0.0.1:9001 #内网地址 diff --git a/im-server/src/main/resources/application-dev.yml b/im-server/src/main/resources/application-dev.yml index 3a2a37f..305d30c 100644 --- a/im-server/src/main/resources/application-dev.yml +++ b/im-server/src/main/resources/application-dev.yml @@ -3,4 +3,5 @@ spring: redis: host: 127.0.0.1 port: 6379 + database: 1 diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index fb37a73..98a8802 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -9,12 +9,14 @@ export default { data() { return { + isExit: false, // 是否已退出 audioTip: null, reconnecting: false // 正在重连标志 } }, methods: { init() { + this.isExit = false; // 加载数据 store.dispatch("load").then(() => { // 初始化websocket @@ -62,11 +64,9 @@ }); wsApi.onClose((res) => { console.log("ws断开", res); - // 3099是客户端正常主动关闭 - if (res.code != 3099) { - // 重新连接 - this.reconnectWs(); - } + // 重新连接 + this.reconnectWs(); + }) }, pullPrivateOfflineMessage(minId) { @@ -281,6 +281,7 @@ }, exit() { console.log("exit"); + this.isExit = true; wsApi.close(3099); uni.removeStorageSync("loginInfo"); uni.reLaunch({ @@ -301,6 +302,10 @@ return loginInfo.expireTime < new Date().getTime(); }, reconnectWs() { + // 已退出则不再重连 + if (this.isExit) { + return; + } // 记录标志 this.reconnecting = true; // 重新加载一次个人信息,目的是为了保证网络已经正常且token有效 diff --git a/im-uniapp/pages/chat/chat.vue b/im-uniapp/pages/chat/chat.vue index 933f58f..6aaa9a5 100644 --- a/im-uniapp/pages/chat/chat.vue +++ b/im-uniapp/pages/chat/chat.vue @@ -1,6 +1,5 @@