mcp更新

oa-back/ruoyi-agent/pom.xml

     </description>
 
     <properties>
-        <solon.version>3.9.5</solon.version>
+        <solon.version>4.0.2</solon.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai-mcp</artifactId>
+            <version>4.0.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai-agent</artifactId>
+            <version>4.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
-import io.modelcontextprotocol.server.McpServer;
-import io.modelcontextprotocol.spec.McpServerSession;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.xmlbeans.XmlCursor;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPrGeneral;
 import org.noear.solon.Solon;
+import org.noear.solon.ai.agent.simple.SimpleAgent;
 import org.noear.solon.ai.annotation.ToolMapping;
 import org.noear.solon.ai.chat.ChatModel;
-import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
+import org.noear.solon.ai.chat.prompt.Prompt;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
 import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.server.annotation.McpServerEndpoint;
 import java.util.*;
 
 @Service
-@McpServerEndpoint(channel = McpChannel.STREAMABLE_STATELESS , mcpEndpoint = "/mcp/sse")
+@McpServerEndpoint(channel = McpChannel.STREAMABLE_STATELESS, mcpEndpoint = "/mcp/sse")
 public class McpServiceImpl implements IMcpService {
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalStateException("Milvus service URL 未配置");
         }
-//        milvusClient = new MilvusClientV2(
-//                ConnectConfig.builder()
-//                        .uri(milvusServiceUrl)
-//                        .build());
+        // milvusClient = new MilvusClientV2(
+        // ConnectConfig.builder()
+        // .uri(milvusServiceUrl)
+        // .build());
     }
 
     @PreDestroy
         }
     }
 
