新增讨论群信息

修改应用使用，通过配置的应用的appid modelname字段关联 0407 02

.gitignore

@@ -1,6 +1,9 @@
 ######################################################################
 # Build Tools
 
+
+
+
 .gradle
 /build/
 !gradle/wrapper/gradle-wrapper.jar
@@ -8,6 +11,8 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
+ruoyi-modules/ruoyi-generator/src/main/resources/vm/vben5
+
 ######################################################################
 # IDE
 

README.md

@@ -59,7 +59,7 @@
 - 演示地址: https://web.pandarobot.chat
 - 后台管理: https://admin.pandarobot.chat
 - 用户名: admin 密码：admin123
-- 
+
 ### gitcode源码地址
 - https://gitcode.com/ageerle/ruoyi-ai
 - https://gitcode.com/ageerle/ruoyi-web
@@ -168,16 +168,11 @@ RuoYi-AI
 
 该项目使用了MIT授权许可，详情请参阅 [LICENSE.txt](https://github.com/ageerle/ruoyi-ai/blob/main/LICENSE)
 
-
+###  项目现状
-### 作者寄语
-
-最近，我们的项目意外地受到了广泛关注，甚至被许多人误以为是一个已经成熟且能够快速落地的项目。然而，事实并非如此。这个项目是我个人在业余时间进行的研究，主要目的是学习和探索。它是一个以人工智能（AI）为核心的平台，旨在帮助企业通过配置的方式快速构建AI应用。
-
-####  项目现状
 
 目前，项目还处于早期阶段，距离成熟还有很长的路要走。由于个人精力有限，项目的发展速度受到了一定的限制。为了加快项目的进度，我真诚地希望更多人能够参与到项目中来。无论是经验丰富的开发者，还是刚刚入门的小白，我都热烈欢迎你们提交Pull Request（PR）。即使代码修改得很少，或者存在一些错误，都没有关系。我会认真审核每一位贡献者的代码，并和大家一起完善项目。
 
-####  开发计划
+###  开发计划
 
 - 智能体管理
 
@@ -236,4 +231,16 @@ RuoYi-AI
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
 
 
+### 附：讨论群
+    🏠 wx：ruoyi-ai（加人备注：ruoyi-ai）
+  
+    🏠 qq：1603234088 （加人备注：ruoyi-ai）
+
+        👏👏👏 ruoyi-ai官方交流1群（qq区）：1034554687 
+
+<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
+  <img src="image/QQ区-官方交流1群.png" alt="drawing" style="width: 400px; height: 400px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+</div>
+
+
 

pom.xml

@@ -317,7 +317,7 @@
 
             <dependency>
                 <groupId>org.ruoyi</groupId>
-                <artifactId>ruoyi-fusion</artifactId>
+                <artifactId>ruoyi-chat</artifactId>
                 <version>${revision}</version>
             </dependency>
 

ruoyi-admin/pom.xml

@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.ruoyi</groupId>
-            <artifactId>ruoyi-fusion</artifactId>
+            <artifactId>ruoyi-chat</artifactId>
         </dependency>
 
         <dependency>

ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java

@@ -3,7 +3,6 @@ package org.ruoyi.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
-import cn.hutool.json.ObjectMapper;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.ruoyi.common.core.constant.Constants;
 import org.ruoyi.common.core.domain.R;
@@ -76,6 +75,7 @@ public class AuthController {
                 body.getUsername(), body.getPassword(),
                 body.getCode(), body.getUuid());
         loginVo.setToken(token);
+        loginVo.setAccess_token(token);
         loginVo.setUserInfo(LoginHelper.getLoginUser());
         return R.ok(loginVo);
     }

ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java

@@ -1,16 +1,14 @@
 package org.ruoyi.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
-import org.ruoyi.common.chat.config.ChatConfig;
 import org.ruoyi.common.chat.domain.request.ChatRequest;
-import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.entity.chat.Message;
-import org.ruoyi.common.chat.openai.OpenAiStreamClient;
 import org.ruoyi.common.core.domain.R;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.excel.utils.ExcelUtil;
@@ -20,6 +18,7 @@ import org.ruoyi.common.mybatis.core.page.PageQuery;
 import org.ruoyi.common.mybatis.core.page.TableDataInfo;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
 import org.ruoyi.knowledge.domain.bo.KnowledgeAttachBo;
 import org.ruoyi.knowledge.domain.bo.KnowledgeFragmentBo;
 import org.ruoyi.knowledge.domain.bo.KnowledgeInfoBo;
