Merge remote-tracking branch 'origin/v_2.0.0' into v_2.0.0

im-commom/src/main/java/com/bx/imcommon/enums/IMTerminalType.java

@@ -16,7 +16,11 @@ public enum IMTerminalType {
     /**
      * app
      */
-    APP(1, "app");
+    APP(1, "app"),
+    /**
+     * pc
+     */
+    PC(2, "pc");
 
     private final Integer code;
 

im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java

@@ -13,10 +13,10 @@ import javax.validation.constraints.NotNull;
 @ApiModel("用户登录DTO")
 public class LoginDTO {
 
-    @Max(value = 1, message = "登录终端类型取值范围:0,1")
+    @Max(value = 2, message = "登录终端类型取值范围:0,2")
-    @Min(value = 0, message = "登录终端类型取值范围:0,1")
+    @Min(value = 0, message = "登录终端类型取值范围:0,2")
     @NotNull(message = "登录终端类型不可为空")
-    @ApiModelProperty(value = "登录终端 0:web  1:app")
+    @ApiModelProperty(value = "登录终端 0:web 1:app 2:pc")
     private Integer terminal;
 
     @NotEmpty(message = "用户名不可为空")

im-platform/src/main/resources/application.yml

@@ -54,3 +54,4 @@ jwt:
   refreshToken:
     expireIn: 604800 #7天
     secret: IKDiqVmn0VFU
+

im-ui/src/api/wssocket.js

@@ -1,6 +1,7 @@
 var websock = null;
 let rec; //断线重连后，延迟5秒重新创建WebSocket连接  rec用来存储延迟请求的代码
 let isConnect = false; //连接标识 避免重复连接
+let connectCallBack= null;
 let messageCallBack = null;
 let closeCallBack = null
 
@@ -16,6 +17,8 @@ let connect = (wsurl,accessToken) => {
 			let sendInfo = JSON.parse(e.data)
 			if (sendInfo.cmd == 0) {	
 				heartCheck.start()
+				// 登录成功才算真正完成连接
+				connectCallBack && connectCallBack();
 				console.log('WebSocket登录成功')
 			} else if (sendInfo.cmd == 1) {
 				// 重新开启心跳定时
@@ -119,6 +122,9 @@ let sendMessage = (agentData) => {
 	}
 }
 
+let onConnect = (callback) => {
+	connectCallBack = callback;
+}
 
 let onMessage = (callback) => {
 	messageCallBack = callback;
@@ -134,6 +140,7 @@ export {
 	reconnect,
 	close,
 	sendMessage,
+	onConnect,
 	onMessage,
-	onClose
+	onClose,
 }

im-ui/src/view/Home.vue

@@ -80,11 +80,14 @@
 		methods: {
 			init() {
 				this.$store.dispatch("load").then(() => {
-					// 加载离线消息
+					
-					this.loadPrivateMessage(this.$store.state.chatStore.privateMsgMaxId);
-					this.loadGroupMessage(this.$store.state.chatStore.groupMsgMaxId);
 					// ws初始化
 					this.$wsApi.connect(process.env.VUE_APP_WS_URL, sessionStorage.getItem("accessToken"));
+					this.$wsApi.onConnect(()=>{
+						// 加载离线消息
+						this.loadPrivateMessage(this.$store.state.chatStore.privateMsgMaxId);
+						this.loadGroupMessage(this.$store.state.chatStore.groupMsgMaxId);
+					});
 					this.$wsApi.onMessage((cmd, msgInfo) => {
 						if (cmd == 2) {
 							// 关闭ws
@@ -104,7 +107,7 @@
 							// 插入群聊消息
 							this.handleGroupMessage(msgInfo);
 						}
-					})
+					});
 					this.$wsApi.onClose((e) => {
 						console.log(e);
 						if (e.code != 3000) {   

im-ui/src/view/Login.vue

@@ -35,7 +35,7 @@
 					<a class="login-icon" href="https://gitee.com/bluexsx/box-im" target="_blank">
 						<img src="https://gitee.com/bluexsx/box-im/badge/star.svg" />
 					</a>
-					<a class="login-icon" href="https://gitee.com/bluexsx/box-im" target="_blank">
+					<a class="login-icon" href="https://github.com/bluexsx/box-im" target="_blank">
 						<img src="https://img.shields.io/github/stars/bluexsx/box-im.svg?style=flat&logo=GitHub" />
 					</a>
 

im-uniapp/App.vue

@@ -18,9 +18,6 @@
 					this.initAudit();
 					// 初始化websocket
 					this.initWebSocket();
-					// 加载离线消息
-					this.loadPrivateMessage(store.state.chatStore.privateMsgMaxId);
-					this.loadGroupMessage(store.state.chatStore.groupMsgMaxId);
 				}).catch((e) => {
 					console.log(e);
 					this.exit();
@@ -30,6 +27,11 @@
 				let loginInfo = uni.getStorageSync("loginInfo")
 				wsApi.init();
 				wsApi.connect(process.env.WS_URL, loginInfo.accessToken);
+				wsApi.onConnect(() => {
+					// 加载离线消息
+					this.loadPrivateMessage(store.state.chatStore.privateMsgMaxId);
+					this.loadGroupMessage(store.state.chatStore.groupMsgMaxId);
+				});
 				wsApi.onMessage((cmd, msgInfo) => {
 					if (cmd == 2) {
 						// 异地登录，强制下线
@@ -69,8 +71,8 @@
 						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
 						let friendId = msgInfo.selfSend ? msgInfo.recvId : msgInfo.sendId;
 						let friend = store.state.friendStore.friends.find((f) => f.id == friendId);
-						if(friend){
+						if (friend) {
-							this.insertPrivateMessage(friend,msgInfo);
+							this.insertPrivateMessage(friend, msgInfo);
 						}
 					})
 					if (msgInfos.length == 100) {
@@ -91,8 +93,8 @@
 						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
 						let groupId = msgInfo.groupId;
 						let group = store.state.groupStore.groups.find((g) => g.id == groupId);
-						if(group){
+						if (group) {
-							this.insertGroupMessage(group,msgInfo);
+							this.insertGroupMessage(group, msgInfo);
 						}
 					})
 					if (msgInfos.length == 100) {
@@ -119,7 +121,9 @@
 						store.commit("resetUnreadCount", chatInfo)
 					} else {
 						// 对方已读我的消息，修改消息状态为已读
-						store.commit("readedMessage", {friendId:friendId})
+						store.commit("readedMessage", {
+							friendId: friendId
+						})
 
 					}
 					return;

im-uniapp/common/wssocket.js

@@ -2,6 +2,7 @@ let wsurl = "";
 let accessToken = "";
 let messageCallBack = null;
 let closeCallBack = null;
+let connectCallBack = null;
 let isConnect = false; //连接标识 避免重复连接
 let rec = null;
 let isInit = false;
@@ -31,6 +32,7 @@ let init = () => {
 		let sendInfo = JSON.parse(res.data)
 		if (sendInfo.cmd == 0) {
 			heartCheck.start()
+			connectCallBack && connectCallBack();
 			console.log('WebSocket登录成功')
 		} else if (sendInfo.cmd == 1) {
 			// 重新开启心跳定时
@@ -145,6 +147,10 @@ function sendMessage(agentData) {
 	})
 }
 
+let onConnect = (callback) => {
+	connectCallBack = callback;
+}
+
 
 function onMessage(callback) {
 	messageCallBack = callback;
@@ -163,6 +169,7 @@ export {
 	reconnect,
 	close,
 	sendMessage,
+	onConnect,
 	onMessage,
 	onClose
 }