From 924b74b3b2a96a2368db7fdbe256ec00c11af2c8 Mon Sep 17 00:00:00 2001
From: "[yxf]" <[1524240689@qq.com]>
Date: Wed, 22 Apr 2026 19:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=81=E8=BD=AC=E6=8E=A5=E5=AE=A2=E6=9C=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FriendServiceImpl.java       |    3 +-
 .../PlatformConfigurationServiceImpl.java     |   46 +-
 im-uniapp/App.vue                             |   84 +-
 im-uniapp/pages/chat/chat-box.vue             |   44 +-
 im-uniapp/pages/login/login.vue               |   30 +-
 im-uniapp/store/chatStore.js                  | 1144 +++++++++--------
 6 files changed, 730 insertions(+), 621 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java
index d7f9358..3cc83d2 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java
@@ -107,7 +107,7 @@ public class FriendServiceImpl extends ServiceImpl<FriendMapper, Friend> impleme
         log.info("删除好友，用户id:{},好友id:{}", userId, friendId);
     }
 
-    @Cacheable(key = "#userId1+':'+#userId2")
+//    @Cacheable(key = "#userId1+':'+#userId2")
     @Override
     public Boolean isFriend(Long userId1, Long userId2) {
         LambdaQueryWrapper<Friend> wrapper = Wrappers.lambdaQuery();
@@ -117,6 +117,7 @@ public class FriendServiceImpl extends ServiceImpl<FriendMapper, Friend> impleme
         return this.exists(wrapper);
     }
 
+
     /**
      * 单向绑定好友关系
      *
diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PlatformConfigurationServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PlatformConfigurationServiceImpl.java
index 010021f..fcaae52 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/PlatformConfigurationServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PlatformConfigurationServiceImpl.java
@@ -1,7 +1,5 @@
 package com.bx.implatform.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bx.implatform.entity.PlatformConfiguration;
 import com.bx.implatform.mapper.PlatformConfigurationMapper;
@@ -11,6 +9,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 
@@ -25,23 +25,51 @@ public class PlatformConfigurationServiceImpl extends ServiceImpl<PlatformConfig
             return null;
         }
 
-        List<String> inputDomains = Arrays.stream(sourceUrl.split("\n"))
+        List<String> inputList = Arrays.stream(sourceUrl.split("\n"))
                 .map(String::trim)
                 .filter(StringUtils::hasText)
                 .toList();
 
         List<PlatformConfiguration> allConfigs = this.list();
 
-        for (String input : inputDomains) {
-            for (PlatformConfiguration config : allConfigs) {
-                String dbDomain = config.getDomainName();
-                if (StringUtils.hasText(dbDomain) && dbDomain.contains(input)) {
-                    log.info("【匹配成功】平台：{}，匹配规则：{}", config.getPlatformName(), input);
-                    return config.getPlatformName();
+        for (String input : inputList) {
+            try {
+                String inputHost = extractHost(input);
+                if (inputHost == null) continue;
+
+                for (PlatformConfiguration config : allConfigs) {
+                    String dbDomain = config.getDomainName();
+                    if (!StringUtils.hasText(dbDomain)) continue;
+
+                    String dbHost = extractHost(dbDomain);
+
+                    if (inputHost.equals(dbHost)) {
+                        log.info("【精确匹配成功】平台：{}，匹配域名：{}", config.getPlatformName(), inputHost);
+                        return config.getPlatformName();
+                    }
                 }
+
+            } catch (Exception e) {
+                log.warn("解析域名失败: {}", input);
             }
         }
 
         return null;
     }
+
+    /**
+     * 通用提取纯净域名方法
+     */
+    private String extractHost(String urlStr) {
+        try {
+            // 如果不是http开头，手动补全，防止报错
+            if (!urlStr.startsWith("http")) {
+                urlStr = "http://" + urlStr;
+            }
+            URL url = new URL(urlStr);
+            return url.getHost();
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
 }
\ No newline at end of file
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 3443174..2a6c47a 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -42,7 +42,9 @@ export default {
 					this.configStore.setAppInit(true);
 				}
 			});
+			// console.log(cmd, msgInfo);
 			wsApi.onMessage((cmd, msgInfo) => {
+				console.log(cmd, msgInfo);
 				if (cmd == 2) {
 					// 异地登录，强制下线
 					// uni.showModal({
@@ -79,40 +81,17 @@ export default {
 					this.configStore.setAppInit(false);
 				}
 			})
-			wsApi.onMessage((cmd, msgInfo) => {
-			    if (cmd == 2) {
-			      // 异地登录
-			      this.exit();
-			    } else if (cmd == 3) {
-			      // 私聊消息
-			      this.handlePrivateMessage(msgInfo);
-			    } else if (cmd == 4) {
-			      // 群聊消息
-			      this.handleGroupMessage(msgInfo);
-			    } else if (cmd == 5) {
-			      // 系统消息
-			      this.handleSystemMessage(msgInfo);
-			    } else if (cmd == 6) {
-			      // 新增：客服变更通知
-			      this.handleCustomerChanged(msgInfo);
-			    }
-			  });
 		},
 		// 处理客服变更
