feat: 全面支持deepseek

2025-02-03 01:18:15 +08:00
parent 25929483c3
commit 9a73789788
6 changed files with 214 additions and 194 deletions
--- a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Application/Services/AiChatService.cs
+++ b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Application/Services/AiChatService.cs
@@ -41,7 +41,7 @@ namespace Yi.Framework.ChatHub.Application.Services
                        var str = stringQueue.Dequeue();
                        currentStr.Append(str);
                    }
-                    await _userMessageManager.SendMessageAsync(MessageContext.CreateAi(currentStr.ToString(), CurrentUser.Id!.Value, contextId));
+                    await _userMessageManager.SendMessageAsync(MessageContext.CreateAi(currentStr.ToString(), CurrentUser.Id!.Value, contextId),model);
                }
            }

@@ -51,7 +51,7 @@ namespace Yi.Framework.ChatHub.Application.Services
                var str = stringQueue.Dequeue();
                currentEndStr.Append(str);
            }
-            await _userMessageManager.SendMessageAsync(MessageContext.CreateAi(currentEndStr.ToString(), CurrentUser.Id!.Value, contextId));
+            await _userMessageManager.SendMessageAsync(MessageContext.CreateAi(currentEndStr.ToString(), CurrentUser.Id!.Value, contextId),model);
        }
    }
 }
--- a/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs
+++ b/Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs
@@ -31,7 +31,14 @@ namespace Yi.Framework.ChatHub.Domain.Managers
        private IRedisClient RedisClient => LazyServiceProvider.LazyGetRequiredService<IRedisClient>();
        private string CacheKeyPrefix => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpDistributedCacheOptions>>().Value.KeyPrefix;

-        public async Task SendMessageAsync(MessageContext context)
+        
+        /// <summary>
+        ///  发送消息
+        /// </summary>
+        /// <param name="context">消息内容</param>
+        /// <param name="relStr">关联字符</param>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task SendMessageAsync(MessageContext context,string relStr=null)
        {
            switch (context.MessageType)
            {
@@ -39,20 +46,20 @@ namespace Yi.Framework.ChatHub.Domain.Managers
                    var userModel = await GetUserAsync(context.ReceiveId.Value);
                    if (userModel is not null)
                    {
-                        await _hubContext.Clients.Client(userModel.ClientId).SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType, context);
+                        await _hubContext.Clients.Client(userModel.ClientId).SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType,relStr, context);
                    }
                    break;
                case MessageTypeEnum.Group:
                    throw new NotImplementedException();
                    break;
                case MessageTypeEnum.All:
-                    await _hubContext.Clients.All.SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType, context);
+                    await _hubContext.Clients.All.SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType,relStr, context);
                    break;
                case MessageTypeEnum.Ai:
                    var userModel2 = await GetUserAsync(context.ReceiveId.Value);
                    if (userModel2 is not null)
                    {
-                        await _hubContext.Clients.Client(userModel2.ClientId).SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType, context);
+                        await _hubContext.Clients.Client(userModel2.ClientId).SendAsync(ChatConst.ClientActionReceiveMsg, context.MessageType,relStr, context);
                    }
                    break;

--- a/Yi.Bbs.Vue3/src/apis/chatMessageApi.js
+++ b/Yi.Bbs.Vue3/src/apis/chatMessageApi.js
@@ -22,9 +22,9 @@ export function sendGroupMessage(data) {
    });
  }