@@ -31,11 +30,9 @@ import org.ruoyi.knowledge.service.EmbeddingService;
 import org.ruoyi.knowledge.service.IKnowledgeAttachService;
 import org.ruoyi.knowledge.service.IKnowledgeFragmentService;
 import org.ruoyi.knowledge.service.IKnowledgeInfoService;
-import org.ruoyi.system.listener.SSEEventSourceListener;
 import org.ruoyi.system.service.ISseService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.List;
@@ -63,47 +60,26 @@ public class KnowledgeController extends BaseController {
 
     private final EmbeddingService embeddingService;
 
-    private OpenAiStreamClient openAiStreamClient;
-
-    private final ChatConfig chatConfig;
-
     private final ISseService sseService;
 
     /**
      * 知识库对话
      */
     @PostMapping("/send")
-    public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest) {
+    public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest, HttpServletRequest request) {
-
-        openAiStreamClient = chatConfig.getOpenAiStreamClient();
-        SseEmitter sseEmitter = new SseEmitter(0L);
-        SSEEventSourceListener openAIEventSourceListener = new SSEEventSourceListener(sseEmitter);
         List<Message> messages = chatRequest.getMessages();
-        String content = messages.get(messages.size() - 1).getContent().toString();
+        // 获取知识库信息
+        Message message = messages.get(messages.size() - 1);
+        StringBuilder sb = new StringBuilder(message.getContent().toString());
         List<String> nearestList;
-        List<Double> queryVector = embeddingService.getQueryVector(content, chatRequest.getKid());
+        List<Double> queryVector = embeddingService.getQueryVector(message.getContent().toString(), chatRequest.getKid());
-        nearestList = vectorStore.nearest(queryVector,chatRequest.getKid());
+        nearestList = vectorStore.nearest(queryVector, chatRequest.getKid());
         for (String prompt : nearestList) {
-            Message sysMessage = Message.builder().content(prompt).role(Message.Role.USER).build();
+            sb.append("\n####").append(prompt);
-            messages.add(sysMessage);
         }
-        Message userMessage = Message.builder().content(content + (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : "") ).role(Message.Role.USER).build();
+        sb.append( (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : ""));
-        messages.add(userMessage);
+        message.setContent(sb.toString());
-        if (chatRequest.getModel().startsWith("ollama")) {
+        return sseService.sseChat(chatRequest, request);
-            return sseService.ollamaChat(chatRequest);
-        }
-
-        ChatCompletion completion = ChatCompletion
-            .builder()
-            .messages(messages)
-            .model(chatRequest.getModel())
-            .temperature(chatRequest.getTemperature())
-            .topP(chatRequest.getTop_p())
-            .stream(true)
-            .build();
-        openAiStreamClient.streamChatCompletion(completion, openAIEventSourceListener);
-
-        return sseEmitter;
     }
 
     /**

ruoyi-common/pom.xml

@@ -34,6 +34,7 @@
         <module>ruoyi-common-chat</module>
         <module>ruoyi-common-pay</module>
         <module>ruoyi-common-wechat</module>
+        <module>ruoyi-common-live</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -169,7 +169,7 @@
             <!-- AI绘画 -->
             <dependency>
                 <groupId>org.ruoyi</groupId>
-                <artifactId>ruoyi-fusion</artifactId>
+                <artifactId>ruoyi-chat</artifactId>
                 <version>${revision}</version>
             </dependency>
 

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java

@@ -40,6 +40,16 @@ public class ChatRequest {
     private String kid;
 
     private String userId;
+
+    /**
+     * 1 联网搜索
+     */
+    private int chat_type;
+
+    /**
+     * 应用ID
+     */
+    private String appId;
 //
 
 //

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/entity/chat/Message.java

@@ -2,6 +2,7 @@ package org.ruoyi.common.chat.entity.chat;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
 
@@ -20,6 +21,8 @@ import java.util.List;
 public class Message extends BaseMessage implements Serializable {
 
     private Object content;
+    @JsonProperty("reasoning_content")
+    private String reasoningContent;
 
     public static Builder builder() {
         return new Builder();

ruoyi-common/ruoyi-common-live/live-chat-client-commons/pom.xml

@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.ruoyi</groupId>
-        <artifactId>ruoyi-live</artifactId>
+        <artifactId>ruoyi-common-live</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>