From 2fff814c79839c936b43c3082185d7b0e81aa060 Mon Sep 17 00:00:00 2001 From: YiLin <482244139@qq.com> Date: Wed, 5 Aug 2026 17:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=99=BA=E8=83=BD=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/Chat/Chat.vue | 52 ++++--- unpackage/dist/dev/app-plus/app-service.js | 149 +++++++++++++++------ utils/cloud-api.js | 47 +++++++ 3 files changed, 175 insertions(+), 73 deletions(-) diff --git a/pages/Chat/Chat.vue b/pages/Chat/Chat.vue index 3d75f87..e03595e 100644 --- a/pages/Chat/Chat.vue +++ b/pages/Chat/Chat.vue @@ -367,7 +367,8 @@ getUserInfo, getUserAvatar, conversationMessageDownload, - getAgentList + getAgentList, + addConversationAgent } from '@/utils/cloud-api.js' import { getToken, @@ -773,32 +774,26 @@ import { openFile as openFileNative, downloadAndOpen } from '@/utils/fileOpener. } const handleAgentSelect = async (agent) => { - console.log("点击了",agent.title); - // try { - // closeAgentModal() - // const chars = '0123456789abcdef' - // let name = '' - // for (let i = 0; i < 24; i++) { - // name += chars[Math.floor(Math.random() * chars.length)] - // } - // const workspaceId = await createWorkspace(userToken.value, name) - // if (!workspaceId) { - // uni.showToast({ title: '工作区创建失败', icon: 'none' }) - // return - // } - // const loginInfo = uni.getStorageSync('yxd_login_info') - // const userName = loginInfo ? (loginInfo.username || '') : '' - // const conversationId = await createConversation(userToken.value, workspaceId, agent.title, userName) - // if (!conversationId) { - // uni.showToast({ title: '智能体会话创建失败', icon: 'none' }) - // return - // } - // uni.showToast({ title: `已创建「${agent.title}」会话`, icon: 'success' }) - // takeUserConversations() - // } catch (error) { - // console.error('创建智能体会话失败：', error) - // uni.showToast({ title: '创建失败，请重试', icon: 'none' }) - // } + closeAgentModal() + uni.showLoading({ title: '正在创建智能体...', mask: true }) + try { + const result = await addConversationAgent(userToken.value, agent._id) + if (!result || !result.conversation_id) { + uni.hideLoading() + uni.showToast({ title: '智能体会话创建失败', icon: 'none' }) + return + } + // 刷新会话列表 + await takeUserConversations() + // 切换到新创建的会话 + currentSessionId.value = result.conversation_id + uni.hideLoading() + uni.showToast({ title: `已创建「${result.title || agent.title}」会话`, icon: 'success' }) + } catch (error) { + uni.hideLoading() + console.error('创建智能体会话失败：', error) + uni.showToast({ title: typeof error === 'string' ? error : '创建失败，请重试', icon: 'none' }) + } } // 侧边栏相关 @@ -1720,8 +1715,7 @@ import { openFile as openFileNative, downloadAndOpen } from '@/utils/fileOpener. const rawMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize, 0) || []; // API 返回的数据已被过滤，无法通过数量判断是否有更多，始终尝试加载更多 allmessages.value = rawMessages - console.log("获取到的所有消息：", JSON.stringify(allmessages.value) ); - // console.log("获取到的所有消息：", allmessages.value); + // console.log("获取到的所有消息：", JSON.stringify(allmessages.value) ); // currentMessages.value = allmessages.value.slice(-pageInfoNumber); // 数据获取后执行滚动 scrollToBottom(); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 909c97d..c344ba2 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1586,6 +1586,49 @@ if (uni.restoreGlobal) { } else { reject(`获取智能体列表失败：${res.statusCode}`); } + }, + fail: (err) => { + const msg = err.errMsg || "网络错误"; + reject(msg); + } + }); + }); + }; + const addConversationAgent = (token, agent_id) => { + return new Promise((resolve, reject) => { + uni.request({ + url: `${BASE_URL$1}/cloud_api/phone/conversation/agent/add`, + method: "POST", + header: { + "Content-Type": "application/json" + }, + data: { + "access_token": token, + "agent_id": agent_id + }, + success: (res) => { + if (res.statusCode === 200) { + const respond = res.data; + if ((respond == null ? void 0 : respond.success) && (respond == null ? void 0 : respond.conversation_id)) { + if (respond.workspace_id) { + uni.setStorageSync("workspace_id", respond.workspace_id); + } + resolve({ + conversation_id: respond.conversation_id, + workspace_id: respond.workspace_id, + title: respond.title || "" + }); + } else { + const msg = (respond == null ? void 0 : respond.error) || "创建智能体会话出错啦"; + reject(msg); + } + } else { + reject(`创建智能体会话失败：${res.statusCode}`); + } + }, + fail: (err) => { + const msg = err.errMsg || "网络错误"; + reject(msg); } }); }); @@ -5769,7 +5812,7 @@ This will fail in production.`); if (friendSocketStore.isConnected) return; if (!userToken.value || !UserId.value) { - formatAppLog("warn", "at pages/Chat/Chat.vue:408", "Token或UserId未准备好"); + formatAppLog("warn", "at pages/Chat/Chat.vue:409", "Token或UserId未准备好"); return; } friendSocketStore.connect({ @@ -5966,7 +6009,7 @@ This will fail in production.`); }); return html; } catch (e2) { - formatAppLog("error", "at pages/Chat/Chat.vue:616", "解析失败", e2); + formatAppLog("error", "at pages/Chat/Chat.vue:617", "解析失败", e2); return content; } }; @@ -6017,7 +6060,7 @@ This will fail in production.`); files }; } catch (e2) { - formatAppLog("error", "at pages/Chat/Chat.vue:685", "解析文件信息失败:", e2); + formatAppLog("error", "at pages/Chat/Chat.vue:686", "解析文件信息失败:", e2); return { textContent: content, files: [] @@ -6055,7 +6098,7 @@ This will fail in production.`); closeNewChatModal(); takeUserConversations(); } catch (error) { - formatAppLog("error", "at pages/Chat/Chat.vue:731", "新建普通会话失败：", error); + formatAppLog("error", "at pages/Chat/Chat.vue:732", "新建普通会话失败：", error); uni.showToast({ title: "创建会话失败，请重试", icon: "none" @@ -6082,7 +6125,7 @@ This will fail in production.`); uni.showToast({ title: "获取智能体列表失败", icon: "none" }); } } catch (error) { - formatAppLog("error", "at pages/Chat/Chat.vue:763", "获取智能体列表失败：", error); + formatAppLog("error", "at pages/Chat/Chat.vue:764", "获取智能体列表失败：", error); uni.showToast({ title: "获取智能体列表失败，请重试", icon: "none" }); } finally { agentLoading.value = false; @@ -6093,7 +6136,24 @@ This will fail in production.`); agentList.value = []; }; const handleAgentSelect = async (agent) => { - formatAppLog("log", "at pages/Chat/Chat.vue:776", "点击了", agent.title); + closeAgentModal(); + uni.showLoading({ title: "正在创建智能体...", mask: true }); + try { + const result = await addConversationAgent(userToken.value, agent._id); + if (!result || !result.conversation_id) { + uni.hideLoading(); + uni.showToast({ title: "智能体会话创建失败", icon: "none" }); + return; + } + await takeUserConversations(); + currentSessionId.value = result.conversation_id; + uni.hideLoading(); + uni.showToast({ title: `已创建「${result.title || agent.title}」会话`, icon: "success" }); + } catch (error) { + uni.hideLoading(); + formatAppLog("error", "at pages/Chat/Chat.vue:794", "创建智能体会话失败：", error); + uni.showToast({ title: typeof error === "string" ? error : "创建失败，请重试", icon: "none" }); + } }; const isChatSidebar = vue.ref(false); const handleChatSidebar = () => { @@ -6180,7 +6240,7 @@ This will fail in production.`); }; const previewFileArray = vue.ref([]); const uploadPhoto = () => { - formatAppLog("log", "at pages/Chat/Chat.vue:916", "点击了拍照上传"); + formatAppLog("log", "at pages/Chat/Chat.vue:911", "点击了拍照上传"); uni.chooseImage({ count: 1, sourceType: ["camera", "album"], @@ -6203,7 +6263,7 @@ This will fail in production.`); }); }, fail: (err) => { - formatAppLog("error", "at pages/Chat/Chat.vue:934", "选择图片失败", err); + formatAppLog("error", "at pages/Chat/Chat.vue:929", "选择图片失败", err); } }); }; @@ -6212,12 +6272,12 @@ This will fail in production.`); }; const fileList = vue.ref([]); const uploadFile = () => { - formatAppLog("log", "at pages/Chat/Chat.vue:945", "点击了上传文件"); + formatAppLog("log", "at pages/Chat/Chat.vue:940", "点击了上传文件"); chooseFile({ count: 5, type: "all", success: (res) => { - formatAppLog("log", "at pages/Chat/Chat.vue:950", "成功了"); + formatAppLog("log", "at pages/Chat/Chat.vue:945", "成功了"); fileList.value = res.tempFiles; previewFileArray.value.push(...res.tempFiles); uni.showToast({ @@ -6226,7 +6286,7 @@ This will fail in production.`); }); }, fail: (err) => { - formatAppLog("error", "at pages/Chat/Chat.vue:961", "选择失败:", err); + formatAppLog("error", "at pages/Chat/Chat.vue:956", "选择失败:", err); uni.showToast({ title: "选择失败", icon: "error" @@ -6465,7 +6525,7 @@ This will fail in production.`); previewFileArray.value = []; } catch (err) { uni.hideLoading(); - formatAppLog("error", "at pages/Chat/Chat.vue:1236", "文件上传失败:", err); + formatAppLog("error", "at pages/Chat/Chat.vue:1231", "文件上传失败:", err); uni.showToast({ title: "文件上传失败，请重试", icon: "error" @@ -6599,15 +6659,15 @@ This will fail in production.`); } }; const stopConversation = async () => { - formatAppLog("log", "at pages/Chat/Chat.vue:1406", "中断对话 - 当前会话ID:", currentSessionId.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1401", "中断对话 - 当前会话ID:", currentSessionId.value); try { await socketStore.send({ type: "stop", conversation_id: currentSessionId.value }); - formatAppLog("log", "at pages/Chat/Chat.vue:1412", "中断指令已发送成功"); + formatAppLog("log", "at pages/Chat/Chat.vue:1407", "中断指令已发送成功"); } catch (err) { - formatAppLog("error", "at pages/Chat/Chat.vue:1414", "中断指令发送失败:", err); + formatAppLog("error", "at pages/Chat/Chat.vue:1409", "中断指令发送失败:", err); } if (streamingMessageId.value) { allmessages.value = allmessages.value.filter((m) => m._id !== streamingMessageId.value); @@ -6625,9 +6685,9 @@ This will fail in production.`); }); }; vue.watch(() => socketStore.isThinking, async (newVal, oldVal) => { - formatAppLog("log", "at pages/Chat/Chat.vue:1438", "isThinking 变化:", oldVal, "→", newVal, "messageString:", socketStore.messageString); + formatAppLog("log", "at pages/Chat/Chat.vue:1433", "isThinking 变化:", oldVal, "→", newVal, "messageString:", socketStore.messageString); if (!oldVal && newVal) { - formatAppLog("log", "at pages/Chat/Chat.vue:1441", "AI开始回复（跨设备同步），锁定输入框"); + formatAppLog("log", "at pages/Chat/Chat.vue:1436", "AI开始回复（跨设备同步），锁定输入框"); isThinking.value = true; if (!isSelfSent.value) { await takeConversationMessages(); @@ -6644,7 +6704,7 @@ This will fail in production.`); return; } if (oldVal && !newVal) { - formatAppLog("log", "at pages/Chat/Chat.vue:1460", "AI回复结束（正常/中断），解锁并刷新消息列表"); + formatAppLog("log", "at pages/Chat/Chat.vue:1455", "AI回复结束（正常/中断），解锁并刷新消息列表"); await takeConversationMessages(); if (streamingMessageId.value) { allmessages.value = allmessages.value.filter((m) => m._id !== streamingMessageId.value); @@ -6715,15 +6775,15 @@ This will fail in production.`); UserData.value = await getUserInfo(userToken.value); UserId.value = UserData.value._id; UserAvatar.value = UserData.value.avatar || ""; - formatAppLog("log", "at pages/Chat/Chat.vue:1547", "用户信息已加载:", UserId.value, UserAvatar.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1542", "用户信息已加载:", UserId.value, UserAvatar.value); } catch (error) { - formatAppLog("error", "at pages/Chat/Chat.vue:1549", "获取用户信息失败:", error); + formatAppLog("error", "at pages/Chat/Chat.vue:1544", "获取用户信息失败:", error); } }; const takeUserConversations = async () => { try { userToken.value = getToken(); - formatAppLog("log", "at pages/Chat/Chat.vue:1557", "token:", userToken.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1552", "token:", userToken.value); UserConversations.value = await getUserConversations(userToken.value) || []; const savedSessionId = getCurrentSessionId(); if (savedSessionId && UserConversations.value.some((c) => c._id === savedSessionId)) { @@ -6733,7 +6793,7 @@ This will fail in production.`); } else { currentSessionId.value = ""; } - formatAppLog("log", "at pages/Chat/Chat.vue:1569", "保存会话id：", currentSessionId.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1564", "保存会话id：", currentSessionId.value); uni.setStorageSync("currentSessionId", currentSessionId.value); } catch (error) { uni.showToast({ @@ -6745,17 +6805,17 @@ This will fail in production.`); const FriendInfoList = vue.ref([]); const takeFriendList = async () => { try { - formatAppLog("log", "at pages/Chat/Chat.vue:1584", "开始获取好友列表"); + formatAppLog("log", "at pages/Chat/Chat.vue:1579", "开始获取好友列表"); const friendList = await getChatFriend(UserId.value); - formatAppLog("log", "at pages/Chat/Chat.vue:1587", "friendList:", friendList); + formatAppLog("log", "at pages/Chat/Chat.vue:1582", "friendList:", friendList); if (friendList && friendList.length) { FriendInfoList.value = await takeUserAvatar(friendList); } else { FriendInfoList.value = []; - formatAppLog("log", "at pages/Chat/Chat.vue:1592", "好友列表为空"); + formatAppLog("log", "at pages/Chat/Chat.vue:1587", "好友列表为空"); } } catch (error) { - formatAppLog("error", "at pages/Chat/Chat.vue:1595", "获取好友列表失败:", error); + formatAppLog("error", "at pages/Chat/Chat.vue:1590", "获取好友列表失败:", error); FriendInfoList.value = []; } finally { UserConversations.value = FriendInfoList.value; @@ -6782,17 +6842,17 @@ This will fail in production.`); }; }); } catch (err) { - formatAppLog("error", "at pages/Chat/Chat.vue:1625", "获取好友头像失败", err); + formatAppLog("error", "at pages/Chat/Chat.vue:1620", "获取好友头像失败", err); return friendList; } }; const GroupList = vue.ref([]); const takeGroupList = async () => { try { - formatAppLog("log", "at pages/Chat/Chat.vue:1635", "开始获取群聊列表"); + formatAppLog("log", "at pages/Chat/Chat.vue:1630", "开始获取群聊列表"); GroupList.value = await getGroup(UserId.value); } catch (error) { - formatAppLog("error", "at pages/Chat/Chat.vue:1640", "获取群聊列表失败:", error); + formatAppLog("error", "at pages/Chat/Chat.vue:1635", "获取群聊列表失败:", error); GroupList.value = []; } finally { UserConversations.value = GroupList.value; @@ -6804,22 +6864,22 @@ This will fail in production.`); return []; try { const memberIds = memberList.map((item) => item.groupContactId); - formatAppLog("log", "at pages/Chat/Chat.vue:1654", "请求头像的ID列表:", memberIds); + formatAppLog("log", "at pages/Chat/Chat.vue:1649", "请求头像的ID列表:", memberIds); const memberAvatarList = await getUserAvatar(userToken.value, memberIds); - formatAppLog("log", "at pages/Chat/Chat.vue:1656", "头像接口返回数据:", memberAvatarList); + formatAppLog("log", "at pages/Chat/Chat.vue:1651", "头像接口返回数据:", memberAvatarList); const userMap = new Map(memberAvatarList.map((user) => [user.user_id, user]) || []); - formatAppLog("log", "at pages/Chat/Chat.vue:1659", "userMap的keys:", Array.from(userMap.keys())); + formatAppLog("log", "at pages/Chat/Chat.vue:1654", "userMap的keys:", Array.from(userMap.keys())); return memberList.map((member) => { const memberId = member.groupContactId; const userInfo = userMap.get(memberId); - formatAppLog("log", "at pages/Chat/Chat.vue:1664", `查找 ${memberId} 的头像:`, userInfo); + formatAppLog("log", "at pages/Chat/Chat.vue:1659", `查找 ${memberId} 的头像:`, userInfo); return { ...member, avatar: (userInfo == null ? void 0 : userInfo.avatar) || null }; }); } catch (err) { - formatAppLog("error", "at pages/Chat/Chat.vue:1671", "获取群成员头像失败", err); + formatAppLog("error", "at pages/Chat/Chat.vue:1666", "获取群成员头像失败", err); return memberList; } }; @@ -6852,7 +6912,6 @@ This will fail in production.`); hasMoreAIMessages.value = true; const rawMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize$1, 0) || []; allmessages.value = rawMessages; - formatAppLog("log", "at pages/Chat/Chat.vue:1723", "获取到的所有消息：", JSON.stringify(allmessages.value)); scrollToBottom(); } catch (error) { uni.showToast({ @@ -6885,12 +6944,12 @@ This will fail in production.`); hasMoreGroupMessages.value = true; const rawMessages = await getGroupMessages(currentSessionId.value, pageSize$1, 0) || []; allmessages.value = rawMessages; - formatAppLog("log", "at pages/Chat/Chat.vue:1761", "群聊消息：", allmessages.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1755", "群聊消息：", allmessages.value); const memberList = await getGroupMemberList(currentSessionId.value); - formatAppLog("log", "at pages/Chat/Chat.vue:1764", "获取到的群成员列表：", memberList); + formatAppLog("log", "at pages/Chat/Chat.vue:1758", "获取到的群成员列表：", memberList); if (memberList && memberList.length) { groupMemberList.value = await takeGroupMemberAvatar(memberList); - formatAppLog("log", "at pages/Chat/Chat.vue:1767", "群成员列表（带头像）：", groupMemberList.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1761", "群成员列表（带头像）：", groupMemberList.value); } else { groupMemberList.value = []; } @@ -6929,7 +6988,7 @@ This will fail in production.`); hasMoreAIMessages.value = false; } } catch (e2) { - formatAppLog("error", "at pages/Chat/Chat.vue:1829", "加载更多消息失败:", e2); + formatAppLog("error", "at pages/Chat/Chat.vue:1823", "加载更多消息失败:", e2); uni.showToast({ title: "加载更多失败", icon: "none" }); } finally { isAILoadingMore.value = false; @@ -6951,7 +7010,7 @@ This will fail in production.`); hasMoreFriendMessages.value = false; } } catch (e2) { - formatAppLog("error", "at pages/Chat/Chat.vue:1854", "加载更多好友消息失败:", e2); + formatAppLog("error", "at pages/Chat/Chat.vue:1848", "加载更多好友消息失败:", e2); uni.showToast({ title: "加载更多失败", icon: "none" }); } finally { isFriendLoadingMore.value = false; @@ -6973,7 +7032,7 @@ This will fail in production.`); hasMoreGroupMessages.value = false; } } catch (e2) { - formatAppLog("error", "at pages/Chat/Chat.vue:1879", "加载更多群聊消息失败:", e2); + formatAppLog("error", "at pages/Chat/Chat.vue:1873", "加载更多群聊消息失败:", e2); uni.showToast({ title: "加载更多失败", icon: "none" }); } finally { isGroupLoadingMore.value = false; @@ -6989,9 +7048,9 @@ This will fail in production.`); } }; vue.watch(() => friendSocketStore.MessageReceived, (newId) => { - formatAppLog("log", "at pages/Chat/Chat.vue:1900", "收到了好友消息"); + formatAppLog("log", "at pages/Chat/Chat.vue:1894", "收到了好友消息"); if (newId) { - formatAppLog("log", "at pages/Chat/Chat.vue:1902", "ChatType:", ChatType.value); + formatAppLog("log", "at pages/Chat/Chat.vue:1896", "ChatType:", ChatType.value); switch (ChatType.value) { case 0: takeConversationMessages(); @@ -7006,7 +7065,7 @@ This will fail in production.`); friendSocketStore.MessageReceived = false; break; default: - formatAppLog("log", "at pages/Chat/Chat.vue:1918", "default 分支"); + formatAppLog("log", "at pages/Chat/Chat.vue:1912", "default 分支"); friendSocketStore.MessageReceived = false; break; } @@ -7113,6 +7172,8 @@ This will fail in production.`); return conversationMessageDownload; }, get getAgentList() { return getAgentList; + }, get addConversationAgent() { + return addConversationAgent; }, get getToken() { return getToken; }, get getCurrentSessionId() { diff --git a/utils/cloud-api.js b/utils/cloud-api.js index f16938a..5e1d3b7 100644 --- a/utils/cloud-api.js +++ b/utils/cloud-api.js @@ -1759,6 +1759,53 @@ export const getAgentList = (token) => { } else { reject(`获取智能体列表失败：${res.statusCode}`) } + }, + fail: (err) => { + const msg = err.errMsg || '网络错误'; + reject(msg); + } + }) + }) +} + +// 创建智能体会话 +export const addConversationAgent = (token, agent_id) => { + return new Promise((resolve, reject) => { + uni.request({ + url: `${BASE_URL}/cloud_api/phone/conversation/agent/add`, + method: "POST", + header: { + "Content-Type": "application/json" + }, + data: { + "access_token": token, + "agent_id": agent_id + }, + success: (res) => { + if (res.statusCode === 200) { + const respond = res.data + // 返回格式: { success: true, title: "...", conversation_id: "...", workspace_id: "..." } + if (respond?.success && respond?.conversation_id) { + // 保存 workspace_id 到本地存储 + if (respond.workspace_id) { + uni.setStorageSync('workspace_id', respond.workspace_id) + } + resolve({ + conversation_id: respond.conversation_id, + workspace_id: respond.workspace_id, + title: respond.title || '' + }) + } else { + const msg = respond?.error || '创建智能体会话出错啦' + reject(msg) + } + } else { + reject(`创建智能体会话失败：${res.statusCode}`) + } + }, + fail: (err) => { + const msg = err.errMsg || '网络错误' + reject(msg) } }) })