-  export function sendAiChat(data) {
+  export function sendAiChat(data,model) {
    return request({
-      url: "/ai-chat/chat",
+      url: `/ai-chat/chat/${model}`,
      method: "post",
      data
    });
--- a/Yi.Bbs.Vue3/src/hubs/chatHub.js
+++ b/Yi.Bbs.Vue3/src/hubs/chatHub.js
@@ -12,18 +12,16 @@ const receiveMsg = (connection) => {
        chatStore.delUser(userId);
    });
    //接受其他用户消息
-    connection.on("receiveMsg", (type, content) => {
+    connection.on("receiveMsg", (type,relStr, content) => {
        const letChatStore = useChatStore();
        //如果是ai消息，还要进行流式显示
-       // alert(type)
-        if (type == 3) {
+        if (type === 3) {//（ai消息，还需要支持动态类型）
+            content.messageType ='ai@'+ relStr;
            letChatStore.addOrUpdateMsg(content);
        }
        else {
            letChatStore.addMsg(content);
        }
-
-
    });
    //用户状态-正在输入中，无
    connection.on("userStatus", (type) => {
--- a/Yi.Bbs.Vue3/src/stores/chat.js
+++ b/Yi.Bbs.Vue3/src/stores/chat.js
@@ -5,16 +5,20 @@ const chatStore = defineStore("chat", {
    msgList: []
  }),
  getters: {
-    allMsgContext: (state) => state.msgList.filter(x => x.messageType == "All"),
-    personalMsgContext: (state) => state.msgList.filter(x => x.messageType == "Personal"),
-    aiMsgContext: (state) => state.msgList.filter(x => x.messageType == "Ai")
+    allMsgContext: (state) => state.msgList.filter(x => x.messageType === "All"),
+    personalMsgContext: (state) => state.msgList.filter(x => x.messageType === "Personal"),
+    // aiMsgContext: (state) => state.msgList.filter(x => x.messageType === "Ai"),
+    //获取msg，通过类型
+    getMsgContextFunc: (state) => (messageType) => {
+      return state.msgList.filter(item => item.messageType === messageType);
+    },
  },
  actions:
  {
    addOrUpdateMsg(msg) {
-      var currentMsg = this.msgList.filter(x => x.id == msg.id)[0];
+      var currentMsg = this.msgList.filter(x => x.id === msg.id)[0];
      //当前没有包含,如果有相同的上下文id，只需要改变content即可
-      if (currentMsg == undefined) {
+      if (currentMsg === undefined) {
        this.addMsg(msg);
      }
      else {
@@ -22,9 +26,9 @@ const chatStore = defineStore("chat", {
      }

    },
-    clearAiMsg()
+    clearTypeMsg(messageType)
    {
-      this.msgList=this.msgList.filter(x => x.messageType != "Ai")
+      this.msgList=this.msgList.filter(x => x.messageType !==messageType)
    },
    setMsgList(value) {
      this.msgList = value;
@@ -39,7 +43,7 @@ const chatStore = defineStore("chat", {
      this.userList.push(user);
    },
    delUser(userId) {
-      this.userList = this.userList.filter(obj => obj.userId != userId);
+      this.userList = this.userList.filter(obj => obj.userId !== userId);
    }
  },
 });
--- a/Yi.Bbs.Vue3/src/views/chathub/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/chathub/Index.vue
@@ -40,7 +40,13 @@ const currentInputValue = ref("");
 const inputListDataStore = ref([
  {key: "all", name: "官方学习交流群", titleName: "官方学习交流群", logo: "yilogo.png", value: ""},
  {key: "ai@deepseek-chat", name: "DeepSeek聊天", titleName: "DeepSeek-聊天模式", logo: "deepSeekAi.png", value: ""},
-    {key: "ai@deepseek-reasoner",name:"DeepSeek思索",titleName:"DeepSeek-思索模式",logo:"deepSeekAi.png", value: ""},
+  {
+    key: "ai@DeepSeek-R1",
+    name: "DeepSeek思索",
+    titleName: "DeepSeek-思索模式",
+    logo: "deepSeekAi.png",
+    value: ""
+  },
  {key: "ai@gpt-4o-mini", name: "ChatGpt聊天", titleName: "ChatGpt-聊天模式", logo: "openAi.png", value: ""},
 ]);
 //AI聊天临时存储
@@ -60,7 +66,9 @@ onMounted(async () => {
      onclickClose();
    }, 3000);
  }
+  //all的聊天消息
  chatStore.setMsgList((await getChatAccountMessageList()).data);
+  //在线用户列表
  chatStore.setUserList((await getChatUserList()).data);
  startCountTip();
 })
@@ -83,11 +91,9 @@ const currentMsgContext = computed(() => {
  //选择ai
  else if (selectIsAi()) {
    //如果是ai的值，还行经过markdown处理
-    // console.log(chatStore.aiMsgContext, "chatStore.aiMsgContext");
-    // return chatStore.aiMsgContext;
    let tempHtml = [];
    codeCopyDic = [];
-    chatStore.aiMsgContext.forEach(element => {
+    chatStore.getMsgContextFunc(currentSelectUser.value).forEach(element => {
      tempHtml.push({
        content: toMarkDownHtml(element.content),
        messageType: 'Ai',
@@ -109,19 +115,17 @@ const currentMsgContext = computed(() => {
    });
  }
 });
-//图片
+//获取聊天内容的头像
 const getChatUrl = (url, position) => {
-  if (position === "left" && selectIsAi()) {
-    return "/openAi.png"
+  if (position === "left" && (selectIsAi()||selectIsAll())) {
+    return imageSrc(inputListDataStore.value.find(x=>x.key===currentSelectUser.value).logo)
  }
  return getUrl(url);
 }
 //当前聊天框显示的名称
 const currentHeaderName = computed(() => {
-  if (selectIsAll()) {
-    return "官方学习交流群";
-  } else if (selectIsAi()) {
-    return "Ai-ChatGpt4.0(你的私人ai小助手)"
+  if (selectIsAll()||selectIsAi()) {
+    return inputListDataStore.value.find(x=>x.key===currentSelectUser.value).name;
  } else {
    return currentSelectUser.value.userName;
  }
@@ -138,8 +142,13 @@ const selectIsAll = () => {
 };
 //当前选择的是否为Ai
 const selectIsAi = () => {
-  return currentSelectUser.value === 'ai';
+  //以ai@开头
+  return /^ai@/.test(currentSelectUser.value);
 };
+//是否为公共的类型
+const  isPublicType=(itemType)=>{
+  return  itemType==='all'||/^ai@/.test(itemType);
+}

 //输入框的值被更改（同时保存到store中）
 const changeInputValue = (inputValue) => {
@@ -149,7 +158,7 @@ const changeInputValue = (inputValue) => {
  if (selectIsAll()) {
    findKey = 'all';
  } else if (selectIsAi()) {
-    findKey = 'ai';
+    findKey = currentSelectUser.value;
  }
  index = inputListDataStore.value.findIndex(obj => obj.key === findKey);
  inputListDataStore.value[index].value = currentInputValue.value;
@@ -160,11 +169,11 @@ const getCurrentInputValue = () => {
  if (selectIsAll()) {
    return inputListDataStore.value.filter(x => x.key === "all")[0].value;
  } else if (selectIsAi()) {
-    return inputListDataStore.value.filter(x => x.key === "ai")[0].value;
+    return inputListDataStore.value.filter(x => x.key === currentSelectUser.value)[0].value;
  } else {
    //如果不存在初始存储值
    if (!inputListDataStore.value.some(x => x.key === currentSelectUser.value.userId)) {
-      inputListDataStore.value.push({key: currentSelectUser.value.userId, value: ""});
+      inputListDataStore.value.push({key: currentSelectUser.value.userId, value: "",type:'user'});
      return "";
    }
    return inputListDataStore.value.filter(x => x.key === currentSelectUser.value.userId)[0].value;
@@ -173,11 +182,12 @@ const getCurrentInputValue = () => {

 //点击用户列表,
 const onclickUserItem = (userInfo, itemType) => {
-  if (itemType === "all") {
-    currentSelectUser.value = 'all';
-  } else if (itemType === "ai") {
-    currentSelectUser.value = 'ai';
-  } else {
+  //公共
+  if (isPublicType(itemType)) {
+    currentSelectUser.value = itemType;
+  }
+  //个人
+  else {
    currentSelectUser.value = userInfo;
  }
  //填充临时存储的输入框
@@ -188,6 +198,7 @@ const onclickUserItem = (userInfo, itemType) => {

 //点击发送按钮
 const onclickSendMsg = () => {
+  //发送空消息
  if (currentInputValue.value === "") {
    msgIsNullShow.value = true;
    setTimeout(() => {
@@ -204,18 +215,24 @@ const onclickSendMsg = () => {
    sendAiChatContext.value.push({
      answererType: 'User',
      message: currentInputValue.value,
-      number: sendAiChatContext.value.length
+      number: sendAiChatContext.value.length,
+      messageType: currentSelectUser.value
    })

    //离线前端存储
    chatStore.addMsg({
-      messageType: "Ai",
+      messageType: currentSelectUser.value,
      content: currentInputValue.value,
      sendUserId: userStore.id,
      sendUserInfo: {user: {icon: userStore.icon}}
    })
+    //ai模型，去掉key的ai@开头的字符串
+    const model=currentSelectUser.value.replace(/^ai@/, '');
+    //上下文内容，当前ai进行隔离
+   const content= sendAiChatContext.value.filter(x=>x.messageType===currentSelectUser.value)
+    
    //发送ai消息
-    sendAiChat(sendAiChatContext.value);
+    sendAiChat(content,model);
  } else {
    onclickSendPersonalMsg(currentSelectUser.value.userId, currentInputValue.value);
  }
@@ -247,11 +264,11 @@ const onclickSendGroupMsg = (groupName, msg) => {

 //获取当前最后一条信息（显示在左侧菜单）
 const getLastMessage = ((receiveId, itemType) => {
-  if (itemType === "all") {
-    return chatStore.allMsgContext[chatStore.allMsgContext.length - 1]?.content.substring(0, 15);
-  } else if (itemType === "ai") {
-    return chatStore.aiMsgContext[chatStore.aiMsgContext.length - 1]?.content.substring(0, 15);
-  } else {
+  if (isPublicType(itemType)) {
+    const message = chatStore.getMsgContextFunc(itemType);
+    return message[message.length - 1]?.content.substring(0, 15);
+  } 
+  else {
    const messageContext = chatStore.personalMsgContext.filter(x => {
      //两个条件
      //接收用户者id为对面id（我发给他）
@@ -304,9 +321,9 @@ const getLastMessage = ((receiveId, itemType) => {
 //清除ai对话
 const clearAiMsg = () => {
  sendAiChatContext.value = [];
-    chatStore.clearAiMsg();
+  chatStore.clearTypeMsg(currentSelectUser.value);
  ElMessage({
-      message: "当前会话清除成功",
+    message: "当前Ai会话清除成功",
    type: "success",
    duration: 2000,
  });
@@ -447,7 +464,6 @@ const getLastMessage = ((receiveId, itemType) => {
        <li><img src="@/assets/chat_images/phone.png"/></li>
        <li><img src="@/assets/chat_images/other.png"/></li>
      </ul>
-
    </div>

    <div class="middle">
@@ -461,10 +477,7 @@ const getLastMessage = ((receiveId, itemType) => {
        </div>
      </div>
      <div class="user-list">
-        
-        
-        
-        <div  v-for="item in inputListDataStore" :key="item.key" class="user-div" 
+        <div v-for="item in inputListDataStore.filter(x=>x.type!=='user')" :key="item.key" class="user-div"
             @click="onclickUserItem(null, item.key)"
             :class="{ 'select-user-item': currentSelectUser === item.key }">
          <div class="user-div-left">
@@ -479,11 +492,9 @@ const getLastMessage = ((receiveId, itemType) => {
          </div>
        </div>
        
-
        <div v-for="(item, i) in currentUserItem" :key="i" @click="onclickUserItem(item, 'user')" class="user-div"
             :class="{ 'select-user-item': currentSelectUser?.userId === item.userId }">
          <div class="user-div-left">
-
            <img :src="getChatUrl(item.userIcon)"/>
            <div class="user-name-msg">
              <p class="font-name">{{ item.userName }}</p>