-		// 处理客服变更【终极修复版】
 		handleCustomerChanged(msgInfo) {
-			console.log('【客服转接】后台下发变更通知', msgInfo);
-			// msgInfo 里自带：oldKfId 旧客服id、newKfId 新客服id
 			const oldKfId = msgInfo.oldKfId;
 			const newKfId = msgInfo.newKfId;
 		
-			// ========== 强制合并：旧客服所有消息 -> 新客服 ==========
 			if (oldKfId && newKfId && oldKfId != newKfId) {
 				const oldChat = this.chatStore.findChatByFriend(oldKfId);
 				const newChat = this.chatStore.findChatByFriend(newKfId);
 		
 				if (oldChat && oldChat.messages.length > 0) {
-					console.log('【开始强制合并】旧客服', oldKfId, '→ 新客服', newKfId);
 					// 执行合并
 					this.chatStore.mergeOldCustomerToNew(oldKfId, newKfId);
 				}
@@ -212,34 +191,40 @@ export default {
 			})
 		},
 		handlePrivateMessage(msg) {
-		  // 标记这条消息是不是自己发的
 		  msg.selfSend = msg.sendId == this.userStore.userInfo.id;
 		  // 好友id
 		  let friendId = msg.selfSend ? msg.recvId : msg.sendId;
-	
 		
-		  // 检查是否为未知用户（只检查收到的消息）
-		  let existingFriend = this.friendStore.findFriend(friendId);
-		  if (!existingFriend && !msg.selfSend) {
-		    console.log("收到未知用户消息，刷新应用:", friendId);
-		    
-		    this.loadStore().then(() => {
-		      // #ifdef H5
-		      window.location.reload();
-		      // #endif
-		      
-		      // #ifdef APP-PLUS
-		      plus.runtime.restart();
-		      // #endif
-		      
-		      // #ifdef MP-WEIXIN
-		      uni.reLaunch({
-		        url: '/pages/chat/chat'
+		  if (!msg.selfSend) {
+		    let friend = this.friendStore.findFriend(friendId);
+		    if (!friend) {
+		      this.chatStore.forceMergeAllOldCustomerToNew(friendId);
+		
+		      // 合并完成 → 强制刷新页面
+		      uni.showToast({
+		        title: "客服已更换，刷新中...",
+		        icon: "none",
+		        duration: 1500
 		      });
-		      // #endif
-		    });
-		    
-		    return;
+		
+		      setTimeout(() => {
+		        // #ifdef H5
+		        window.location.reload();
+		        // #endif
+		
+		        // #ifdef APP-PLUS
+		        plus.runtime.restart();
+		        // #endif
+		
+		        // #ifdef MP-WEIXIN
+		        uni.reLaunch({
+		          url: '/pages/chat/chat'
+		        });
+		        // #endif
+		      }, 800);
+		
+		      // return;
+		    }
 		  }
 		  // 会话信息
 		  let chatInfo = {
@@ -470,7 +455,6 @@ export default {
 			return group;
 		},
 		exit() {
-			console.log("exit");
 			this.isExit = true;
 			wsApi.close(3099);
 			uni.removeStorageSync("loginInfo");
@@ -543,7 +527,6 @@ export default {
 				this.pullOfflineMessage();
 				this.configStore.setAppInit(true);
 			}).catch((e) => {
-				console.log(e);
 				this.exit();
 			})
 		},
@@ -585,14 +568,9 @@ export default {
 		this.$nextTick(() => {
 		        const btn = document.querySelector('.btn-send');
 		        if (btn) {
-		            console.log('按钮找到:', btn);
-		            // 获取所有事件监听器（需要浏览器支持）
 		            const listeners = getEventListeners?.(btn);
-		            console.log('按钮事件监听器:', listeners);
 		            
-		            // 手动绑定一个测试事件
 		            btn.addEventListener('click', (e) => {
-		                console.log('原生点击事件触发');
 		                this.sendTextMessage();
 		            });
 		        }
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index d059dbb..9d780ad 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -227,7 +227,10 @@
 
 <script>
 import UNI_APP from "@/.env.js";
-
+import useFriendStore from "@/store/friendStore.js";
+import useUserStore from "@/store/userStore.js";
+import useChatStore from "@/store/chatStore.js";
+import useGroupStore from "@/store/groupStore.js";
 export default {
   data() {
     return {
@@ -285,6 +288,43 @@ export default {
     };
   },
   methods: {
+		// 刷新页面自动合并旧客服消息到当前客服
+		autoMergeOldCustomerOnRefresh() {
+		  try {
+		    const userStore = useUserStore();
+		    const chatStore = useChatStore();
+		
+		    if (!this.isPrivate || !userStore.userInfo?.id) return;
+		
+		    const currentKfId = this.currentTargetId;
+		    if (!currentKfId) return;
+		
+		
+		    // 合并缓存（核心，已经成功）
+		    chatStore.forceMergeAllOldCustomerToNew(currentKfId);
+		
+		    // 刷新视图
+		    setTimeout(() => {
+		      this.reloadChatMessages(currentKfId);
+		    }, 300);
+		  } catch (e) {
+		    console.log("自动合并失败", e);
+		  }
+		},
+		reloadChatMessages(targetId) {
+		  try {
+		    const chat = this.chatStore.chats.find(
+		      (c) => c.targetId == targetId && c.type === "PRIVATE"
+		    );
+		    if (chat) {
+		      // 只刷新视图，不请求后端，彻底避免500
+		      this.$forceUpdate();
+		      this.$nextTick(() => {
+		        this.scrollToBottom();
+		      });
+		    }
+		  } catch (e) {}
+		},
 		// 下拉选择语言（必刷新）
 		selectLang(lang) {
 		  this.currentLang = lang;
@@ -1656,7 +1696,7 @@ export default {
 
       await this.getSetting();
       this.$nextTick(() => this.scrollToBottom());
-			  
+			this.autoMergeOldCustomerOnRefresh();
     } catch (err) {
       console.error("错误：", err);
     } finally {
diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue
index 5ccf2a5..a6f1461 100644
--- a/im-uniapp/pages/login/login.vue
+++ b/im-uniapp/pages/login/login.vue
@@ -20,24 +20,28 @@ export default {
 				password: '',
 				ip: '',
 				sourceUrl: '',
-				uniqueToken: ''  ,// 添加token字段
-				kefuid: ''        // 添加客服ID字段
+				uniqueToken: '',
+				kefuid: ''
 			}
 		}
 	},
 	methods: {
 		// 获取来源网址
 		getSourceUrl() {
-			
-			const pages = getCurrentPages();
-			const currentPage = pages[pages.length - 1];
-			const options = currentPage.options || {};
-			if (options.from) {
-				this.dataForm.sourceUrl = options.from;
-			}
-
 			// #ifdef H5
-			this.dataForm.sourceUrl = window.location.origin;
+			const referrer = document.referrer;
+			if (referrer) {
+				this.dataForm.sourceUrl = referrer;
+			} else {
+				const pages = getCurrentPages();
+				const currentPage = pages[pages.length - 1];
+				const options = currentPage.options || {};
+				if (options.from) {
+					this.dataForm.sourceUrl = options.from;
+				} else {
+					this.dataForm.sourceUrl = window.location.origin;
+				}
+			}
 			// #endif
 			
 			// #ifdef APP-PLUS
@@ -65,12 +69,10 @@ export default {
 			
 			if (options.token) {
 				this.dataForm.uniqueToken = options.token;
-				console.log("从options获取到token：", this.dataForm.uniqueToken);
 			}
 			
 			if (options.kefuid) {
 				this.dataForm.kefuid = options.kefuid;
-				console.log("从options获取到kefuid：", this.dataForm.kefuid);
 			}
 			
 			const urlParams = new URLSearchParams(window.location.search);
@@ -79,12 +81,10 @@ export default {
 			
 			if (token) {
 				this.dataForm.uniqueToken = token;
-				console.log("从URL解析获取到token：", this.dataForm.uniqueToken);
 			}
 			
 			if (kefuid) {
 				this.dataForm.kefuid = kefuid;
-				console.log("从URL解析获取到kefuid：", this.dataForm.kefuid);
 			}
 			// #endif
 			
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index 75a449a..93341cb 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -7,555 +7,617 @@ import { i18n } from '@/main.js'
 
 let cacheChats = [];
 export default defineStore('chatStore', {
-	state: () => {
-		return {
-			chats: [],
-			privateMsgMaxId: 0,
-			groupMsgMaxId: 0,
-			loading: false
-		}
-	},
-	actions: {
-		initChats(chatsData) {
-			cacheChats = [];
-			this.chats = [];
-			for (let chat of chatsData.chats) {
-				chat.stored = false;
-				cacheChats.push(JSON.parse(JSON.stringify(chat)));
-				if (this.chats.length < 15) {
-					this.chats.push(chat);
-				}
-			}
-			this.privateMsgMaxId = chatsData.privateMsgMaxId || 0;
-			this.groupMsgMaxId = chatsData.groupMsgMaxId || 0;
-		},
-		
-		mergeOldCustomerToNew(oldKfId, newKfId) {
-			const oldChat = this.findChatByFriend(oldKfId);
-			const newChat = this.findChatByFriend(newKfId);
-			if (!oldChat || !newChat) {
-				console.warn('合并失败：旧/新会话不存在', oldKfId, newKfId);
-				return;
-			}
-		
-			newChat.messages = [...oldChat.messages, ...newChat.messages];
-		
-			newChat.unreadCount += oldChat.unreadCount;
-			newChat.lastContent = oldChat.lastContent || newChat.lastContent;
-			newChat.lastSendTime = Math.max(oldChat.lastSendTime || 0, newChat.lastSendTime || 0);
-			newChat.atMe = newChat.atMe || oldChat.atMe;
-			newChat.atAll = newChat.atAll || oldChat.atAll;
-		
-			const keepHot = 300;
-			const totalMsg = newChat.messages.length;
-			newChat.hotMinIdx = totalMsg <= keepHot ? 0 : Math.max(0, totalMsg - keepHot);
-			newChat.readedMessageIdx = Math.min(oldChat.readedMessageIdx || 0, newChat.readedMessageIdx || 0);
-		
-			this.clearCustomerCache(oldKfId);
-			this.removePrivateChat(oldKfId);
-		
-			newChat.stored = false;
-			this.saveToStorage(true);
-			console.log('【合并完成】旧客服消息全部转入新客服', newChat.messages.length);
-		},
-		
-		clearCustomerCache(userId) {
-		  const userStore = useUserStore();
-		  const currentUserId = userStore.userInfo.id;
-		  const key = `chats-app-${currentUserId}-PRIVATE-${userId}`;
-		  
-		  uni.removeStorageSync(key);
-		  uni.removeStorageSync(key + '-hot');
-		},
-		openChat(chatInfo) {
-			let chats = this.curChats;
-			let chat = null;
-			for (let idx in chats) {
-				if (chats[idx].type == chatInfo.type &&
-					chats[idx].targetId === chatInfo.targetId) {
-					chat = chats[idx];
-					this.moveTop(idx)
-					break;
-				}
-			}
-			if (chat == null) {
-				chat = {
-					targetId: chatInfo.targetId,
-					type: chatInfo.type,
-					showName: chatInfo.showName,
-					headImage: chatInfo.headImage,
-					isDnd: chatInfo.isDnd,
-					lastContent: "",
-					lastSendTime: new Date().getTime(),
-					unreadCount: 0,
-					hotMinIdx: 0,
-					readedMessageIdx: 0,
-					messages: [],
-					atMe: false,
-					atAll: false,
-					stored: false
-				};
-				chats.unshift(chat);
-				this.saveToStorage();
-			}
-		},
-		activeChat(idx) {
-			let chats = this.curChats;
-			if (idx >= 0) {
-				chats[idx].unreadCount = 0;
-			}
-		},
-		resetUnreadCount(chatInfo) {
-			let chats = this.curChats;
-			for (let idx in chats) {
-				if (chats[idx].type == chatInfo.type &&
-					chats[idx].targetId == chatInfo.targetId) {
-					chats[idx].unreadCount = 0;
-					chats[idx].atMe = false;
-					chats[idx].atAll = false;
-					chats[idx].stored = false;
-					this.saveToStorage();
-				}
-			}
+  state: () => {
+    return {
+      chats: [],
+      privateMsgMaxId: 0,
+      groupMsgMaxId: 0,
+      loading: false
+    }
+  },
+  actions: {
+    initChats(chatsData) {
+      cacheChats = [];
+      this.chats = [];
+      for (let chat of chatsData.chats) {
+        chat.stored = false;
+        cacheChats.push(JSON.parse(JSON.stringify(chat)));
+        if (this.chats.length < 15) {
+          this.chats.push(chat);
+        }
+      }
+      this.privateMsgMaxId = chatsData.privateMsgMaxId || 0;
+      this.groupMsgMaxId = chatsData.groupMsgMaxId || 0;
+    },
 
-		},
-		readedMessage(pos) {
-			let chat = this.findChatByFriend(pos.friendId);
-			if (!chat) return;
-			for (let idx = chat.readedMessageIdx; idx < chat.messages.length; idx++) {
-				let m = chat.messages[idx];
-				if (m.id && m.selfSend && m.status < MESSAGE_STATUS.RECALL) {
-					if (!pos.maxId || m.id <= pos.maxId) {
-						m.status = MESSAGE_STATUS.READED
-						chat.readedMessageIdx = idx;
-						chat.stored = false;
-					}
-				}
-			}
-			if (!chat.stored) {
-				this.saveToStorage();
-			}
-		},
-		cleanMessage(idx) {
-			let chat = this.curChats[idx];
-			chat.lastContent = '';
-			chat.hotMinIdx = 0;
-			chat.unreadCount = 0;
-			chat.atMe = false;
-			chat.atAll = false;
-			chat.stored = false
-			chat.messages = [];
-			this.saveToStorage(true);
-		},
-		removeChat(idx) {
-			let chats = this.curChats;
-			chats[idx].delete = true;
-			chats[idx].stored = false;
-			this.saveToStorage();
-		},
-		removePrivateChat(userId) {
-			let chats = this.curChats;
-			for (let idx in chats) {
-				if (chats[idx].type == 'PRIVATE' &&
-					chats[idx].targetId == userId) {
-					this.removeChat(idx);
-				}
-			}
-		},
-		removeGroupChat(groupId) {
-			let chats = this.curChats;
-			for (let idx in chats) {
-				if (chats[idx].type == 'GROUP' &&
-					chats[idx].targetId == groupId) {
-					this.removeChat(idx);
-				}
-			}
-		},
-		moveTop(idx) {
-			if (this.loading) {
-				return;
-			}
-			let chats = this.curChats;
-			if (idx > 0) {
-				let chat = chats[idx];
-				chats.splice(idx, 1);
-				chats.unshift(chat);
-				chat.lastSendTime = new Date().getTime();
-				chat.stored = false;
-				this.saveToStorage();
-			}
-		},
-		insertMessage(msgInfo, chatInfo) {
-			const t = i18n.global.t;
-			let type = chatInfo.type;
-			if (msgInfo.id && type == "PRIVATE" && msgInfo.id > this.privateMsgMaxId) {
-				this.privateMsgMaxId = msgInfo.id;
-			}
-			if (msgInfo.id && type == "GROUP" && msgInfo.id > this.groupMsgMaxId) {
-				this.groupMsgMaxId = msgInfo.id;
-			}
-			let chat = this.findChat(chatInfo);
-			let message = this.findMessage(chat, msgInfo);
-			if (message) {
-				const msgIndex = chat.messages.findIndex(m => 
-					(m.id && m.id === msgInfo.id) || 
-					(m.tmpId && m.tmpId === msgInfo.tmpId)
-				);
-				if (msgIndex !== -1) {
-					const updatedMessage = { ...message, ...msgInfo };
-					chat.messages.splice(msgIndex, 1, updatedMessage);
-				}
-				chat.stored = false;
-				this.saveToStorage();
-				return;
-			}
-			if (msgInfo.type == MESSAGE_TYPE.IMAGE) {
-				chat.lastContent = t('chat.image');
-			} else if (msgInfo.type == MESSAGE_TYPE.FILE) {
-				chat.lastContent = t('chat.file');
-			} else if (msgInfo.type == MESSAGE_TYPE.AUDIO) {
-				chat.lastContent = t('chat.voice');
-			} else if (msgInfo.type == MESSAGE_TYPE.ACT_RT_VOICE) {
-				chat.lastContent = t('chat.voiceCall');
-			} else if (msgInfo.type == MESSAGE_TYPE.ACT_RT_VIDEO) {
-				chat.lastContent = t('chat.videoCall');
-			} else if (msgInfo.type == MESSAGE_TYPE.TEXT ||
-				msgInfo.type == MESSAGE_TYPE.RECALL ||
-				msgInfo.type == MESSAGE_TYPE.TIP_TEXT) {
-				chat.lastContent = msgInfo.content;
-			}
+    // 未知客服触发：全量合并所有旧客服到新客服
+    forceMergeAllOldCustomerToNew(newKfId) {
+      const userStore = useUserStore();
+      const uid = userStore.userInfo.id;
+      const prefix = `chats-app-${uid}-PRIVATE-`;
+      const rootKey = `chats-app-${uid}`;
 
-			chat.lastSendTime = msgInfo.sendTime;
-			chat.sendNickName = msgInfo.sendNickName;
-			if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED &&
-				msgInfo.status != MESSAGE_STATUS.RECALL && msgInfo.type != MESSAGE_TYPE.TIP_TEXT) {
-				chat.unreadCount++;
-			}
-			if (!msgInfo.selfSend && chat.type == "GROUP" && msgInfo.atUserIds &&
-				msgInfo.status != MESSAGE_STATUS.READED) {
-				const userStore = useUserStore();
-				let userId = userStore.userInfo.id;
-				if (msgInfo.atUserIds.indexOf(userId) >= 0) {
-					chat.atMe = true;
-				}
-				if (msgInfo.atUserIds.indexOf(-1) >= 0) {
-					chat.atAll = true;
-				}
-			}
-			if (!chat.lastTimeTip || (chat.lastTimeTip < msgInfo.sendTime - 600 * 1000)) {
-				chat.messages.push({
-					sendTime: msgInfo.sendTime,
-					type: MESSAGE_TYPE.TIP_TIME,
-				});
-				chat.lastTimeTip = msgInfo.sendTime;
-			}
-			chat.messages.push(msgInfo);
-			chat.stored = false;
-			this.saveToStorage();
-		},
-		updateMessage(msgInfo, chatInfo) {
-			let chat = this.findChat(chatInfo);
-			let message = this.findMessage(chat, msgInfo);
-			if (message) {
-				Object.assign(message, msgInfo);
-				chat.stored = false;
-				this.saveToStorage();
-			}
-		},
-		deleteMessage(msgInfo, chatInfo) {
-			let isColdMessage = false;
-			let chat = this.findChat(chatInfo);
-			let delIdx = -1;
-			for (let idx in chat.messages) {
-				if (chat.messages[idx].id && chat.messages[idx].id == msgInfo.id) {
-					delIdx = idx;
-					break;
-				}
-				if (chat.messages[idx].tmpId && chat.messages[idx].tmpId == msgInfo.tmpId) {
-					delIdx = idx;
-					break;
-				}
-			}
-			if (delIdx >= 0) {
-				chat.messages.splice(delIdx, 1);
-				if (delIdx < chat.hotMinIdx) {
-					isColdMessage = true;
-					chat.hotMinIdx--;
-				}
-				if (delIdx < chat.readedMessageIdx) {
-					chat.readedMessageIdx--;
-				}
-				chat.stored = false;
-				this.saveToStorage(isColdMessage);
-			}
-		},
+      const allKeys = uni.getStorageInfoSync().keys;
+      const oldKeys = allKeys.filter(k =>
+        k.startsWith(prefix) &&
+        !k.endsWith('-hot') &&
+        !k.includes(`-${newKfId}`)
+      );
 
-		recallMessage(msgInfo, chatInfo) {
-			const t = i18n.global.t;
-			let chat = this.findChat(chatInfo);
-			if (!chat) return;
-			let isColdMessage = false;
-			let id = msgInfo.content;
-			let name = msgInfo.selfSend ? t('chat.you') : (chat.type == 'PRIVATE' ? t('chat.other') : msgInfo.sendNickName);
-			for (let idx in chat.messages) {
-				let m = chat.messages[idx];
-				if (m.id && m.id == id) {
-					m.status = MESSAGE_STATUS.RECALL;
-					m.content = `${name}${t('chat.recalledMessage')}`;
-					m.type = MESSAGE_TYPE.TIP_TEXT
-					chat.lastContent = m.content;
-					chat.lastSendTime = msgInfo.sendTime;
-					chat.sendNickName = '';
-					if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED) {
-						chat.unreadCount++;
-					}
-					isColdMessage = idx < chat.hotMinIdx;
-				}
-				if (m.quoteMessage && m.quoteMessage.id == msgInfo.id) {
-					m.quoteMessage.content = t('chat.quoteRecalled');
-					m.quoteMessage.status = MESSAGE_STATUS.RECALL;
-					m.quoteMessage.type = MESSAGE_TYPE.TIP_TEXT
-				}
-			}
-			chat.stored = false;
-			this.saveToStorage(isColdMessage);
-		},
+      if (oldKeys.length === 0) return;
 
-		updateChatFromFriend(friend) {
-			let chat = this.findChatByFriend(friend.id)
-			if (chat && (chat.headImage != friend.headImage ||
-					chat.showName != friend.nickName)) {
-				chat.headImage = friend.headImage;
-				chat.showName = friend.nickName;
-				chat.stored = false;
-				this.saveToStorage();
-			}
-		},
-		updateChatFromUser(user) {
-			let chat = this.findChatByFriend(user.id);
-			if (chat && (chat.headImage != user.headImageThumb ||
-					chat.showName != user.nickName)) {
-				chat.headImage = user.headImageThumb;
-				chat.showName = user.nickName;
-				chat.stored = false;
-				this.saveToStorage();
-			}
-		},
-		updateChatFromGroup(group) {
-			let chat = this.findChatByGroup(group.id);
-			if (chat && (chat.headImage != group.headImageThumb ||
-					chat.showName != group.showGroupName)) {
-				chat.headImage = group.headImageThumb;
-				chat.showName = group.showGroupName;
-				chat.stored = false;
-				this.saveToStorage();
-			}
-		},
-		setLoading(loading) {
-			this.loading = loading;
-		},
-		setDnd(chatInfo, isDnd) {
-			let chat = this.findChat(chatInfo);
-			if (chat) {
-				chat.isDnd = isDnd;
-			}
-		},
-		refreshChats() {
-			let chats = cacheChats || this.chats;
-			const friendStore = useFriendStore();
-			const groupStore = useGroupStore();
-			chats.forEach(chat => {
-				if (chat.type == 'PRIVATE') {
-					let friend = friendStore.findFriend(chat.targetId);
-					if (friend) {
-						chat.isDnd = friend.isDnd
-					}
-				} else if (chat.type == 'GROUP') {
-					let group = groupStore.findGroup(chat.targetId);
-					if (group) {
-						chat.isDnd = group.isDnd
-					}
-				}
-			})
-			chats.sort((chat1, chat2) => chat2.lastSendTime - chat1.lastSendTime);
-			const storageInfo = uni.getStorageInfoSync();
-			if (storageInfo && storageInfo.currentSize > 3000) {
-				this.cleanOtherUserCache();
-			}
-			this.fliterMessage(chats, 3000, 500);
-			chats.forEach(chat => {
-				if (!chat.hotMinIdx || chat.hotMinIdx != chat.messages.length) {
-					chat.hotMinIdx = chat.messages.length;
-					chat.stored = false;
-				}
-			});
-			this.chats = chats;
-			cacheChats = null;
-			this.saveToStorage(true);
-		},
-		fliterMessage(chats, maxTotalSize, maxPerChatSize) {
-			let remainTotalSize = 0;
-			chats.forEach(chat => {
-				if (chat.messages.length > maxPerChatSize) {
-					let idx = chat.messages.length - maxPerChatSize;
-					chat.messages = chat.messages.slice(idx);
-				}
-				remainTotalSize += chat.messages.length;
-			})
-			if (remainTotalSize > maxTotalSize) {
-				this.fliterMessage(chats, maxTotalSize, maxPerChatSize / 2);
-			}
-		},
-		cleanOtherUserCache() {
-			const userStore = useUserStore();
-			const userId = userStore.userInfo.id;
-			const prefix = "chats-app-" + userId;
-			const res = uni.getStorageInfoSync();
-			res.keys.forEach(key => {
-				if (key.startsWith("chats-app") && !key.startsWith(prefix)) {
-					uni.removeStorageSync(key);
-				}
-			})
-		},
-		saveToStorage(withColdMessage) {
-			if (this.loading) {
-				return;
-			}
-			const userStore = useUserStore();
-			let userId = userStore.userInfo.id;
-			let key = "chats-app-" + userId;
-			let chatKeys = [];
-			this.chats.forEach((chat) => {
-				let chatKey = `${key}-${chat.type}-${chat.targetId}`
-				if (!chat.stored) {
-					if (chat.delete) {
-						uni.removeStorageSync(chatKey);
-					} else {
-						if (withColdMessage) {
-							let coldChat = Object.assign({}, chat);
-							coldChat.messages = chat.messages.slice(0, chat.hotMinIdx);
-							uni.setStorageSync(chatKey, coldChat)
-						}
-						let hotKey = chatKey + '-hot';
-						let hotChat = Object.assign({}, chat);
-						hotChat.messages = chat.messages.slice(chat.hotMinIdx)
-						uni.setStorageSync(hotKey, hotChat);
-					}
-					chat.stored = true;
-				}
-				if (!chat.delete) {
-					chatKeys.push(chatKey);
-				}
-			})
-			let chatsData = {
-				privateMsgMaxId: this.privateMsgMaxId,
-				groupMsgMaxId: this.groupMsgMaxId,
-				chatKeys: chatKeys
-			}
-			uni.setStorageSync(key, chatsData)
-			this.chats = this.chats.filter(chat => !chat.delete)
-		},
-		clear(state) {
-			cacheChats = [];
-			this.chats = [];
-			this.privateMsgMaxId = 0;
-			this.groupMsgMaxId = 0;
-			this.loadingPrivateMsg = false;
-			this.loadingGroupMsg = false;
-		},
+      let newChat = this.findChatByFriend(newKfId);
+      if (!newChat) {
+        newChat = {
+          targetId: newKfId,
+          type: "PRIVATE",
+          messages: [],
+          unreadCount: 0,
+          lastContent: "",
+          lastSendTime: 0,
+          hotMinIdx: 0,
+          readedMessageIdx: 0,
+          atMe: false,
+          atAll: false,
+          stored: false
+        };
+        this.chats.unshift(newChat);
+      }
+
+      // 读取每一个旧客服 【冷+热完整消息】
+      let allOldMessages = [];
+      oldKeys.forEach(oldKey => {
+        const oldCold = uni.getStorageSync(oldKey);
+        const oldHot = uni.getStorageSync(oldKey + "-hot");
+        // 旧客服完整消息：冷历史 + 热新消息
+        const oldFullMsg = [...(oldCold?.messages || []), ...(oldHot?.messages || [])];
+        allOldMessages = [...oldFullMsg, ...allOldMessages];
+
+        // 合并完成后才删除旧缓存，绝不提前删！
+        uni.removeStorageSync(oldKey);
+        uni.removeStorageSync(oldKey + "-hot");
+      });
+
+      newChat.messages = [...allOldMessages, ...newChat.messages];
+
+      // 根缓存只保留最新客服
+      const root = uni.getStorageSync(rootKey);
+      if (root) {
+        root.chatKeys = [`${prefix}${newKfId}`];
+        uni.setStorageSync(rootKey, root);
+      }
+
+      newChat.stored = false;
+      // 按照原生冷热规则拆分保存
+      this.saveToStorage(true);
+    },
+
+    openChat(chatInfo) {
+      let chats = this.curChats;
+      let chat = null;
+      for (let idx in chats) {
+        if (chats[idx].type == chatInfo.type &&
+          chats[idx].targetId === chatInfo.targetId) {
+          chat = chats[idx];
+          this.moveTop(idx)
+          break;
+        }
+      }
+      if (chat == null) {
+        chat = {
+          targetId: chatInfo.targetId,
+          type: chatInfo.type,
+          showName: chatInfo.showName,
+          headImage: chatInfo.headImage,
+          isDnd: chatInfo.isDnd,
+          lastContent: "",
+          lastSendTime: new Date().getTime(),
+          unreadCount: 0,
+          hotMinIdx: 0,
+          readedMessageIdx: 0,
+          messages: [],
+          atMe: false,
+          atAll: false,
+          stored: false
+        };
+        chats.unshift(chat);
+        this.saveToStorage();
+      }
+    },
+    activeChat(idx) {
+      let chats = this.curChats;
+      if (idx >= 0) {
+        chats[idx].unreadCount = 0;
+      }
+    },
+    resetUnreadCount(chatInfo) {
+      let chats = this.curChats;
+      for (let idx in chats) {
+        if (chats[idx].type == chatInfo.type &&
+          chats[idx].targetId == chatInfo.targetId) {
+          chats[idx].unreadCount = 0;
+          chats[idx].atMe = false;
+          chats[idx].atAll = false;
+          chats[idx].stored = false;
+          this.saveToStorage();
+        }
+      }
+    },
+    readedMessage(pos) {
+      let chat = this.findChatByFriend(pos.friendId);
+      if (!chat) return;
+      for (let idx = chat.readedMessageIdx; idx < chat.messages.length; idx++) {
+        let m = chat.messages[idx];
+        if (m.id && m.selfSend && m.status < MESSAGE_STATUS.RECALL) {
+          if (!pos.maxId || m.id <= pos.maxId) {
+            m.status = MESSAGE_STATUS.READED
+            chat.readedMessageIdx = idx;
+            chat.stored = false;
+          }
+        }
+      }
+      if (!chat.stored) {
+        this.saveToStorage();
+      }
+    },
+    cleanMessage(idx) {
+      let chat = this.curChats[idx];
+      chat.lastContent = '';
+      chat.hotMinIdx = 0;
+      chat.unreadCount = 0;
+      chat.atMe = false;
+      chat.atAll = false;
+      chat.stored = false
+      chat.messages = [];
+      this.saveToStorage(true);
+    },
+    removeChat(idx) {
+      let chats = this.curChats;
+      chats[idx].delete = true;
+      chats[idx].stored = false;
+      this.saveToStorage();
+    },
+    removePrivateChat(userId) {
+      let chats = this.curChats;
+      for (let idx in chats) {
+        if (chats[idx].type == 'PRIVATE' &&
+          chats[idx].targetId == userId) {
+          this.removeChat(idx);
+        }
+      }
+    },
+    removeGroupChat(groupId) {
+      let chats = this.curChats;
+      for (let idx in chats) {
+        if (chats[idx].type == 'GROUP' &&
+          chats[idx].targetId == groupId) {
+          this.removeChat(idx);
+        }
+      }
+    },
+    moveTop(idx) {
+      if (this.loading) {
+        return;
+      }
+      let chats = this.curChats;
+      if (idx > 0) {
+        let chat = chats[idx];
+        chats.splice(idx, 1);
+        chats.unshift(chat);
+        chat.lastSendTime = new Date().getTime();
+        chat.stored = false;
+        this.saveToStorage();
+      }
+    },
+    insertMessage(msgInfo, chatInfo) {
+      const t = i18n.global.t;
+      let type = chatInfo.type;
+      if (msgInfo.id && type == "PRIVATE" && msgInfo.id > this.privateMsgMaxId) {
+        this.privateMsgMaxId = msgInfo.id;
+      }
+      if (msgInfo.id && type == "GROUP" && msgInfo.id > this.groupMsgMaxId) {
+        this.groupMsgMaxId = msgInfo.id;
+      }
+      let chat = this.findChat(chatInfo);
+      let message = this.findMessage(chat, msgInfo);
+      if (message) {
+        const msgIndex = chat.messages.findIndex(m =>
+          (m.id && m.id === msgInfo.id) ||
+          (m.tmpId && m.tmpId === msgInfo.tmpId)
+        );
+        if (msgIndex !== -1) {
+          const updatedMessage = { ...message, ...msgInfo };
+          chat.messages.splice(msgIndex, 1, updatedMessage);
+        }
+        chat.stored = false;
+        this.saveToStorage();
+        return;
+      }
+      if (msgInfo.type == MESSAGE_TYPE.IMAGE) {
+        chat.lastContent = t('chat.image');
+      } else if (msgInfo.type == MESSAGE_TYPE.FILE) {
+        chat.lastContent = t('chat.file');
+      } else if (msgInfo.type == MESSAGE_TYPE.AUDIO) {
+        chat.lastContent = t('chat.voice');
+      } else if (msgInfo.type == MESSAGE_TYPE.ACT_RT_VOICE) {
+        chat.lastContent = t('chat.voiceCall');
+      } else if (msgInfo.type == MESSAGE_TYPE.ACT_RT_VIDEO) {
+        chat.lastContent = t('chat.videoCall');
+      } else if (msgInfo.type == MESSAGE_TYPE.TEXT ||
+        msgInfo.type == MESSAGE_TYPE.RECALL ||
+        msgInfo.type == MESSAGE_TYPE.TIP_TEXT) {
+        chat.lastContent = msgInfo.content;
+      }
+
+      chat.lastSendTime = msgInfo.sendTime;
+      chat.sendNickName = msgInfo.sendNickName;
+      if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED &&
+        msgInfo.status != MESSAGE_STATUS.RECALL && msgInfo.type != MESSAGE_TYPE.TIP_TEXT) {
+        chat.unreadCount++;
+      }
+      if (!msgInfo.selfSend && chat.type == "GROUP" && msgInfo.atUserIds &&
+        msgInfo.status != MESSAGE_STATUS.READED) {
+        const userStore = useUserStore();
+        let userId = userStore.userInfo.id;
+        if (msgInfo.atUserIds.indexOf(userId) >= 0) {
+          chat.atMe = true;
+        }
+        if (msgInfo.atUserIds.indexOf(-1) >= 0) {
+          chat.atAll = true;
+        }
+      }
+      if (!chat.lastTimeTip || (chat.lastTimeTip < msgInfo.sendTime - 600 * 1000)) {
+        chat.messages.push({
+          sendTime: msgInfo.sendTime,
+          type: MESSAGE_TYPE.TIP_TIME,
+        });
+        chat.lastTimeTip = msgInfo.sendTime;
+      }
+      chat.messages.push(msgInfo);
+      chat.stored = false;
+      this.saveToStorage();
+    },
+    updateMessage(msgInfo, chatInfo) {
+      let chat = this.findChat(chatInfo);
+      let message = this.findMessage(chat, msgInfo);
+      if (message) {
+        Object.assign(message, msgInfo);
+        chat.stored = false;
+        this.saveToStorage();
+      }
+    },
+    deleteMessage(msgInfo, chatInfo) {
+      let isColdMessage = false;
+      let chat = this.findChat(chatInfo);
+      let delIdx = -1;
+      for (let idx in chat.messages) {
+        if (chat.messages[idx].id && chat.messages[idx].id == msgInfo.id) {
+          delIdx = idx;
+          break;
+        }
+        if (chat.messages[idx].tmpId && chat.messages[idx].tmpId == msgInfo.tmpId) {
+          delIdx = idx;
+          break;
+        }
+      }
+      if (delIdx >= 0) {
+        chat.messages.splice(delIdx, 1);
+        if (delIdx < chat.hotMinIdx) {
+          isColdMessage = true;
+          chat.hotMinIdx--;
+        }
+        if (delIdx < chat.readedMessageIdx) {
+          chat.readedMessageIdx--;
+        }
+        chat.stored = false;
+        this.saveToStorage(isColdMessage);
+      }
+    },
+
+    recallMessage(msgInfo, chatInfo) {
+      const t = i18n.global.t;
+      let chat = this.findChat(chatInfo);
+      if (!chat) return;
+      let isColdMessage = false;
+      let id = msgInfo.content;
+      let name = msgInfo.selfSend ? t('chat.you') : (chat.type == 'PRIVATE' ? t('chat.other') : msgInfo.sendNickName);
+      for (let idx in chat.messages) {
+        let m = chat.messages[idx];
+        if (m.id && m.id == id) {
+          m.status = MESSAGE_STATUS.RECALL;
+          m.content = `${name}${t('chat.recalledMessage')}`;
+          m.type = MESSAGE_TYPE.TIP_TEXT
+          chat.lastContent = m.content;
+          chat.lastSendTime = msgInfo.sendTime;
+          chat.sendNickName = '';
+          if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED) {
+            chat.unreadCount++;
+          }
+          isColdMessage = idx < chat.hotMinIdx;
+        }
+        if (m.quoteMessage && m.quoteMessage.id == msgInfo.id) {
+          m.quoteMessage.content = t('chat.quoteRecalled');
+          m.quoteMessage.status = MESSAGE_STATUS.RECALL;
+          m.quoteMessage.type = MESSAGE_TYPE.TIP_TEXT
+        }
+      }
+      chat.stored = false;
+      this.saveToStorage(isColdMessage);
+    },
+
+    updateChatFromFriend(friend) {
+      let chat = this.findChatByFriend(friend.id)
+      if (chat && (chat.headImage != friend.headImage ||
+          chat.showName != friend.nickName)) {
+        chat.headImage = friend.headImage;
+        chat.showName = friend.nickName;
+        chat.stored = false;
+        this.saveToStorage();
+      }
+    },
+    updateChatFromUser(user) {
+      let chat = this.findChatByFriend(user.id);
+      if (chat && (chat.headImage != user.headImageThumb ||
+          chat.showName != user.nickName)) {
+        chat.headImage = user.headImageThumb;
+        chat.showName = user.nickName;
+        chat.stored = false;
+        this.saveToStorage();
+      }
+    },
+    updateChatFromGroup(group) {
+      let chat = this.findChatByGroup(group.id);
+      if (chat && (chat.headImage != group.headImageThumb ||
+          chat.showName != group.showGroupName)) {
+        chat.headImage = group.headImageThumb;
+        chat.showName = group.showGroupName;
+        chat.stored = false;
+        this.saveToStorage();
+      }
+    },
+    setLoading(loading) {
+      this.loading = loading;
+    },
+    setDnd(chatInfo, isDnd) {
+      let chat = this.findChat(chatInfo);
+      if (chat) {
+        chat.isDnd = isDnd;
+      }
+    },
+    refreshChats() {
+      let chats = cacheChats || this.chats;
+      const friendStore = useFriendStore();
+      const groupStore = useGroupStore();
+      chats.forEach(chat => {
+        if (chat.type == 'PRIVATE') {
+          let friend = friendStore.findFriend(chat.targetId);
+          if (friend) {
+            chat.isDnd = friend.isDnd
+          }
+        } else if (chat.type == 'GROUP') {
+          let group = groupStore.findGroup(chat.targetId);
+          if (group) {
+            chat.isDnd = group.isDnd
+          }
+        }
+      })
+      chats.sort((chat1, chat2) => chat2.lastSendTime - chat1.lastSendTime);
+      const storageInfo = uni.getStorageInfoSync();
+      if (storageInfo && storageInfo.currentSize > 3000) {
+        this.cleanOtherUserCache();
+      }
+      this.fliterMessage(chats, 3000, 500);
+      chats.forEach(chat => {
+        // 原生规则：所有消息默认都放入热缓存，hotMinIdx归0
+        chat.hotMinIdx = 0;
+        chat.stored = false;
+      });
+      this.chats = chats;
+      cacheChats = null;
+      this.saveToStorage(true);
+    },
+    fliterMessage(chats, maxTotalSize, maxPerChatSize) {
+      let remainTotalSize = 0;
+      chats.forEach(chat => {
+        if (chat.messages.length > maxPerChatSize) {
+          let idx = chat.messages.length - maxPerChatSize;
+          chat.messages = chat.messages.slice(idx);
+        }
+        remainTotalSize += chat.messages.length;
+      })
+      if (remainTotalSize > maxTotalSize) {
+        this.fliterMessage(chats, maxTotalSize, maxPerChatSize / 2);
+      }
+    },
+    cleanOtherUserCache() {
+      const userStore = useUserStore();
+      const userId = userStore.userInfo.id;
+      const prefix = "chats-app-" + userId;
+      const res = uni.getStorageInfoSync();
+      res.keys.forEach(key => {
+        if (key.startsWith("chats-app") && !key.startsWith(prefix)) {
+          uni.removeStorageSync(key);
+        }
+      })
+    },
+
+    saveToStorage(withColdMessage) {
+      if (this.loading) {
+        return;
+      }
+      const userStore = useUserStore();
+      let userId = userStore.userInfo.id;
+      let rootKey = "chats-app-" + userId;
+      let chatKeys = [];
+      const keepHotCount = 300; // 原生热缓存保留条数
+
+      this.chats.forEach((chat) => {
+        let chatKey = `${rootKey}-${chat.type}-${chat.targetId}`
+        if (!chat.stored) {
+          if (chat.delete) {
+            uni.removeStorageSync(chatKey);
+            uni.removeStorageSync(chatKey + '-hot');
+          } else {
+            // 原生标准切割：hotMinIdx = 总消息长度 - 最新300条
+            const totalMsgLen = chat.messages.length;
+            chat.hotMinIdx = Math.max(0, totalMsgLen - keepHotCount);
+            // cold：前面所有久远历史消息
+            const coldMsg = chat.messages.slice(0, chat.hotMinIdx);
+            // hot：后面最新的300条消息（所有新发消息全在这里！）
+            const hotMsg = chat.messages.slice(chat.hotMinIdx);
+
+            // 写入冷缓存
+            if (withColdMessage) {
+              let coldChat = { ...chat, messages: coldMsg };
+              uni.setStorageSync(chatKey, coldChat);
+            }
+            // 写入热缓存（新发消息100%保存）
+            let hotChat = { ...chat, messages: hotMsg };
+            uni.setStorageSync(chatKey + '-hot', hotChat);
+          }
+          chat.stored = true;
+        }
+        if (!chat.delete) {
+          chatKeys.push(chatKey);
+        }
+      })
+
+      // 更新根会话列表
+      let chatsData = {
+        privateMsgMaxId: this.privateMsgMaxId,
+        groupMsgMaxId: this.groupMsgMaxId,
+        chatKeys: chatKeys
+      }
+      uni.setStorageSync(rootKey, chatsData)
+      this.chats = this.chats.filter(chat => !chat.delete)
+    },
+
+    clear(state) {
+      cacheChats = [];
+      this.chats = [];
+      this.privateMsgMaxId = 0;
+      this.groupMsgMaxId = 0;
+      this.loadingPrivateMsg = false;
+      this.loadingGroupMsg = false;
+    },
 		loadChat() {
 			return new Promise((resolve, reject) => {
 				let userStore = useUserStore();
 				let userId = userStore.userInfo.id;
-				let chatsData = uni.getStorageSync("chats-app-" + userId)
-				if (chatsData) {
-					if (chatsData.chatKeys) {
-						chatsData.chats = [];
-						chatsData.chatKeys.forEach(key => {
-							let coldChat = uni.getStorageSync(key);
-							let hotChat = uni.getStorageSync(key + '-hot');
-							if (!coldChat && !hotChat) {
-								return;
-							}
-							hotChat && hotChat.messages.forEach(msg => {
-								if (msg.status == MESSAGE_STATUS.SENDING) {
-									msg.status = MESSAGE_STATUS.FAILED
-								}
-							})
-							let chat = Object.assign({}, coldChat, hotChat);
-							if (hotChat && coldChat) {
-								chat.messages = coldChat.messages.concat(hotChat.messages)
-							}
-							chat.readedMessageIdx = chat.readedMessageIdx || 0;
-							chatsData.chats.push(chat);
-						})
-					}
-					this.initChats(chatsData);
+				const rootCacheKey = `chats-app-${userId}`;
+				let chatsData = uni.getStorageSync(rootCacheKey);
+
+				// 安全处理：没有数据直接返回
+				if (!chatsData) {
+					chatsData = {
+						privateMsgMaxId: 0,
+						groupMsgMaxId: 0,
+						chatKeys: []
+					};
 				}
-				resolve()
-			})
-		}
-	},
-	getters: {
-		curChats: (state) => {
-			if (cacheChats && state.loading) {
-				return cacheChats;
-			}
-			return state.chats;
-		},
-		findChatIdx: (state) => (chat) => {
-			let chats = state.curChats;
-			for (let idx in chats) {
-				if (chats[idx].type == chat.type &&
-					chats[idx].targetId === chat.targetId) {
-					chat = state.chats[idx];
-					return idx;
+
+				// 安全处理：chatKeys 必须是数组
+				if (!chatsData.chatKeys || !Array.isArray(chatsData.chatKeys)) {
+					chatsData.chatKeys = [];
 				}
-			}
-		},
-		findChat: (state) => (chat) => {
-			let chats = state.curChats;
-			let idx = state.findChatIdx(chat);
-			return chats[idx];
-		},
-		findChatByFriend: (state) => (fid) => {
-			return state.curChats.find(chat => chat.type == 'PRIVATE' &&
-				chat.targetId == fid)
-		},
-		findChatByGroup: (state) => (gid) => {
-			return state.curChats.find(chat => chat.type == 'GROUP' &&
-				chat.targetId == gid)
+
+				uni.removeStorageSync("currentActiveCustomerId");
+
+				let finalChats = [];
+				chatsData.chatKeys.forEach(key => {
+					try {
+						const coldChat = uni.getStorageSync(key) || {};
+						const hotChat = uni.getStorageSync(key + "-hot") || {};
+
+						// 修复发送中状态
+						if (hotChat.messages && Array.isArray(hotChat.messages)) {
+							hotChat.messages.forEach(msg => {
+								if (msg.status === MESSAGE_STATUS.SENDING) {
+									msg.status = MESSAGE_STATUS.FAILED;
+								}
+							});
+						}
+
+						// 消息合并（绝对安全）
+						const coldMsg = Array.isArray(coldChat.messages) ? coldChat.messages : [];
+						const hotMsg = Array.isArray(hotChat.messages) ? hotChat.messages : [];
+						const fullMsg = [...coldMsg, ...hotMsg];
+
+						let chat = { ...coldChat, ...hotChat };
+						chat.messages = fullMsg;
+						chat.hotMinIdx = coldMsg.length;
+						chat.readedMessageIdx = chat.readedMessageIdx || 0;
+
+						finalChats.push(chat);
+					} catch (e) {}
+				});
+
+				chatsData.chats = finalChats;
+				this.initChats(chatsData);
+				resolve();
+			});
 		},
-		findMessage: (state) => (chat, msgInfo) => {
-			if (!chat) {
-				return null;
-			}
-			if (msgInfo.id) {
-				for (let idx = chat.messages.length - 1; idx >= 0; idx--) {
-					let m = chat.messages[idx];
-					if (m.id && msgInfo.id == m.id) {
-						return m;
-					}
-					if (m.id && m.id < msgInfo.id) {
-						break;
-					}
-				}
-			}
-			if (msgInfo.selfSend && msgInfo.tmpId) {
-				for (let idx = chat.messages.length - 1; idx >= 0; idx--) {
-					let m = chat.messages[idx];
-					if (!m.selfSend || !m.tmpId) {
-						continue;
-					}
-					if (msgInfo.tmpId == m.tmpId) {
-						return m;
-					}
-					if (m.tmpId && m.tmpId < msgInfo.tmpId) {
-						break;
-					}
-				}
-			}
-			return null;
-		}
-	}
-});
\ No newline at end of file
+  },
+  getters: {
+    curChats: (state) => {
+      if (cacheChats && state.loading) {
+        return cacheChats;
+      }
+      return state.chats;
+    },
+    findChatIdx: (state) => (chat) => {
+      let chats = state.curChats;
+      for (let idx in chats) {
+        if (chats[idx].type == chat.type &&
+          chats[idx].targetId === chat.targetId) {
+          chat = state.chats[idx];
+          return idx;
+        }
+      }
+    },
+    findChat: (state) => (chat) => {
+      let chats = state.curChats;
+      let idx = state.findChatIdx(chat);
+      return chats[idx];
+    },
+    findChatByFriend: (state) => (fid) => {
+      return state.curChats.find(chat => chat.type == 'PRIVATE' &&
+        chat.targetId == fid)
+    },
+    findChatByGroup: (state) => (gid) => {
+      return state.curChats.find(chat => chat.type == 'GROUP' &&
+        chat.targetId == gid)
+    },
+    findMessage: (state) => (chat, msgInfo) => {
+      if (!chat) {
+        return null;
+      }
+      if (msgInfo.id) {
+        for (let idx = chat.messages.length - 1; idx >= 0; idx--) {
+          let m = chat.messages[idx];
+          if (m.id && msgInfo.id == m.id) {
+            return m;
+          }
+          if (m.id && m.id < msgInfo.id) {
+            break;
+          }
+        }
+      }
+      if (msgInfo.selfSend && msgInfo.tmpId) {
+        for (let idx = chat.messages.length - 1; idx >= 0; idx--) {
+          let m = chat.messages[idx];
+          if (!m.selfSend || !m.tmpId) {
+            continue;
+          }
+          if (msgInfo.tmpId == m.tmpId) {
+            return m;
+          }
+          if (m.tmpId && m.tmpId < msgInfo.tmpId) {
+            break;
+          }
+        }
+      }
+      return null;
+    }
+  }
+})
\ No newline at end of file