@aochuang/client-sdk 1.0.363 → 1.0.365

package/services/client-chat/client-chat-wework/client-chat-session.js

@@ -82,8 +82,7 @@ export default class ClientChatSession {
 		/**
 		 * 删除会话
 		*/
-		deleteSessionMethod: null,
-		modifiedAccountMap: {}
+		deleteSessionMethod: null
 	})
 	
 	accountIds = []
@@ -120,23 +119,6 @@ export default class ClientChatSession {
 		return this.data.loading
 	}
 	
-	isModify (qwAccountId) {
-		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
-	}
-
-	markModify (qwAccountIds) {
-		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
-		ids.filter(Boolean).forEach(id => {
-			Vue.set(this.data.modifiedAccountMap, id, true)
-		})
-	}
-
-	unmarkModify (qwAccountId) {
-		if (qwAccountId) {
-			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
-		}
-	}
-
 	get loadAssignTaskSessioning () {
 		return this.data.loadAssignTaskSessioning
 	}
@@ -223,35 +205,6 @@ export default class ClientChatSession {
 	getSessionByLocal (sessionId) {
 		return this.sessionMap[sessionId]
 	}
-
-	/**
-	 * 强制从服务端刷新会话，绕过本地缓存。
-	 */
-	refreshSession (sessionId) {
-		if (!sessionId) {
-			return Promise.reject('缺少会话id')
-		}
-		return this.getSessionMethod({
-			id: sessionId
-		}).then(rs => {
-			if (!rs || !rs.data) {
-				return Promise.reject('未找到会话' + sessionId)
-			}
-			// 事件计算出的 sessionId 是本地索引，始终保持与服务端返回对象一致。
-			const serverSession = Object.assign({}, rs.data, {
-				id: sessionId
-			})
-			const localSession = this.getSessionByLocal(sessionId)
-			if (localSession) {
-				this.updateSession(sessionId, serverSession)
-			} else {
-				this.addSession(serverSession)
-			}
-			return Object.assign({}, rs, {
-				data: serverSession
-			})
-		})
-	}
 	
 	findSession (findFn) {
 		let result 
@@ -465,9 +418,6 @@ export default class ClientChatSession {
 			}
 		}
 		delete this.sessionMap[id]
-		if (this.data.currentSessionId === id) {
-			this.data.currentSessionId = null
-		}
 		if (checkLastUpdateSession !== false) {
 			// todo 后面可能会删掉这块的逻辑，因为后端排序逻辑变了
 			this.checkAndUpdateLastUpdateSession()
@@ -612,9 +562,7 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						if (index >= 0) {
-							this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
-						}
+						this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
 					}
 				})
 				// 按照新的时间来分组排序
@@ -687,9 +635,7 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						if (index >= 0) {
-							this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
-						}
+						this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
 					}
 				})
 				// 所有的