+    /**
+     * 获取所有表名列表
+     */
+    @ToolMapping(description = "修改文档格式")
+    public JSONArray ModifyDocumentFormat(@Param(description = "文档路径") String documentPath) {
+        return getAllTableNames();
+    }
+
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      */
     @ToolMapping(description = "章节撰写")
     public AssistantMessage writeParagraph(@Param(description = "知识库名称") String collectionName,
-                                           @Param(description = "智能体名称") String agentName,
-                                           @Param(description = "章节名称") String title,
-                                           @Param(description = "技术文件地址") String templatePath) throws IOException
-    {
+            @Param(description = "智能体名称") String agentName,
+            @Param(description = "章节名称") String title,
+            @Param(description = "技术文件地址") String templatePath) throws Throwable {
         try {
             if (templatePath.startsWith("/dev-api"))
                 templatePath = templatePath.replace("/dev-api/profile", profile);
-            templatePath =profile + templatePath;
+            templatePath = profile + templatePath;
             List<String> subTitles = extractSubTitles(templatePath, title);
             List<JSONObject> contexts = retrieveFromMilvus(collectionName, title, 10);
             return generateAnswerWithDocumentAndCollection(agentName, templatePath, subTitles, contexts);
      * 查询OA数据生成回答
      */
     @ToolMapping(description = "执行SQL查询")
-    public JSONArray SQLQuery(@Param(description = "sql语句") String sqlString)
-    {
-        sqlString = sqlString.replace("[","").replace("]","");
+    public JSONArray SQLQuery(@Param(description = "sql语句") String sqlString) {
+        sqlString = sqlString.replace("[", "").replace("]", "");
         return executeQuery(sqlString);
     }
 
      * 获取所有表名列表
      */
     @ToolMapping(description = "获取数据库中所有表名列表")
-    public JSONArray GetAllTableNames()
-    {
+    public JSONArray GetAllTableNames() {
         return getAllTableNames();
     }
 
      * 获取指定表的结构信息
      */
     @ToolMapping(description = "获取指定表的结构信息")
-    public JSONObject GetTableStructure(@Param(description = "表名") String tableName)
-    {
+    public JSONObject GetTableStructure(@Param(description = "表名") String tableName) {
         return getTableStructure(tableName);
     }
 
             throw new RuntimeException("MySQL 驱动未找到", e);
         }
 
-        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),Solon.cfg().getProperty("cmc.mysqlService.username"), Solon.cfg().getProperty("cmc.mysqlService.password"));
-             PreparedStatement stmt = conn.prepareStatement(sql)) {
+        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),
+                Solon.cfg().getProperty("cmc.mysqlService.username"),
+                Solon.cfg().getProperty("cmc.mysqlService.password"));
+                PreparedStatement stmt = conn.prepareStatement(sql)) {
 
             ResultSet rs = stmt.executeQuery();
             ResultSetMetaData metaData = rs.getMetaData();
 
     /**
      * 从Milvus检索相关文档
+     * 
      * @return
      */
     public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK) {
     /**
      * 调用LLM生成回答
      */
-    public AssistantMessage generateAnswerWithDocumentAndCollection(String agentName, String templatePath, List<String> titles, List<JSONObject> contexts) throws IOException {
+    public AssistantMessage generateAnswerWithDocumentAndCollection(String agentName, String templatePath,
+            List<String> titles, List<JSONObject> contexts) throws Throwable {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         String filename = templatePath.replace("_" + agentName, "");
         File profilePath = new File(filename);
                     .append("段落格式").append(": ")
                     .append(context.getString("content")).append("\n\n");
         }
-        content.append( "招标文件分析完成，章节内容已写入【<a href='")
+        content.append("招标文件分析完成，章节内容已写入【<a href='")
                 .append(templatePath.replace(profile, "/dev-api/profile"))
                 .append("'> 技术文件" + "</a>】，请查阅\n\n")
                 .append("如需修改，请输入技术文件已有内容的章节标题\n\n")
 
     /**
      * 调用LLM生成回答
+     * 
      * @return
      */
-    public String generateAnswer(String prompt) throws IOException {
+    public String generateAnswer(String prompt) throws Throwable {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
                 .model("Qwen")
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();
         messages.add(ChatMessage.ofUser(prompt));
-        ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
+        ChatSession chatSession = InMemoryChatSession.builder().messages(messages).build();
         chatSession.addMessage(messages);
-        ChatResponse response = chatModel.prompt(chatSession).call();
+        SimpleAgent robot = SimpleAgent.of(chatModel)
+                .build();
+        Prompt prompt1 = Prompt.of(prompt).attrPut("session", chatSession);
 
-        return response.lastChoice().getMessage().getContent();
+        return robot.prompt(prompt1).call().getContent();
     }
 
     /**
      * 写入章节内容
+     * 
      * @return
      */
     public void writeContent(String content, List<String> titles, String absolutePath) throws IOException {
                             }
                         }
                     }
-                }
-                else
+                } else
                     text.append(content);
                 map.put(titles.get(i), text.toString());
             }
         StringBuilder currentLevel3Content = new StringBuilder();
         String[] paragraphs = content.split("\n");
         for (String para : paragraphs) {
-            if (para.trim().isEmpty()) continue;
+            if (para.trim().isEmpty())
+                continue;
 
             if (isDocxLevel3Title(para.trim(), document)) {
                 if (currentLevel3Content.length() != 0) {
         for (int j = 0; j < level2Range.numParagraphs(); j++) {
             Paragraph p = level2Range.getParagraph(j);
             String paraText = p.text().trim();
-            if (paraText.isEmpty()) continue;
+            if (paraText.isEmpty())
+                continue;
 
             int pLevel = getDocOutlineLevel(p);
             if (pLevel == 2 && paraText.equals(content.split("\n")[0].trim())) {
 
         try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
 
-            for (XWPFParagraph  paragraph : document.getParagraphs()) {
+            for (XWPFParagraph paragraph : document.getParagraphs()) {
                 String text = paragraph.getText();
                 int level = getDocxOutlineLevel(paragraph, document);
                 if (level > 0) {
                 }
             }
 
-
             return subTitles;
 
         }
     // 检查一个标题是否是叶子节点（没有更低级别的子标题）
     private boolean isLeafNode(XWPFDocument doc, XWPFParagraph p, int level) {
         int index = doc.getPosOfParagraph(p);
-        if (index == -1 || index >= doc.getParagraphs().size()-1) {
+        if (index == -1 || index >= doc.getParagraphs().size() - 1) {
             return true;
         }
 
 
     /**
      * 检索知识库
+     * 
      * @return
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
-        List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
+        List<BaseVector> queryVector = Collections
+                .singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
-        //  加载集合
+        // 加载集合
         LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();
 
                 for (XWPFParagraph paragraph : xwpfDocument.getParagraphs()) {
                     String text = paragraph.getText().trim();
-                    if (text.isEmpty()) continue;
+                    if (text.isEmpty())
+                        continue;
 
                     int paraLevel = getDocxOutlineLevel(paragraph, xwpfDocument);
 
                 }
             }
             return segments;
-        }
-        else if (filename.endsWith(".doc")) {
+        } else if (filename.endsWith(".doc")) {
             List<TextSegment> segments = new ArrayList<>();
             try (HWPFDocument hwpfDocument = new HWPFDocument(fileInputStream)) {
                 StringBuilder currentLevel2Content = new StringBuilder();
                 for (int i = 0; i < range.numParagraphs(); i++) {
                     Paragraph paragraph = range.getParagraph(i);
                     String text = paragraph.text().trim();
-                    if (text.isEmpty()) continue;
+                    if (text.isEmpty())
+                        continue;
 
                     int paraLevel = getDocOutlineLevel(paragraph);
 
 
         else if (filename.endsWith(".pdf")) {
             Document document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
-            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300,50);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300, 50);
             return splitter.split(document);
-        }
-        else if (filename.endsWith(".txt")) {
+        } else if (filename.endsWith(".txt")) {
             Document document = new TextDocumentParser().parse(fileInputStream);
-            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300,50);
+            DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(300, 50);
             return splitter.split(document);
-        }
-        else {
+        } else {
             throw new UnsupportedOperationException("不支持文件类型: " + filename);
         }
     }
             throw new RuntimeException("MySQL 驱动未找到", e);
         }
 
-        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),Solon.cfg().getProperty("cmc.mysqlService.username"), Solon.cfg().getProperty("cmc.mysqlService.password"))) {
+        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),
+                Solon.cfg().getProperty("cmc.mysqlService.username"),
+                Solon.cfg().getProperty("cmc.mysqlService.password"))) {
 
             DatabaseMetaData metaData = conn.getMetaData();
 
             throw new RuntimeException("MySQL 驱动未找到", e);
         }
 
-        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),Solon.cfg().getProperty("cmc.mysqlService.username"), Solon.cfg().getProperty("cmc.mysqlService.password"))) {
+        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),
+                Solon.cfg().getProperty("cmc.mysqlService.username"),
+                Solon.cfg().getProperty("cmc.mysqlService.password"))) {
 
             DatabaseMetaData metaData = conn.getMetaData();
-            ResultSet tables = metaData.getTables(null, null, null, new String[]{"TABLE"});
+            ResultSet tables = metaData.getTables(null, null, null, new String[] { "TABLE" });
 
             while (tables.next()) {
                 String tableName = tables.getString("TABLE_NAME");

oa-back/ruoyi-llm/pom.xml

             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-ai-mcp</artifactId>
+            <version>4.0.2</version>
+        </dependency>
 
     </dependencies>
 

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/McpController.java

 import com.ruoyi.llm.service.ICmcAgentService;
 import com.ruoyi.llm.service.ICmcChatService;
 import com.ruoyi.llm.service.ICmcTopicService;
+
+import org.noear.solon.ai.agent.simple.SimpleAgent;
 import org.noear.solon.ai.chat.ChatModel;
-import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
+import org.noear.solon.ai.chat.prompt.Prompt;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
 import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.client.McpClientProvider;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * mcp模型上下文协议Controller
  * 
  */
 @RestController
 @RequestMapping("/llm/mcp")
-public class McpController extends BaseController
-{
+public class McpController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(McpController.class);
 
     /** 仅允许上传 .docx 文件 */
-    private static final String[] DOCX_EXTENSION = {"docx"};
+    private static final String[] DOCX_EXTENSION = { "docx" };
 
     /** Python 脚本输出的文件名 */
     private static final String FORMATTED_OUTPUT_NAME = "formatted_output.docx";
 
     /**
      * 自动调用mcp工具问答
+     * 
      * @return
      */
     @GetMapping("/answer")
-    public AssistantMessage answer(String topicId, String question) throws IOException {
+    public AssistantMessage answer(String topicId, String question) throws Throwable {
         McpClientProvider clientProvider = McpClientProvider.builder()
-                .channel(McpChannel.STREAMABLE_STATELESS )
+                .channel(McpChannel.STREAMABLE_STATELESS)
                 .url("http://localhost:8087/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
             messages.add(ChatMessage.ofAssistant(chat.getOutput()));
         }
         messages.add(ChatMessage.ofUser(question));
-        ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
-        ChatResponse response = chatModel.prompt(chatSession).call();
-        String resultContent = response.lastChoice().getMessage().getResultContent();
+        ChatSession chatSession = InMemoryChatSession.builder().messages(messages).build();
+        SimpleAgent robot = SimpleAgent.of(chatModel)
+                .build();
+        Prompt prompt1 = Prompt.of(question).attrPut("session", chatSession);
+        String resultContent = robot.prompt(prompt1).call().getMessage().getResultContent();
         AssistantMessage assistantMessage;
         if (resultContent.startsWith("<tool_call>")) {
             String content = resultContent.replace("<tool_call>\n", "").replace("\n</tool_call>", "");
             JSONObject jsonObject = JSONObject.parseObject(content);
             String name = jsonObject.getString("name");
             JSONObject arguments = jsonObject.getJSONObject("arguments");
-            if (arguments.getString("templatePath").contains("招标") || arguments.getString("templatePath").contains("询价")) {
+            if (arguments.getString("templatePath").contains("招标")
+                    || arguments.getString("templatePath").contains("询价")) {
                 arguments.put("collectionName", "technical");
-                String agentName = cmcAgentService.selectCmcAgentByAgentId(cmcTopicService.selectCmcTopicByTopicId(topicId).getAgentId()).getAgentName();
+                String agentName = cmcAgentService
+                        .selectCmcAgentByAgentId(cmcTopicService.selectCmcTopicByTopicId(topicId).getAgentId())
+                        .getAgentName();
                 arguments.put("agentName", agentName);
                 arguments.put("title", question);
             }
             resultContent = clientProvider.callTool(name, arguments).getContent();
             assistantMessage = ChatMessage.ofAssistant(resultContent);
-        }
-        else
+        } else
             throw new IOException("模型上下文工具未准备就绪，请重试");
         return assistantMessage;
     }
      * @return 格式化后的文件下载路径
      */
     @PostMapping("/formatDoc")
-    public AjaxResult formatDoc(MultipartFile file)
-    {
-        try
-        {
-            if (file == null || file.isEmpty())
-            {
+    public AjaxResult formatDoc(MultipartFile file) {
+        try {
+            if (file == null || file.isEmpty()) {
                 return AjaxResult.error("上传文件不能为空");
             }
 
 
             // 4. 定位格式化后的输出文件（与上传文件同目录下的 formatted_output.docx）
             File outputFile = new File(new File(uploadedAbsolutePath).getParentFile(), FORMATTED_OUTPUT_NAME);
-            if (!outputFile.exists())
-            {
+            if (!outputFile.exists()) {
                 return AjaxResult.error("文档格式化失败，未找到输出文件");
             }
 
             ajax.put("newFileName", FORMATTED_OUTPUT_NAME);
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("Word 文档格式化失败", e);
             return AjaxResult.error("文档格式化失败: " + e.getMessage());
         }
     /**
      * 将 /profile/... 形式的资源路径转为本地绝对路径
      */
-    private String toAbsolutePath(String resourcePath)
-    {
+    private String toAbsolutePath(String resourcePath) {
         return RuoYiConfig.getProfile() + StringUtils.substringAfter(resourcePath, Constants.RESOURCE_PREFIX);
     }
 
     /**
      * 根据上传文件的资源路径，推导格式化输出文件的资源路径
      */
-    private String buildOutputResourcePath(String uploadedResourcePath)
-    {
+    private String buildOutputResourcePath(String uploadedResourcePath) {
         int lastSlash = uploadedResourcePath.lastIndexOf('/');
         return uploadedResourcePath.substring(0, lastSlash + 1) + FORMATTED_OUTPUT_NAME;
     }
     /**
      * 校验格式化服务与模版文件是否可用
      */
-    private void validateFormatterConfig() throws IOException
-    {
-        if (StringUtils.isEmpty(pythonServiceUrl))
-        {
+    private void validateFormatterConfig() throws IOException {
+        if (StringUtils.isEmpty(pythonServiceUrl)) {
             throw new IOException("Python 服务 URL 未配置: cmc.pythonService.url");
         }
-        if (StringUtils.isEmpty(docFormatterTemplatePath) || !new File(docFormatterTemplatePath).exists())
-        {
+        if (StringUtils.isEmpty(docFormatterTemplatePath) || !new File(docFormatterTemplatePath).exists()) {
             throw new IOException("Word 模版文件路径未配置或文件不存在: " + docFormatterTemplatePath);
         }
 
                 ? pythonServiceUrl + "health"
                 : pythonServiceUrl + "/health";
         String healthResponse = HttpUtils.sendGet(healthUrl);
-        if (StringUtils.isEmpty(healthResponse) || !healthResponse.contains("\"status\":\"ok\""))
-        {
+        if (StringUtils.isEmpty(healthResponse) || !healthResponse.contains("\"status\":\"ok\"")) {
             throw new IOException("Python 服务不可用，请确认已启动: " + pythonServiceUrl);
         }
     }
      * @param templateAbsolutePath 模版文件的绝对路径
      * @return 服务返回的消息内容
      */
-    private String callDocFormatterService(String uploadedAbsolutePath, String templateAbsolutePath) throws IOException
-    {
+    private String callDocFormatterService(String uploadedAbsolutePath, String templateAbsolutePath)
+            throws IOException {
         JSONObject body = new JSONObject();
         body.put("uploaded_file_path", uploadedAbsolutePath);
         body.put("template_file_path", templateAbsolutePath);
         conn.setReadTimeout(300_000);
         conn.setDoOutput(true);
 
-        try (OutputStream os = conn.getOutputStream())
-        {
+        try (OutputStream os = conn.getOutputStream()) {
             os.write(body.toJSONString().getBytes(StandardCharsets.UTF_8));
         }
 
         int status = conn.getResponseCode();
         InputStream responseStream = status >= 400 ? conn.getErrorStream() : conn.getInputStream();
-        if (responseStream == null)
-        {
+        if (responseStream == null) {
             throw new IOException("文档格式化服务无响应，HTTP 状态码: " + status);
         }
 
         StringBuilder responseBuilder = new StringBuilder();
         try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(responseStream, StandardCharsets.UTF_8)))
-        {
+                new InputStreamReader(responseStream, StandardCharsets.UTF_8))) {
             String line;
-            while ((line = reader.readLine()) != null)
-            {
+            while ((line = reader.readLine()) != null) {
                 responseBuilder.append(line);
             }
         }
 
         String responseBody = responseBuilder.toString();
-        if (status >= 400)
-        {
+        if (status >= 400) {
             throw new IOException("文档格式化服务请求失败，HTTP " + status + "，响应: " + responseBody);
         }
 
         JSONObject result = JSONObject.parseObject(responseBody);
-        if (!Boolean.TRUE.equals(result.getBoolean("success")))
-        {
+        if (!Boolean.TRUE.equals(result.getBoolean("success"))) {
             throw new IOException("文档格式化失败: " + result.getString("message"));
         }
         return result.getString("message");