@@ -969,7 +915,6 @@ export default class ClientChatSession {
 		this.data.sessionData = {}
 		this.data.sessionGroupData = {}
 		this.data.sessionMuteMap = {}
-		this.data.modifiedAccountMap = {}
 		// this.data.sessionUnreadCountMap = {}
 		this.sessionMap = {}
 		if (this.cancelLoadDataRequest) {
@@ -981,4 +926,4 @@ export default class ClientChatSession {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

package/services/client-chat/client-chat-wework/client-chat-socket.js

@@ -15,16 +15,11 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
-			onCmdQwContactInfoChanged: null,
-			onCmdQwContactRequestChanged: null,
-			onCmdQwAcceptContactRequest: null,
-			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
 			onCmdChatroomInfoChanged: null,
 			onCmdChatroomInfoChangedBatch: null,
-			onHeartbeatSuccess: null,
 			onHeartbeatCheck: null
 		}, options)
 		if (!options.socket) {
@@ -32,13 +27,6 @@ export default class ClietChatSocket {
 		}
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
-		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
-		this.socket.event.on('onCmdQwContactRequestChanged', options.onCmdQwContactRequestChanged)
-		this.socket.event.on('onCmdQwAcceptContactRequest', options.onCmdQwAcceptContactRequest)
-		this.socket.event.on('onCmdQwRoomInfoChanged', options.onCmdQwRoomInfoChanged)
-		this.socket.event.on('onHeartbeatSuccess', (evt) => {
-			options.onHeartbeatSuccess && options.onHeartbeatSuccess(evt)
-		})
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams
@@ -74,4 +62,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}

package/services/client-chat/client-chat-wework/client-chat.js

@@ -32,7 +32,6 @@ class ClientChat {
 			getLoginUserIdMethod: null,
 			getLoginUserTokenMethod: null,
 			loadAccountDataMethod: null,
-			getLoginAccountIdMethod: null, // 因为1.0有帮聊逻辑，帮聊消息以及通讯录的accountId不是登录用户的accountId，会导致找到的会话出现问题，所以这里提供一个方法让外部传入
 			loadSessionDataMethod: null,
 			updateSessionReadMethod: null,
 			getSessionMethod: null,
@@ -40,7 +39,6 @@ class ClientChat {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
-			getAccountGreetingUnreadMsgCountMethod: null,
 			loadContactsRoomGroupDataMethod: null,
 			loadContactsFriendGroupDataMethod: null,
 			loadContactsFriendDataMethod: null,
@@ -52,7 +50,6 @@ class ClientChat {
 			getContactsRoomMethod: null, 
 			loadFriendMessageDataMethod: null, 
 			loadRoomMessageDataMethod: null,
-			checkMessageSendResultMethod: null,
 			onOverwriteFriendInfoChange: null // 为了兼容1.0拉取会话逻辑加的，1.0暂时不支持根据taskId拉取
 		}, options)
 		if (!options.loadFriendMessageDataMethod) {
@@ -60,9 +57,8 @@ class ClientChat {
 		} 
 		if (!options.loadRoomMessageDataMethod) {
 			throw new Error('loadRoomMessageDataMethod不能为空')
-		}
+		} 
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
-		this.getLoginAccountIdMethod = options.getLoginAccountIdMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -89,10 +85,8 @@ class ClientChat {
 			groupField: 'contactId',
 			sortField: 'sendTime',
 			clientChat: this,
-			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			onAddMessageSuccess: ({ data }) => {
-				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
-				let sessionId = createSessionId(accountId, data.contactId)
+				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.contactId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -106,15 +100,6 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
-						if (rs && rs.data && !rs.data.unreadMsgCount) {
-							rs.data.unreadMsgCount = data.isSend ? 0 : 1
-							rs.data.lastMsgContent = data.content
-							rs.data.lastMsgType = data.msgType
-							rs.data.lastMsgTime = data.sendTime
-							rs.data.lastMsgId = data.id
-							rs.data.lastUpdateTime = data.updateDate
-						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -159,7 +144,7 @@ class ClientChat {
 			groupField: 'contactId',
 			sortField: 'sendTime',
 			clientChat: this,
-			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			// checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			// loadLossMessageDataMethod: options.loadLossFriendMessageDataMethod,
 			queryMethod: (params) => {
 				return options.loadFriendMessageDataMethod(params)
@@ -169,10 +154,8 @@ class ClientChat {
 			groupField: 'roomId',
 			sortField: 'sendTime',
 			clientChat: this,
-			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			onAddMessageSuccess: ({ data }) => {
-				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
-				let sessionId = createSessionId(accountId, data.roomId)
+				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.roomId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -187,15 +170,6 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
-						if (rs && rs.data && !rs.data.unreadMsgCount) {
-							rs.data.unreadMsgCount = data.isSend ? 0 : 1
-							rs.data.lastMsgContent = data.content
-							rs.data.lastMsgType = data.msgType
-							rs.data.lastMsgTime = data.sendTime
-							rs.data.lastMsgId = data.id
-							rs.data.lastUpdateTime = data.updateDate
-						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -240,7 +214,7 @@ class ClientChat {
 			groupField: 'roomId',
 			sortField: 'sendTime',
 			clientChat: this,
-			checkMessageSendResultMethod: options.checkMessageSendResultMethod,
+			// checkMessageSendResultMethod: options.checkMessageSendResultMethod,
 			// loadLossMessageDataMethod: options.loadLossRoomMessageDataMethod,
 			queryMethod: (params) => {
 				return options.loadRoomMessageDataMethod(params)
@@ -263,18 +237,12 @@ class ClientChat {
 			loadAccountDataMethod: options.loadAccountDataMethod,
 			getAccountUnreadMessageNumMethod: options.getAccountUnreadMessageNumMethod,
 			updateAccountMessageReadMethod: options.updateAccountMessageReadMethod,
-			getAccountGreetingUnreadMsgCountMethod: options.getAccountGreetingUnreadMsgCountMethod,
 			onAccountAdded: ({ account }) => {
 				return this.account.refreshAccountUnreadMessageNum({
 					qwAccountId: account.id,
 					corpId: account.corpId
 				})
 			},
-			onAccountLoaded: () => {
-				if (options.getAccountGreetingUnreadMsgCountMethod) {
-					this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
-				}
-			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				this.contacts.refreshAllFriendGroupCount({
 					qwAccountId: currentAccount ? currentAccount.id : null
@@ -290,95 +258,6 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
-			onCmdQwContactRequestChanged: ({ data } = {}) => {
-				// {
-				// 	"cmdType": CmdQwContactRequestChanged
-				// 	"seq": 123,
-				// 	"cmdType": "CmdQwContactRequestChanged",
-				// 	"changeType": 1,
-				// 	"record": { ...QwContactRequestRecordDto... 
-				// }
-				// changeType：1 = 新增、2 = 状态变化（值来自 ChangeTypeEnum，序列化为数字）
-				// 触发时机：新同步到一条好友请求 → changeType=1；之后每次状态流转（1/2/3/4）→ changeType=2
-				// 推送目标：该记录 accountId 对应的客服端。若该请求未分配客服（设备无保管者）则不推送，前端不能依赖推送判断「没有新的好友请求」
-				// 新增和状态流转都会影响待处理数量，刷新对应账号的好友请求数
-				this.refreshGreetingUnreadMsgCountByPush(data)
-			},
-			onCmdQwAcceptContactRequest: ({ data } = {}) => {
-				// CmdQwAcceptContactRequest 请求字段不变（qwAccountId、remoteId），错误提示文案不变。但点击通过后状态立即变为 1（请求中），需等设备回执：超时→2、失败→3、成功→4。原来把「通过成功」判断为 2 的逻辑必须改成 4
-				this.refreshGreetingUnreadMsgCountByPush(data)
-			},
-			onCmdQwContactInfoChanged: ({ data }) => {
-				const contacts = data && (Array.isArray(data.contacts)
-					? data.contacts
-					: (data.contactId ? [data] : []))
-				if (!contacts || !contacts.length) {
-					this.markAccountsModified(data && data.qwAccountIds)
-					return
-				}
-				const tasks = []
-				const removedTasks = []
-				contacts.forEach(contact => {
-					if (!contact) {
-						return
-					}
-					const changeType = Number(contact.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwContactAdded(contact, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwContactUpdated(contact))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwContactRemoved(contact, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
-					const accountUnreadCountMap = {}
-					removedTasks.forEach((task, index) => {
-						const result = results[tasks.length + index]
-						if (!result || !result.accountId || !result.unreadCount) {
-							return
-						}
-						accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
-					})
-					return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
-						const removedUnreadCount = accountUnreadCountMap[accountId]
-						return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-							return Math.max(0, unreadMesasgeNum - removedUnreadCount)
-						}).catch(error => {
-							console.warn('[client-chat] update account unread count failed', error)
-						})
-					}))
-				})
-			},
-			onCmdQwRoomInfoChanged: ({ data }) => {
-				const rooms = data && (Array.isArray(data.rooms)
-					? data.rooms
-					: (data.roomId ? [data] : []))
-				if (!rooms || !rooms.length) {
-					this.markAccountsModified(data && data.qwAccountIds)
-					return
-				}
-				const tasks = []
-				const removedTasks = []
-				rooms.forEach(room => {
-					if (!room) {
-						return
-					}
-					const changeType = Number(room.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwRoomAdded(room, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwRoomUpdated(room))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwRoomRemoved(room, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
-					return this.updateRemovedSessionUnreadCounts(
-						results.slice(tasks.length)
-					)
-				})
-			},
 			// 接受新消息
 			onCmdQwNewMessage: ({ data }) => {
 				// 插入消息
@@ -400,207 +279,19 @@ class ClientChat {
 				})
 			},
 			onHeartbeatSuccess: ({ data }) => {
-				const onlineMap = data || {}
+				if (!data.wq) {
+					return
+				}
+				const onlineMap = data.wq || {}
 				Object.keys(onlineMap).forEach(k => {
 					this.account.updateAccount(k, {
 						alive: onlineMap[k]
-					}) 
-				})
-			}
-		})
-	}
-
-	getQwAccountCorpId (qwAccountId, corpId) {
-		if (corpId || !qwAccountId || !this.account) {
-			return corpId
-		}
-		const account = this.account.getAccountData().find(item => item.id === qwAccountId)
-		return account && account.corpId
-	}
-
-	markAccountsModified (qwAccountIds) {
-		if (!Array.isArray(qwAccountIds) || !qwAccountIds.length) {
-			return
-		}
-		this.session.markModify(qwAccountIds)
-		this.contacts.markModify(qwAccountIds)
-	}
-
-	/**
-	 * 根据好友请求相关推送刷新待处理好友请求数量
-	 * 推送里能拿到账号id就只刷该账号，否则刷全部
-	*/
-	refreshGreetingUnreadMsgCountByPush (data) {
-		if (!this.account || !this.account.getAccountGreetingUnreadMsgCountMethod) {
-			return
-		}
-		const record = (data && data.record) || data || {}
-		const qwAccountId = record.qwAccountId || record.accountId || (data && data.qwAccountId)
-		const params = qwAccountId && this.account.accountMap[qwAccountId] ? { qwAccountIds: [qwAccountId] } : undefined
-		this.account.getAccountGreetingUnreadMsgCount(params).catch(() => {})
-	}
-
-	updateRemovedSessionUnreadCounts (results) {
-		const accountUnreadCountMap = {}
-		;(results || []).forEach(result => {
-			if (!result || !result.accountId || !result.unreadCount) {
-				return
-			}
-			accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
-		})
-		return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
-			const removedUnreadCount = accountUnreadCountMap[accountId]
-			return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-				return Math.max(0, unreadMesasgeNum - removedUnreadCount)
-			}).catch(error => {
-				console.warn('[client-chat] update account unread count failed', error)
-			})
-		}))
-	}
-
-	handleQwContactAdded (contact, eventData) {
-		const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
-		const corpId = this.getQwAccountCorpId(
-			qwAccountId,
-			contact.corpId || (eventData && eventData.corpId)
-		)
-		const contactId = contact.contactId
-		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-		const sessionId = createSessionId(accountId, contactId)
-		if (!sessionId) {
-			return Promise.resolve()
-		}
-		const localSession = this.session.getSessionByLocal(sessionId)
-		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		return this.session.refreshSession(sessionId).then(rs => {
-			const serverSession = rs && rs.data
-			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
-			const accountId = (serverSession && serverSession.qwAccountId) || qwAccountId
-			const unreadDiff = newUnread - oldUnread
-			if (accountId && unreadDiff) {
-				return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-					return Math.max(0, unreadMesasgeNum + unreadDiff)
+					})
 				})
 			}
-		}).catch(error => {
-			console.warn('[client-chat] refresh added contact session failed', error)
-		})
-	}
-
-	handleQwContactUpdated (contact) {
-		if (!contact.contactId) {
-			return Promise.resolve()
-		}
-		return this.contacts.refreshFriend(contact.contactId).catch(error => {
-			console.warn('[client-chat] refresh contact failed', error)
-		})
-	}
-
-	handleQwContactRemoved (contact, eventData) {
-		if (!contact.contactId) {
-			return Promise.resolve()
-		}
-		this.contacts.removeFriend(contact.contactId)
-		let session = this.session.findSession(({ session }) => {
-			return String(session.type) === '0' &&
-				session.targetId === contact.contactId &&
-				(!contact.qwAccountId || session.qwAccountId === contact.qwAccountId)
-		})
-		if (!session) {
-			const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
-			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-			const sessionId = createSessionId(
-				accountId,
-				contact.contactId
-			)
-			session = sessionId && this.session.getSessionByLocal(sessionId)
-		}
-		if (!session) {
-			return Promise.resolve()
-		}
-		if (this.session.currentSession && this.session.currentSession.id === session.id) {
-			this.session.setCurrentSession(null)
-		}
-		const accountId = session.qwAccountId || contact.qwAccountId
-		const unreadCount = session.unreadMsgCount || 0
-		this.session.removeSession(session.id)
-		return Promise.resolve({
-			accountId,
-			unreadCount
 		})
 	}
 	
-	handleQwRoomAdded (room, eventData) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
-		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-		const sessionId = createSessionId(accountId, room.roomId)
-		const localSession = sessionId && this.session.getSessionByLocal(sessionId)
-		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		const tasks = [this.contacts.refreshRoom(room.roomId).catch(error => {
-			console.warn('[client-chat] refresh added room failed', error)
-		})]
-		if (sessionId) {
-			tasks.push(this.session.refreshSession(sessionId).then(rs => {
-				const serverSession = rs && rs.data
-				const unreadDiff = (serverSession ? (serverSession.unreadMsgCount || 0) : 0) - oldUnread
-				const changedAccountId = (serverSession && serverSession.qwAccountId) || qwAccountId
-				if (changedAccountId && unreadDiff) {
-					return this.account.updateAccountUnreadMessageNum(changedAccountId, ({ unreadMesasgeNum }) => {
-						return Math.max(0, unreadMesasgeNum + unreadDiff)
-					})
-				}
-			}).catch(error => {
-				console.warn('[client-chat] refresh added room session failed', error)
-			}))
-		}
-		return Promise.all(tasks)
-	}
-
-	handleQwRoomUpdated (room) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		return this.contacts.refreshRoom(room.roomId).catch(error => {
-			console.warn('[client-chat] refresh room failed', error)
-		})
-	}
-
-	handleQwRoomRemoved (room, eventData) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		this.contacts.removeRoom(room.roomId)
-		this.event.emit('roomRemoved', {
-			roomId: room.roomId
-		})
-		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
-		let session = this.session.findSession(({ session }) => {
-			return String(session.type) === '1' &&
-				session.targetId === room.roomId &&
-				(!qwAccountId || session.qwAccountId === qwAccountId)
-		})
-		if (!session) {
-			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-			const sessionId = createSessionId(accountId, room.roomId)
-			session = sessionId && this.session.getSessionByLocal(sessionId)
-		}
-		if (!session) {
-			return Promise.resolve()
-		}
-		if (this.session.currentSession && this.session.currentSession.id === session.id) {
-			this.session.setCurrentSession(null)
-		}
-		const unreadCount = session.unreadMsgCount || 0
-		this.session.removeSession(session.id)
-		return Promise.resolve({
-			accountId: session.qwAccountId || qwAccountId,
-			unreadCount
-		})
-	}
-
 	connect () {
 		if (this.data.connectStatus === CONNECT_STATUS.Complete) {
 			return Promise.resolve()
@@ -637,4 +328,4 @@ class ClientChat {
 	}
 }
 
-export default ClientChat
+export default ClientChat

package/services/client-chat/client-chat-wework/utils.js

@@ -13,11 +13,11 @@ export function isUni () {
  * @param accountId - 客服id
  * @param targetId - wechatFriendId | wechatChatroomId
 */
-export function createSessionId (accountId, targetId) {
-	if (!accountId || !targetId) {
+export function createSessionId (corpId, accountId, targetId) {
+	if (!corpId || !accountId || !targetId) {
 		return
 	}
-	return shajs('sha1').update(`${accountId}${targetId}`).digest('hex')
+	return shajs('sha1').update(`${corpId}${accountId}${targetId}`).digest('hex')
 }
 
 /**
@@ -54,7 +54,7 @@ export function createSessionId (accountId, targetId) {
  *	     "msgSvrId": "4319123759514541049",
  *	     "msgType": 1,
  *	     "origin": "0",
- *	     "status": 0,
+ *	     "sendStatus": 0,
  *	     "tenantId": "1761952223049924608",
  *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
  *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -79,4 +79,4 @@ export function createSessionData (message) {
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}

package/uni-common/account-portray/account-portray.vue

@@ -0,0 +1,51 @@
+<template>
+	<bi-portray 
+		:avatar="accountData && accountData.avatar" 
+		:name="accountData && (accountData.memo || accountData.nickname)"
+		:loading="loading"
+	></bi-portray>
+</template>
+
+<script>
+import BiPortray from '@aochuang/common/uni-common/portray/portray.vue'
+
+export default {
+	name: 'BiAccountPortray',
+	components: {
+		BiPortray
+	},
+	props: {
+		id: {
+			type: String,
+			required: true
+		}
+	},
+	data () {
+		return {
+			loading: false,
+			accountData: null
+		}
+	},
+	watch: {
+		id () {
+			this.loadData()
+		}
+	},
+	created () {
+		this.loadData()
+	},
+	methods: {
+		loadData () {
+			this.loading = true
+			this.$clientChat.account.getAccount(this.id).then(rs => {
+				this.accountData = rs.data
+			}).finally(() => {
+				this.loading = false
+			})
+		}
+	}
+}
+</script>
+
+<style>
+</style>