refactor(connection): 合并旧逻辑新的业务逻辑代码

feature: 支持mqtt非桥接版本。

.github/workflows/build-base-image.yml

@@ -37,7 +37,7 @@ jobs:
           file: Dockerfile-server-base
           push: true
           tags: ghcr.io/${{ github.repository }}:server-base
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha,scope=server-base
           cache-to: type=gha,mode=max,scope=server-base
           build-args: |

.github/workflows/docker-image.yml

@@ -66,7 +66,7 @@ jobs:
           push: true
           tags: |
             ${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:server_{1},ghcr.io/{0}:server_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:server_latest', github.repository) }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
@@ -81,7 +81,7 @@ jobs:
           push: true
           tags: |
             ${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:web_{1},ghcr.io/{0}:web_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:web_latest', github.repository) }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |

.gitignore

@@ -3,9 +3,6 @@ __pycache__/
 .idea/
 *.py[cod]
 *$py.class
-.vscode
-.claude
-AGENTS.md
 
 # C extensions
 *.so

Dockerfile-web

@@ -1,5 +1,5 @@
 # 第一阶段：构建Vue前端
-FROM node:18 AS web-builder
+FROM node:18 as web-builder
 WORKDIR /app
 COPY main/manager-web/package*.json ./
 RUN npm install
@@ -7,7 +7,7 @@ COPY main/manager-web .
 RUN npm run build
 
 # 第二阶段：构建Java后端
-FROM maven:3.9.4-eclipse-temurin-21 AS api-builder
+FROM maven:3.9.4-eclipse-temurin-21 as api-builder
 WORKDIR /app
 COPY main/manager-api/pom.xml .
 COPY main/manager-api/src ./src
@@ -18,19 +18,18 @@ FROM bellsoft/liberica-runtime-container:jre-21-glibc
 
 # 安装Nginx和字体库
 RUN apk update && \
-    apk add --no-cache --no-scripts \
+    apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
         nginx \
         bash \
         fontconfig \
         ttf-dejavu \
-    && rm -rf /var/cache/apk/* \
-    && mkdir -p /run/nginx /var/log/nginx /var/tmp/nginx /etc/nginx/conf.d
-
-# 复制项目自带的中文字体
-COPY main/manager-web/public/generator/static/fonts/*.ttf /usr/share/fonts/
+        msttcorefonts-installer \
+    && ACCEPT_EULA=Y apk add --no-cache msttcorefonts-installer \
+    && fc-cache -f -v \
+    && rm -rf /var/cache/apk/*
 
 # 更新字体缓存
-RUN fc-cache -f -v
+RUN (printf 'YES\n' | update-ms-fonts || true) && fc-cache -f -v
 
 # 配置Nginx
 COPY docs/docker/nginx.conf /etc/nginx/nginx.conf

README.md

@@ -21,7 +21,6 @@
   <a href="./README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DFE0E5"></a>
   <a href="./README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DFE0E5"></a>
   <a href="./README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DFE0E5"></a>
-  <a href="./README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DFE0E5"></a>
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
     <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
   </a>
@@ -214,8 +213,8 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 |:---:|:---:|:---:|
 | ASR(语音识别) | FunASR(本地) | 👍XunfeiStreamASR(讯飞流式) |
 | LLM(大模型) | glm-4-flash(智谱) | 👍qwen-flash(阿里百炼) |
-| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen3.5-flash(阿里百炼) |
-| TTS(语音合成) | EdgeTTS(微软) | 👍HuoshanDoubleStreamTTS(火山流式) |
+| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen2.5-vl-3b-instructh(阿里百炼) |
+| TTS(语音合成) | ✅LinkeraiTTS(灵犀流式) | 👍HuoshanDoubleStreamTTS(火山流式) |
 | Intent(意图识别) | function_call(函数调用) | function_call(函数调用) |
 | Memory(记忆功能) | mem_local_short(本地短期记忆） | mem_local_short（本地短期记忆） |
 
@@ -243,7 +242,7 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 | 智能对话 | 支持多种LLM(大语言模型)，实现智能对话 |
 | 视觉感知 | 支持多种VLLM(视觉大模型)，实现多模态交互 |
 | 意图识别 | 支持外挂的大模型意图识别、大模型自主函数调用，提供插件化意图处理机制 |
-| 记忆系统 | 支持本地短期记忆、mem0ai接口记忆、PowerMem智能记忆，具备记忆总结功能 |
+| 记忆系统 | 支持本地短期记忆、mem0ai接口记忆，具备记忆总结功能 |
 | 知识库 | 支持RAGFlow知识库，让大模型判断需要调度知识库后再回答 |
 | 工具调用 | 支持客户端IOT协议、客户MCP协议、服务端MCP协议、MCP接入点协议、自定义工具函数 |
 | 指令下发 | 依托MQTT协议，支持从智控台将MCP指令下发到ESP32设备 |
@@ -331,7 +330,6 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 |   类型   |      平台名称       | 使用方式 |   收费模式    | 备注 |
 |:------:|:---------------:|:----:|:---------:|:--:|
 | Memory |     mem0ai      | 接口调用 | 1000次/月额度 |    |
-| Memory |     [powermem](./docs/powermem-integration.md)    | 本地总结 | 取决于LLM和DB |  OceanBase开源，支持智能检索  |
 | Memory | mem_local_short | 本地总结 |    免费     |    |
 | Memory |     nomem       | 无记忆模式 |    免费     |    |
 

README_de.md

@@ -21,7 +21,6 @@ Unterstützt MQTT+UDP-Protokoll, Websocket-Protokoll, MCP-Endpunkte und Stimmabd
   <a href="./README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DFE0E5"></a>
   <a href="./README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DFE0E5"></a>
   <a href="./README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DBEDFA"></a>
-  <a href="./README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DFE0E5"></a>
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
     <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
   </a>
@@ -212,8 +211,8 @@ Websocket-Schnittstellenadresse: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 |:---:|:---:|:---:|
 | ASR (Spracherkennung) | FunASR (Lokal) | 👍XunfeiStreamASR (Xunfei-Streaming) |
 | LLM (Großes Modell) | glm-4-flash (Zhipu) | 👍qwen-flash (Alibaba Bailian) |
-| VLLM (Vision Large Model) | glm-4v-flash (Zhipu) | 👍qwen3.5-flash (Alibaba Bailian) |
-| TTS (Sprachsynthese) | EdgeTTS (Microsoft) | 👍HuoshanDoubleStreamTTS (Volcano-Streaming) |
+| VLLM (Vision Large Model) | glm-4v-flash (Zhipu) | 👍qwen2.5-vl-3b-instructh (Alibaba Bailian) |
+| TTS (Sprachsynthese) | ✅LinkeraiTTS (Lingxi-Streaming) | 👍HuoshanDoubleStreamTTS (Volcano-Streaming) |
 | Intent (Absichtserkennung) | function_call (Funktionsaufruf) | function_call (Funktionsaufruf) |
 | Memory (Gedächtnisfunktion) | mem_local_short (Lokales Kurzzeitgedächtnis) | mem_local_short (Lokales Kurzzeitgedächtnis) |
 
@@ -241,7 +240,7 @@ Dieses Projekt bietet die folgenden Testwerkzeuge, um Ihnen bei der Überprüfun
 | Intelligenter Dialog | Unterstützt mehrere LLM (große Sprachmodelle), implementiert intelligenten Dialog |
 | Visuelle Wahrnehmung | Unterstützt mehrere VLLM (Vision Large Models), implementiert multimodale Interaktion |
 | Absichtserkennung | Unterstützt LLM-Absichtserkennung, Function Call-Funktionsaufruf, bietet plugin-basierten Absichtsverarbeitungsmechanismus |
-| Gedächtnissystem | Unterstützt lokales Kurzzeitgedächtnis, mem0ai-Schnittstellengedächtnis, PowerMem intelligentes Gedächtnis, mit Gedächtniszusammenfassungsfunktion |
+| Gedächtnissystem | Unterstützt lokales Kurzzeitgedächtnis, mem0ai-Schnittstellengedächtnis, mit Gedächtniszusammenfassungsfunktion |
 | Wissensdatenbank | Unterstützt RAGFlow-Wissensdatenbank, ermöglicht großem Modell die Bewertung, ob Wissensdatenbank benötigt wird, bevor geantwortet wird |
 | Werkzeugaufruf | Unterstützt Client-IOT-Protokoll, Client-MCP-Protokoll, Server-MCP-Protokoll, MCP-Endpunktprotokoll, benutzerdefinierte Werkzeugfunktionen |
 | Befehlsübermittlung | Basierend auf MQTT-Protokoll, unterstützt die Übermittlung von MCP-Befehlen von der intelligenten Steuerkonsole an ESP32-Geräte |
@@ -259,7 +258,7 @@ Wenn Sie ein Softwareentwickler sind, finden Sie hier einen [Offenen Brief an En
 ---
 
 ## Produktökosystem 👬
-Xiaozhi ist ein Ökosystem. Wenn Sie dieses Produkt verwenden, können Sie sich auch andere [hervorragende Projekte](https://github.com/78/xiaozhi-esp32/blob/main/README_zh.md#%E7%9B%B8%E5%85%B3%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE) in diesem Ökosystem ansehen
+Xiaozhi ist ein Ökosystem. Wenn Sie dieses Produkt verwenden, können Sie sich auch andere [hervorragende Projekte](https://github.com/78/xiaozhi-esp32?tab=readme-ov-file#related-open-source-projects) in diesem Ökosystem ansehen
 
 ---
 
@@ -329,7 +328,6 @@ Tatsächlich kann jedes VLLM, das OpenAI-Schnittstellenaufrufe unterstützt, int
 | Typ | Plattformname | Verwendungsmethode | Preismodell | Hinweise |
 |:------:|:---------------:|:----:|:---------:|:--:|
 | Memory | mem0ai | Schnittstellenaufrufe | 1000 Mal/Monat Kontingent | |
-| Memory | [powermem](./docs/powermem-integration.md) | Lokale Zusammenfassung | Abhängig von LLM und DB | OceanBase Open Source, unterstützt intelligente Abfrage |
 | Memory | mem_local_short | Lokale Zusammenfassung | Kostenlos | |
 | Memory | nomem | Kein Gedächtnismodus | Kostenlos | |
 

README_en.md

@@ -21,7 +21,6 @@ Support for MQTT+UDP protocol, Websocket protocol, MCP access point, voiceprint
   <a href="./README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DBEDFA"></a>
   <a href="./README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DFE0E5"></a>
   <a href="./README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DFE0E5"></a>
-  <a href="./README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DFE0E5"></a>
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
     <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
   </a>
@@ -183,9 +182,8 @@ This project provides two deployment methods. Please choose based on your specif
 | Deployment Method | Features | Applicable Scenarios | Deployment Docs | Configuration Requirements | Video Tutorials | 
 |---------|------|---------|---------|---------|---------|
 | **Simplified Installation** | Intelligent dialogue, single agent management | Low-configuration environments, data stored in config files, no database required | [①Docker Version](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②Source Code Deployment](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)| 2 cores 4GB if using `FunASR`, 2 cores 2GB if all APIs | - | 
-| **Full Module Installation** | Intelligent dialogue, multi-user management, multi-agent management, intelligent console interface operation | Complete functionality experience, data stored in database |[①Docker Version](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [②Source Code Deployment](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [③Source Code Deployment Auto-Update Tutorial](./docs/dev-ops-integration.md) | 4 cores 8GB if using `FunASR`, 2 cores 4GB if all APIs| [Local Source Code Startup Video Tutorial](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
+| **Full Module Installation** | Intelligent dialogue, multi-user management, multi-agent management, intelligent console interface operation | Complete functionality experience, data stored in database |[①Docker Version](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [②Source Code Deployment](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [③Source Code Deployment Auto-Update Tutorial](./docs/dev-ops-integration.md) | 4 cores 8GB if using `FunASR`, 2 cores 4GB if all APIs| [Local Source Code Startup Video Tutorial](https://www.bilibili.com/video/BV1wBJhz4Ewe) | 
 
-For frequently asked questions and related tutorials, please refer to [this link](./docs/FAQ.md)
 
 > 💡 Note: Below is a test platform deployed with the latest code. You can burn and test if needed. Concurrent users: 6, data will be cleared daily.
 
@@ -212,20 +210,19 @@ Websocket Interface Address: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 |:---:|:---:|:---:|
 | ASR(Speech Recognition) | FunASR(Local) | 👍XunfeiStreamASR(Xunfei Streaming) |
 | LLM(Large Model) | glm-4-flash(Zhipu) | 👍qwen-flash(Alibaba Bailian) |
-| VLLM(Vision Large Model) | glm-4v-flash(Zhipu) | 👍qwen3.5-flash(Alibaba Bailian) |
-| TTS(Speech Synthesis) | EdgeTTS(Microsoft) | 👍HuoshanDoubleStreamTTS(Volcano Streaming) |
+| VLLM(Vision Large Model) | glm-4v-flash(Zhipu) | 👍qwen2.5-vl-3b-instructh(Alibaba Bailian) |
+| TTS(Speech Synthesis) | ✅LinkeraiTTS(Lingxi streaming) | 👍HuoshanDoubleStreamTTS(Volcano Streaming) |
 | Intent(Intent Recognition) | function_call(Function calling) | function_call(Function calling) |
 | Memory(Memory function) | mem_local_short(Local short-term memory) | mem_local_short(Local short-term memory) |
 
-If you are concerned about the latency of each component, please refer to the [Xiaozhi Component Performance Test Report](https://github.com/xinnan-tech/xiaozhi-performance-research), and test in your own environment following the test methods in the report.
-
 #### 🔧 Testing Tools
 This project provides the following testing tools to help you verify the system and choose suitable models:
 
 | Tool Name | Location | Usage Method | Function Description |
 |:---:|:---|:---:|:---:|
 | Audio Interaction Test Tool | main》xiaozhi-server》test》test_page.html | Open directly with Google Chrome | Tests audio playback and reception functions, verifies if Python-side audio processing is normal |
-| Model Response Test Tool | main》xiaozhi-server》performance_tester.py | Execute `python performance_tester.py` | Tests response speed of three core modules: ASR(speech recognition), LLM(large model), VLLM(vision model), TTS(speech synthesis) |
+| Model Response Test Tool 1 | main》xiaozhi-server》performance_tester.py | Execute `python performance_tester.py` | Tests response speed of three core modules: ASR(speech recognition), LLM(large model), TTS(speech synthesis) |
+| Model Response Test Tool 2 | main》xiaozhi-server》performance_tester_vllm.py | Execute `python performance_tester_vllm.py` | Tests VLLM(vision model) response speed |
 
 > 💡 Note: When testing model speed, only models with configured keys will be tested.
 
@@ -241,10 +238,10 @@ This project provides the following testing tools to help you verify the system
 | Intelligent Dialogue | Supports multiple LLM(large language models), implements intelligent dialogue |
 | Visual Perception | Supports multiple VLLM(vision large models), implements multimodal interaction |
 | Intent Recognition | Supports LLM intent recognition, Function Call function calling, provides plugin-based intent processing mechanism |
-| Memory System | Supports local short-term memory, mem0ai interface memory, PowerMem intelligent memory, with memory summarization functionality |
+| Memory System | Supports local short-term memory, mem0ai interface memory, with memory summarization functionality |
 | Knowledge Base | Supports RAGFlow knowledge base, enabling LLM to judge whether to schedule the knowledge base after receiving the user's question, and then answer the question |
-| Tool Calling | Supports client IOT protocol, client MCP protocol, server MCP protocol, MCP endpoint protocol, custom tool functions |
 | Command Delivery | Supports MCP command delivery to ESP32 devices via MQTT protocol from Smart Console |
+| Tool Calling | Supports client IOT protocol, client MCP protocol, server MCP protocol, MCP endpoint protocol, custom tool functions |
 | Management Backend | Provides Web management interface, supports user management, system configuration and device management; Supports Simplified Chinese, Traditional Chinese and English display |
 | Testing Tools | Provides performance testing tools, vision model testing tools, and audio interaction testing tools |
 | Deployment Support | Supports Docker deployment and local deployment, provides complete configuration file management |
@@ -252,14 +249,20 @@ This project provides the following testing tools to help you verify the system
 
 ### Under Development 🚧
 
-To learn about specific development plan progress, [click here](https://github.com/users/xinnan-tech/projects/3). For frequently asked questions and related tutorials, please refer to [this link](./docs/FAQ.md)
+To learn about specific development plan progress, [click here](https://github.com/users/xinnan-tech/projects/3)
 
 If you are a software developer, here is an [Open Letter to Developers](docs/contributor_open_letter.md). Welcome to join!
 
 ---
 
 ## Product Ecosystem 👬
-Xiaozhi is an ecosystem. When using this product, you can also check out other [excellent projects](https://github.com/78/xiaozhi-esp32/blob/main/README_zh.md#%E7%9B%B8%E5%85%B3%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE) in this ecosystem
+Xiaozhi is an ecosystem. When using this product, you can also check out other [excellent projects](https://github.com/78/xiaozhi-esp32?tab=readme-ov-file#related-open-source-projects) in this ecosystem
+
+| Project Name | Project Address | Project Description |
+|:---------------------|:--------|:--------|
+| Xiaozhi Android Client | [xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) | An Android and iOS voice dialogue application based on xiaozhi-server, supporting real-time voice interaction and text dialogue.<br/>Currently a Flutter version, connecting iOS and Android platforms. |
+| Xiaozhi Desktop Client | [py-xiaozhi](https://github.com/Huang-junsen/py-xiaozhi) | This project provides a Python-based AI client for beginners, allowing users to experience Xiaozhi AI functionality through code even without physical hardware conditions. |
+| Xiaozhi Java Server | [xiaozhi-esp32-server-java](https://github.com/joey-zhou/xiaozhi-esp32-server-java) | Xiaozhi open-source backend service Java version is a Java-based open-source project.<br/>It includes frontend and backend services, aiming to provide users with a complete backend service solution. |
 
 ---
 
@@ -273,10 +276,8 @@ Xiaozhi is an ecosystem. When using this product, you can also check out other [
 | Dify interface calls | Dify | - |
 | FastGPT interface calls | FastGPT | - |
 | Coze interface calls | Coze | - |
-| Xinference interface calls | Xinference | - |
-| HomeAssistant interface calls | HomeAssistant | - |
 
-In fact, any LLM that supports OpenAI interface calls can be integrated and used.
+In fact, any LLM that supports OpenAI interface calls can be integrated and used, including Xinference and HomeAssistant interfaces.
 
 ---
 
@@ -295,7 +296,7 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
 | Usage Method | Supported Platforms | Free Platforms |
 |:---:|:---:|:---:|
 | Interface calls | EdgeTTS, iFLYTEK, Volcano Engine, Tencent Cloud, Alibaba Cloud and Bailian, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS, Lingxi Streaming TTS, MinimaxTTS | Lingxi Streaming TTS, EdgeTTS, CosyVoiceSiliconflow(partial) |
-| Local services | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, Index-TTS, PaddleSpeech | Index-TTS, PaddleSpeech, FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3 |
+| Local services | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, MinimaxTTS | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, MinimaxTTS |
 
 ---
 
@@ -329,9 +330,7 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
 | Type | Platform Name | Usage Method | Pricing Model | Notes |
 |:------:|:---------------:|:----:|:---------:|:--:|
 | Memory | mem0ai | Interface calls | 1000 times/month quota | |
-| Memory | [powermem](./docs/powermem-integration.md) | Local summarization | Depends on LLM and DB | OceanBase open source, supports intelligent retrieval |
 | Memory | mem_local_short | Local summarization | Free | |
-| Memory | nomem | No memory mode | Free | |
 
 ---
 
@@ -341,7 +340,6 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
 |:------:|:-------------:|:----:|:-------:|:---------------------:|
 | Intent | intent_llm | Interface calls | Based on LLM pricing | Recognizes intent through large models, strong generalization |
 | Intent | function_call | Interface calls | Based on LLM pricing | Completes intent through large model function calling, fast speed, good effect |
-| Intent | nointent | No intent mode | Free | Does not perform intent recognition, directly returns dialogue result |
 
 ---
 

README_pt_BR.md

@@ -1,376 +0,0 @@
-[![Banners](docs/images/banner1.png)](https://github.com/xinnan-tech/xiaozhi-esp32-server)
-
-<h1 align="center">Serviço Backend Xiaozhi xiaozhi-esp32-server</h1>
-
-<p align="center">
-Este projeto é baseado na teoria e tecnologia de inteligência simbiótica humano-máquina para desenvolver sistemas inteligentes de hardware e software para terminais<br/>fornecendo serviços de backend para o projeto de hardware inteligente de código aberto
-<a href="https://github.com/78/xiaozhi-esp32">xiaozhi-esp32</a><br/>
-Implementado usando Python, Java e Vue de acordo com o <a href="https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh">Protocolo de Comunicação Xiaozhi</a><br/>
-Suporte ao protocolo MQTT+UDP, protocolo WebSocket, ponto de acesso MCP, reconhecimento de impressão vocal e base de conhecimento
-</p>
-
-<p align="center">
-<a href="./docs/FAQ.md">Perguntas Frequentes</a>
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">Reportar Problemas</a>
-· <a href="./README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3">Documentação de Implantação</a>
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">Notas de Lançamento</a>
-</p>
-
-<p align="center">
-  <a href="./README.md"><img alt="简体中文版自述文件" src="https://img.shields.io/badge/简体中文-DFE0E5"></a>
-  <a href="./README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DFE0E5"></a>
-  <a href="./README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DFE0E5"></a>
-  <a href="./README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DFE0E5"></a>
-  <a href="./README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DBEDFA"></a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
-    <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/LICENSE">
-    <img alt="GitHub pull requests" src="https://img.shields.io/badge/license-MIT-white?labelColor=black" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server">
-    <img alt="stars" src="https://img.shields.io/github/stars/xinnan-tech/xiaozhi-esp32-server?color=ffcb47&labelColor=black" />
-  </a>
-</p>
-
-<p align="center">
-Liderado pela Equipe do Professor Siyuan Liu (Universidade de Tecnologia do Sul da China)
-</br>
-刘思源教授团队主导研发（华南理工大学）
-</br>
-<img src="./docs/images/hnlg.jpg" alt="Universidade de Tecnologia do Sul da China (华南理工大学)" width="50%">
-</p>
-
----
-
-## Público-Alvo 👥
-
-Este projeto requer dispositivos de hardware ESP32 para funcionar. Se você adquiriu hardware relacionado ao ESP32, conectou-se com sucesso ao serviço backend implantado pelo Brother Xia e deseja construir seu próprio serviço backend `xiaozhi-esp32` de forma independente, então este projeto é perfeito para você.
-
-Quer ver os efeitos de uso? Clique nos vídeos abaixo 🎥
-
-<table>
-  <tr>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1FMFyejExX" target="_blank">
-         <picture>
-           <img alt="Experiência de velocidade de resposta" src="docs/images/demo9.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1vchQzaEse" target="_blank">
-         <picture>
-           <img alt="Segredo da otimização de velocidade" src="docs/images/demo6.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1C1tCzUEZh" target="_blank">
-         <picture>
-           <img alt="Cenário médico complexo" src="docs/images/demo1.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1zUW5zJEkq" target="_blank">
-         <picture>
-           <img alt="Envio de comandos MQTT" src="docs/images/demo4.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1Exu3zqEDe" target="_blank">
-         <picture>
-           <img alt="Reconhecimento de impressão vocal" src="docs/images/demo14.png" />
-         </picture>
-        </a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1pNXWYGEx1" target="_blank">
-         <picture>
-           <img alt="Controle de interruptores de eletrodomésticos" src="docs/images/demo5.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1ZQKUzYExM" target="_blank">
-         <picture>
-           <img alt="Ponto de acesso MCP" src="docs/images/demo13.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-      <a href="https://www.bilibili.com/video/BV1TJ7WzzEo6" target="_blank">
-         <picture>
-           <img alt="Tarefas com múltiplos comandos" src="docs/images/demo11.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1VC96Y5EMH" target="_blank">
-         <picture>
-           <img alt="Reproduzir música" src="docs/images/demo7.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1Z8XuYZEAS" target="_blank">
-         <picture>
-           <img alt="Plugin de clima" src="docs/images/demo8.png" />
-         </picture>
-        </a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <a href="https://www.bilibili.com/video/BV12J7WzBEaH" target="_blank">
-         <picture>
-           <img alt="Interrupção em tempo real" src="docs/images/demo10.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-      <a href="https://www.bilibili.com/video/BV1Co76z7EvK" target="_blank">
-         <picture>
-           <img alt="Fotografar e identificar objetos" src="docs/images/demo12.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1CDKWemEU6" target="_blank">
-         <picture>
-           <img alt="Timbre de voz personalizado" src="docs/images/demo2.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV12yA2egEaC" target="_blank">
-         <picture>
-           <img alt="Comunicação em cantonês" src="docs/images/demo3.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV17LXWYvENb" target="_blank">
-         <picture>
-           <img alt="Transmissão de notícias" src="docs/images/demo0.png" />
-         </picture>
-        </a>
-    </td>
-  </tr>
-</table>
-
----
-
-## Avisos ⚠️
-
-1. Este projeto é um software de código aberto. Este software não possui parceria comercial com nenhum provedor de serviços de API de terceiros (incluindo, mas não se limitando a reconhecimento de fala, modelos de linguagem, síntese de voz e outras plataformas) com os quais se conecta, e não fornece nenhuma forma de garantia quanto à qualidade de serviço ou segurança financeira desses provedores. Recomenda-se que os usuários priorizem provedores de serviço com licenças comerciais relevantes e leiam cuidadosamente seus termos de serviço e políticas de privacidade. Este software não armazena nenhuma chave de conta, não participa de fluxos de fundos e não assume o risco de perda de fundos recarregados.
-
-2. A funcionalidade deste projeto não está completa e não passou por avaliação de segurança de rede. Por favor, não o utilize em ambientes de produção. Se você implantar este projeto para fins de aprendizado em um ambiente de rede pública, certifique-se de que as medidas de proteção necessárias estejam em vigor.
-
----
-
-## Documentação de Implantação
-
-![Banners](docs/images/banner2.png)
-
-Este projeto oferece dois métodos de implantação. Por favor, escolha de acordo com suas necessidades específicas:
-
-#### 🚀 Seleção do Método de Implantação
-| Método de Implantação | Funcionalidades | Cenários Aplicáveis | Documentação de Implantação | Requisitos de Configuração | Tutoriais em Vídeo |
-|---------|------|---------|---------|---------|---------|
-| **Instalação Simplificada** | Diálogo inteligente, gerenciamento de agente único | Ambientes de baixa configuração, dados armazenados em arquivos de configuração, sem necessidade de banco de dados | [①Versão Docker](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②Implantação via Código-Fonte](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)| 2 núcleos 4GB se usar `FunASR`, 2 núcleos 2GB se todas APIs | - |
-| **Instalação de Módulo Completo** | Diálogo inteligente, gerenciamento multiusuário, gerenciamento de múltiplos agentes, operação de interface do console inteligente | Experiência com funcionalidade completa, dados armazenados em banco de dados |[①Versão Docker](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [②Implantação via Código-Fonte](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [③Tutorial de Atualização Automática via Código-Fonte](./docs/dev-ops-integration.md) | 4 núcleos 8GB se usar `FunASR`, 2 núcleos 4GB se todas APIs| [Tutorial em Vídeo de Inicialização via Código-Fonte Local](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
-
-Perguntas frequentes e tutoriais relacionados podem ser consultados [neste link](./docs/FAQ.md)
-
-> 💡 Nota: Abaixo está uma plataforma de teste implantada com o código mais recente. Você pode gravar e testar se necessário. Usuários simultâneos: 6, os dados serão limpos diariamente.
-
-```
-Endereço do Console de Controle Inteligente: https://2662r3426b.vicp.fun
-Endereço do Console de Controle Inteligente (H5): https://2662r3426b.vicp.fun/h5/index.html
-
-Ferramenta de Teste de Serviço: https://2662r3426b.vicp.fun/test/
-Endereço da Interface OTA: https://2662r3426b.vicp.fun/xiaozhi/ota/
-Endereço da Interface WebSocket: wss://2662r3426b.vicp.fun/xiaozhi/v1/
-```
-
-#### 🚩 Descrição e Recomendações de Configuração
-> [!Note]
-> Este projeto oferece dois esquemas de configuração:
->
-> 1. `Configurações Gratuitas Nível Básico`: Adequado para uso pessoal e doméstico, todos os componentes utilizam soluções gratuitas, sem necessidade de pagamento adicional.
->
-> 2. `Configuração de Streaming`: Adequado para demonstrações, treinamentos, cenários com mais de 2 usuários simultâneos, etc. Utiliza tecnologia de processamento em streaming para velocidade de resposta mais rápida e melhor experiência.
->
-> A partir da versão `0.5.2`, o projeto suporta configuração de streaming. Em comparação com versões anteriores, a velocidade de resposta é melhorada em aproximadamente `2,5 segundos`, melhorando significativamente a experiência do usuário.
-
-| Nome do Módulo | Configurações Gratuitas Nível Básico | Configuração de Streaming |
-|:---:|:---:|:---:|
-| ASR(Reconhecimento de Fala) | FunASR(Local) | 👍XunfeiStreamASR(Xunfei Streaming) |
-| LLM(Modelo de Linguagem) | glm-4-flash(Zhipu) | 👍qwen-flash(Alibaba Bailian) |
-| VLLM(Modelo de Visão) | glm-4v-flash(Zhipu) | 👍qwen3.5-flash(Alibaba Bailian) |
-| TTS(Síntese de Voz) | EdgeTTS(Microsoft) | 👍HuoshanDoubleStreamTTS(Volcano Streaming) |
-| Intent(Reconhecimento de Intenção) | function_call(Chamada de função) | function_call(Chamada de função) |
-| Memory(Função de Memória) | mem_local_short(Memória local de curto prazo) | mem_local_short(Memória local de curto prazo) |
-
-Se você está preocupado com o tempo de resposta de cada componente, consulte o [Relatório de Teste de Desempenho dos Componentes Xiaozhi](https://github.com/xinnan-tech/xiaozhi-performance-research), e teste em seu próprio ambiente seguindo os métodos de teste do relatório.
-
-#### 🔧 Ferramentas de Teste
-Este projeto fornece as seguintes ferramentas de teste para ajudá-lo a verificar o sistema e escolher modelos adequados:
-
-| Nome da Ferramenta | Localização | Método de Uso | Descrição da Função |
-|:---:|:---|:---:|:---:|
-| Ferramenta de Teste de Interação por Áudio | main》xiaozhi-server》test》test_page.html | Abrir diretamente com Google Chrome | Testa as funções de reprodução e recepção de áudio, verifica se o processamento de áudio no lado Python está normal |
-| Ferramenta de Teste de Resposta de Modelo | main》xiaozhi-server》performance_tester.py | Execute `python performance_tester.py` | Testa a velocidade de resposta dos três módulos principais: ASR(reconhecimento de fala), LLM(modelo de linguagem), VLLM(modelo de visão), TTS(síntese de voz) |
-
-> 💡 Nota: Ao testar a velocidade dos modelos, apenas os modelos com chaves configuradas serão testados.
-
----
-## Lista de Funcionalidades ✨
-### Implementado ✅
-![请参考-全模块安装架构图](docs/images/deploy2.png)
-| Módulo de Funcionalidade | Descrição |
-|:---:|:---|
-| Arquitetura Principal | Baseado em [gateway MQTT+UDP](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md), servidores WebSocket e HTTP, fornece sistema completo de gerenciamento de console e autenticação |
-| Interação por Voz | Suporta ASR em streaming (reconhecimento de fala), TTS em streaming (síntese de voz), VAD (detecção de atividade vocal), suporta reconhecimento multilíngue e processamento de voz |
-| Reconhecimento de Impressão Vocal | Suporta registro, gerenciamento e reconhecimento de impressão vocal de múltiplos usuários, processa em paralelo com o ASR, reconhecimento de identidade do falante em tempo real e repassa ao LLM para respostas personalizadas |
-| Diálogo Inteligente | Suporta múltiplos LLM (modelos de linguagem de grande porte), implementa diálogo inteligente |
-| Percepção Visual | Suporta múltiplos VLLM (modelos de visão de grande porte), implementa interação multimodal |
-| Reconhecimento de Intenção | Suporta reconhecimento de intenção por LLM, Function Call (chamada de função), fornece mecanismo de processamento de intenção baseado em plugins |
-| Sistema de Memória | Suporta memória local de curto prazo, memória via interface mem0ai, memória inteligente PowerMem, com funcionalidade de resumo de memória |
-| Base de Conhecimento | Suporta base de conhecimento RAGFlow, permitindo que o LLM julgue se deve acionar a base de conhecimento após receber a pergunta do usuário, e então responda à pergunta |
-| Chamada de Ferramentas | Suporta protocolo IOT do cliente, protocolo MCP do cliente, protocolo MCP do servidor, protocolo de endpoint MCP, funções de ferramentas personalizadas |
-| Envio de Comandos | Suporta envio de comandos MCP para dispositivos ESP32 via protocolo MQTT a partir do Console Inteligente |
-| Backend de Gerenciamento | Fornece interface de gerenciamento Web, suporta gerenciamento de usuários, configuração do sistema e gerenciamento de dispositivos; Suporta exibição em Chinês Simplificado, Chinês Tradicional e Inglês |
-| Ferramentas de Teste | Fornece ferramentas de teste de desempenho, ferramentas de teste de modelo de visão e ferramentas de teste de interação por áudio |
-| Suporte à Implantação | Suporta implantação via Docker e implantação local, fornece gerenciamento completo de arquivos de configuração |
-| Sistema de Plugins | Suporta extensões de plugins funcionais, desenvolvimento de plugins personalizados e carregamento dinâmico de plugins |
-
-### Em Desenvolvimento 🚧
-
-Para conhecer o progresso específico do plano de desenvolvimento, [clique aqui](https://github.com/users/xinnan-tech/projects/3). Perguntas frequentes e tutoriais relacionados podem ser consultados [neste link](./docs/FAQ.md)
-
-Se você é um desenvolvedor de software, aqui está uma [Carta Aberta aos Desenvolvedores](docs/contributor_open_letter.md). Seja bem-vindo a participar!
-
----
-
-## Ecossistema do Produto 👬
-Xiaozhi é um ecossistema. Ao utilizar este produto, você também pode conferir outros [projetos excelentes](https://github.com/78/xiaozhi-esp32/blob/main/README_zh.md#%E7%9B%B8%E5%85%B3%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE) neste ecossistema
-
----
-
-## Lista de Plataformas/Componentes Suportados 📋
-### LLM Modelos de Linguagem
-
-| Método de Uso | Plataformas Suportadas | Plataformas Gratuitas |
-|:---:|:---:|:---:|
-| Chamadas via interface OpenAI | Alibaba Bailian, Volcano Engine, DeepSeek, Zhipu, Gemini, iFLYTEK | Zhipu, Gemini |
-| Chamadas via interface Ollama | Ollama | - |
-| Chamadas via interface Dify | Dify | - |
-| Chamadas via interface FastGPT | FastGPT | - |
-| Chamadas via interface Coze | Coze | - |
-| Chamadas via interface Xinference | Xinference | - |
-| Chamadas via interface HomeAssistant | HomeAssistant | - |
-
-Na verdade, qualquer LLM que suporte chamadas via interface openai pode ser integrado e utilizado.
-
----
-
-### VLLM Modelos de Visão
-
-| Método de Uso | Plataformas Suportadas | Plataformas Gratuitas |
-|:---:|:---:|:---:|
-| Chamadas via interface OpenAI | Alibaba Bailian, Zhipu ChatGLMVLLM | Zhipu ChatGLMVLLM |
-
-Na verdade, qualquer VLLM que suporte chamadas via interface OpenAI pode ser integrado e utilizado.
-
----
-
-### TTS Síntese de Voz
-
-| Método de Uso | Plataformas Suportadas | Plataformas Gratuitas |
-|:---:|:---:|:---:|
-| Chamadas via interface | EdgeTTS, iFLYTEK, Volcano Engine, Tencent Cloud, Alibaba Cloud e Bailian, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS, Lingxi Streaming TTS, MinimaxTTS | Lingxi Streaming TTS, EdgeTTS, CosyVoiceSiliconflow(parcial) |
-| Serviços locais | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, Index-TTS, PaddleSpeech | Index-TTS, PaddleSpeech, FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3 |
-
----
-
-### VAD Detecção de Atividade Vocal
-
-| Tipo | Nome da Plataforma | Método de Uso | Modelo de Preço | Observações |
-|:---:|:---------:|:----:|:----:|:--:|
-| VAD | SileroVAD | Uso local | Gratuito | |
-
----
-
-### ASR Reconhecimento de Fala
-
-| Método de Uso | Plataformas Suportadas | Plataformas Gratuitas |
-|:---:|:---:|:---:|
-| Uso local | FunASR, SherpaASR | FunASR, SherpaASR |
-| Chamadas via interface | FunASRServer, Volcano Engine, iFLYTEK, Tencent Cloud, Alibaba Cloud, Baidu Cloud, OpenAI ASR | FunASRServer |
-
----
-
-### Reconhecimento de Impressão Vocal
-
-| Método de Uso | Plataformas Suportadas | Plataformas Gratuitas |
-|:---:|:---:|:---:|
-| Uso local | 3D-Speaker | 3D-Speaker |
-
----
-
-### Armazenamento de Memória
-
-| Tipo | Nome da Plataforma | Método de Uso | Modelo de Preço | Observações |
-|:------:|:---------------:|:----:|:---------:|:--:|
-| Memória | mem0ai | Chamadas via interface | Cota de 1000 vezes/mês | |
-| Memória | [powermem](./docs/powermem-integration.md) | Resumo local | Depende do LLM e BD | OceanBase de código aberto, suporta busca inteligente |
-| Memória | mem_local_short | Resumo local | Gratuito | |
-| Memória | nomem | Modo sem memória | Gratuito | |
-
----
-
-### Reconhecimento de Intenção
-
-| Tipo | Nome da Plataforma | Método de Uso | Modelo de Preço | Observações |
-|:------:|:-------------:|:----:|:-------:|:---------------------:|
-| Intenção | intent_llm | Chamadas via interface | Baseado no preço do LLM | Reconhece intenção através de modelos de linguagem, forte generalização |
-| Intenção | function_call | Chamadas via interface | Baseado no preço do LLM | Completa a intenção através de chamada de função do modelo de linguagem, velocidade rápida, bom resultado |
-| Intenção | nointent | Modo sem intenção | Gratuito | Não realiza reconhecimento de intenção, retorna diretamente o resultado do diálogo |
-
----
-
-### RAG Geração Aumentada por Recuperação
-
-| Tipo | Nome da Plataforma | Método de Uso | Modelo de Preço | Observações |
-|:------:|:-------------:|:----:|:-------:|:---------------------:|
-| RAG | ragflow | Chamadas via interface | Cobrado com base nos tokens consumidos para fatiamento e segmentação de palavras | Utiliza o recurso de geração aumentada por recuperação do RagFlow para fornecer respostas de diálogo mais precisas |
-
----
-
-## Agradecimentos 🙏
-
-| Logo | Projeto/Empresa | Descrição |
-|:---:|:---:|:---|
-| <img src="./docs/images/logo_bailing.png" width="160"> | [Robô de Diálogo por Voz Bailing](https://github.com/wwbin2017/bailing) | Este projeto foi inspirado pelo [Robô de Diálogo por Voz Bailing](https://github.com/wwbin2017/bailing) e implementado com base nele |
-| <img src="./docs/images/logo_tenclass.png" width="160"> | [Tenclass](https://www.tenclass.com/) | Agradecimentos à [Tenclass](https://www.tenclass.com/) por formular protocolos de comunicação padrão, soluções de compatibilidade multidispositivo e demonstrações práticas de cenários de alta concorrência para o ecossistema Xiaozhi; fornecendo suporte completo de documentação técnica para este projeto |
-| <img src="./docs/images/logo_xuanfeng.png" width="160"> | [Xuanfeng Technology (玄凤科技)](https://github.com/Eric0308) | Agradecimentos à [Xuanfeng Technology](https://github.com/Eric0308) por contribuir com o framework de chamada de função, protocolo de comunicação MCP e implementação do mecanismo de chamada baseado em plugins. Através de um sistema padronizado de agendamento de instruções e capacidades de expansão dinâmica, melhora significativamente a eficiência de interação e extensibilidade funcional dos dispositivos de frontend (IoT) |
-| <img src="./docs/images/logo_junsen.png" width="160"> | [huangjunsen](https://github.com/huangjunsen0406) | Agradecimentos a [huangjunsen](https://github.com/huangjunsen0406) por contribuir com o módulo `Console de Controle Inteligente Mobile`, que permite controle eficiente e interação em tempo real em dispositivos móveis, melhorando significativamente a conveniência operacional e a eficiência de gerenciamento do sistema em cenários móveis. |
-| <img src="./docs/images/logo_huiyuan.png" width="160"> | [Huiyuan Design (汇远设计)](http://ui.kwd988.net/) | Agradecimentos à [Huiyuan Design](http://ui.kwd988.net/) por fornecer soluções visuais profissionais para este projeto, utilizando sua experiência prática de design atendendo mais de mil empresas para potencializar a experiência do usuário deste produto |
-| <img src="./docs/images/logo_qinren.png" width="160"> | [Xi'an Qinren Information Technology (西安勤人信息科技)](https://www.029app.com/) | Agradecimentos à [Xi'an Qinren Information Technology](https://www.029app.com/) por aprofundar o sistema visual deste projeto, garantindo consistência e extensibilidade do estilo de design geral em aplicações de múltiplos cenários |
-| <img src="./docs/images/logo_contributors.png" width="160"> | [Contribuidores de Código](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors) | Agradecimentos a [todos os contribuidores de código](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors), seus esforços tornaram o projeto mais robusto e poderoso. |
-
-
-<a href="https://star-history.com/#xinnan-tech/xiaozhi-esp32-server&Date">
-
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
- </picture>
-</a>

README_vi.md

@@ -21,7 +21,6 @@ Hỗ trợ giao thức MQTT+UDP, giao thức Websocket, điểm truy cập MCP,
   <a href="./README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DFE0E5"></a>
   <a href="./README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DBEDFA"></a>
   <a href="./README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DFE0E5"></a>
-  <a href="./README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DFE0E5"></a>
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
     <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
   </a>
@@ -213,8 +212,8 @@ Công cụ kiểm tra dịch vụ: https://2662r3426b.vicp.fun/test/
 |:---:|:---:|:---:|
 | ASR(Nhận dạng giọng nói) | FunASR(Local) | 👍XunfeiStreamASR(Xunfei Streaming) |
 | LLM(Mô hình lớn) | glm-4-flash(Zhipu) | 👍qwen-flash(Alibaba Bailian) |
-| VLLM(Mô hình lớn thị giác) | glm-4v-flash(Zhipu) | 👍qwen3.5-flash(Alibaba Bailian) |
-| TTS(Tổng hợp giọng nói) | EdgeTTS(Microsoft) | 👍HuoshanDoubleStreamTTS(Volcano Streaming) |
+| VLLM(Mô hình lớn thị giác) | glm-4v-flash(Zhipu) | 👍qwen2.5-vl-3b-instructh(Alibaba Bailian) |
+| TTS(Tổng hợp giọng nói) | ✅LinkeraiTTS(Lingxi streaming) | 👍HuoshanDoubleStreamTTS(Volcano Streaming) |
 | Intent(Nhận dạng ý định) | function_call(Gọi hàm) | function_call(Gọi hàm) |
 | Memory(Chức năng bộ nhớ) | mem_local_short(Bộ nhớ ngắn hạn cục bộ) | mem_local_short(Bộ nhớ ngắn hạn cục bộ) |
 
@@ -242,7 +241,7 @@ Dự án này cung cấp các công cụ kiểm tra sau để giúp bạn xác m
 | Đối thoại thông minh | Hỗ trợ nhiều LLM(Mô hình ngôn ngữ lớn), thực hiện đối thoại thông minh |
 | Cảm nhận thị giác | Hỗ trợ nhiều VLLM(Mô hình lớn thị giác), thực hiện tương tác đa phương thức |
 | Nhận dạng ý định | Hỗ trợ nhận dạng ý định mô hình lớn gắn ngoài, gọi hàm tự chủ mô hình lớn, cung cấp cơ chế xử lý ý định dạng plugin |
-| Hệ thống bộ nhớ | Hỗ trợ bộ nhớ ngắn hạn cục bộ, bộ nhớ giao diện mem0ai, bộ nhớ thông minh PowerMem, có chức năng tóm tắt bộ nhớ |
+| Hệ thống bộ nhớ | Hỗ trợ bộ nhớ ngắn hạn cục bộ, bộ nhớ giao diện mem0ai, có chức năng tóm tắt bộ nhớ |
 | Kho tri thức | Hỗ trợ kho tri thức RAGFlow, cho phép mô hình lớn đánh giá cần gọi kho tri thức trước khi trả lời |
 | Gọi công cụ | Hỗ trợ giao thức IOT phía client, giao thức MCP phía client, giao thức MCP phía server, giao thức điểm truy cập MCP, hàm công cụ tùy chỉnh |
 | Gửi lệnh | Dựa vào giao thức MQTT, hỗ trợ gửi lệnh MCP từ bảng điều khiển thông minh xuống thiết bị ESP32 |
@@ -260,7 +259,7 @@ Nếu bạn là một nhà phát triển phần mềm, đây có một [Lá thư
 ---
 
 ## Hệ sinh thái sản phẩm 👬
-Xiaozhi là một hệ sinh thái, khi bạn sử dụng sản phẩm này, bạn cũng có thể xem các [dự án xuất sắc](https://github.com/78/xiaozhi-esp32/blob/main/README_zh.md#%E7%9B%B8%E5%85%B3%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE) khác trong hệ sinh thái này
+Xiaozhi là một hệ sinh thái, khi bạn sử dụng sản phẩm này, bạn cũng có thể xem các [dự án xuất sắc](https://github.com/78/xiaozhi-esp32?tab=readme-ov-file#related-open-source-projects) khác trong hệ sinh thái này
 
 ---
 
@@ -330,7 +329,6 @@ Trên thực tế, bất kỳ VLLM nào hỗ trợ gọi giao diện openai đ
 |   Loại   |      Tên nền tảng       | Phương pháp sử dụng |   Mô hình thu phí    | Ghi chú |
 |:------:|:---------------:|:----:|:---------:|:--:|
 | Memory |     mem0ai      | Gọi giao diện | Hạn mức 1000 lần/tháng |    |
-| Memory |     [powermem](./docs/powermem-integration.md)    | Tóm tắt cục bộ | Phụ thuộc vào LLM và DB |  OceanBase mã nguồn mở, hỗ trợ tìm kiếm thông minh  |
 | Memory | mem_local_short | Tóm tắt cục bộ |    Miễn phí     |    |
 | Memory |     nomem       | Chế độ không có bộ nhớ |    Miễn phí     |    |
 

docs/FAQ.md

@@ -40,8 +40,8 @@ conda install conda-forge::ffmpeg
 |:---:|:---:|:---:|
 | ASR(语音识别) | FunASR(本地) | 👍XunfeiStreamASR(讯飞流式) |
 | LLM(大模型) | glm-4-flash(智谱) | 👍qwen-flash(阿里百炼) |
-| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen3.5-flash(阿里百炼) |
-| TTS(语音合成) | EdgeTTS(微软) | 👍HuoshanDoubleStreamTTS(火山流式) |
+| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen2.5-vl-3b-instructh(阿里百炼) |
+| TTS(语音合成) | ✅LinkeraiTTS(灵犀流式) | 👍HuoshanDoubleStreamTTS(火山流式) |
 | Intent(意图识别) | function_call(函数调用) | function_call(函数调用) |
 | Memory(记忆功能) | mem_local_short(本地短期记忆） | mem_local_short（本地短期记忆） |
 
@@ -82,8 +82,6 @@ VAD:
 8、[新闻插件源配置指南](./newsnow_plugin_config.md)<br/>
 9、[知识库ragflow集成指南](./ragflow-integration.md)<br/>
 10、[如何部署上下文源](./context-provider-integration.md)<br/>
-11、[如何集成PowerMem智能记忆](./powermem-integration.md)<br/>
-12、[如何配置天气插件查询天气](./weather-integration.md)<br/>
 
 ### 11、语音克隆、本地语音部署相关教程
 1、[如何在智控台克隆音色](./huoshan-streamTTS-voice-cloning.md)<br/>

docs/mqtt-gateway-integration.md

@@ -127,7 +127,7 @@ pm2 restart xz-mqtt
 ```
 192.168.0.7:8884
 ```
-4. 在智控台顶部，点击`参数管理`，搜索`server.mqtt_manager_api`，点击编辑，填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`API_PORT`。类似这样
+4. 在智控台顶部，点击`参数管理`，搜索`server.mqtt_manager_api`，点击编辑，填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`UDP_PORT`。类似这样
 ```
 192.168.0.7:8007
 ```
@@ -154,7 +154,7 @@ curl 'http://localhost:8002/xiaozhi/ota/' \
 pm2 logs xz-mqtt
 ```
 
-## 第三部分：单模块运行xiaozhi-server实现小智硬件MQTT+UDP连接
+## 第三部分：全模块运行实现小智硬件MQTT+UDP连接
 
 打开你的`data/.config.yaml`文件，在`server`下找到`mqtt_gateway`填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`MQTT_PORT`。类似这样
 ```
@@ -184,4 +184,4 @@ curl 'http://localhost:8002/xiaozhi/ota/' \
 唤醒后留意mqtt-gateway的日志，确认是否有连接成功的日志。
 ```
 pm2 logs xz-mqtt
-```
+```

docs/powermem-integration.md

@@ -1,345 +0,0 @@
-# PowerMem 记忆组件集成指南
-
-## 简介
-
-[PowerMem](https://www.powermem.ai/) 是由 OceanBase 开源的 Agent 记忆组件，通过本地 LLM 进行记忆总结和智能检索，为 AI 代理提供高效的记忆管理功能。
-
-费用说明：PowerMem 本身开源免费，实际费用取决于您选择的 LLM 和数据库：
-- 使用 SQLite + 免费 LLM（如智谱 glm-4-flash）= **完全免费**
-- 使用云端 LLM 或云端数据库 = 按对应服务收费
-
-> 💡 **最佳性能提示**：PowerMem 配合 OceanBase 使用可实现最大性能释放，SQLite 仅建议在资源不足的情况下使用。
-
-- **GitHub**: https://github.com/oceanbase/powermem
-- **官网**: https://www.powermem.ai/
-- **使用示例**: https://github.com/oceanbase/powermem/tree/main/examples
-
-## 功能特性
-
-- **本地总结**：通过 LLM 在本地进行记忆总结和提取
-- **用户画像**：通过 `UserMemory` 自动提取用户信息（姓名、职业、兴趣等），持续更新用户画像
-- **智能遗忘**：基于艾宾浩斯遗忘曲线，自动"遗忘"过时噪声信息
-- **多种存储后端**：支持 OceanBase（推荐，最佳性能）、SeekDB（推荐，AI应用存储一体）、PostgreSQL、SQLite（轻量备选）
-- **多种 LLM 支持**：通义千问、智谱（glm-4-flash 免费）、OpenAI 等
-- **智能检索**：基于向量搜索的语义检索能力
-- **私有部署**：完全支持本地私有化部署
-- **异步操作**：高效的异步记忆管理
-
-## 安装
-
-PowerMem 已添加到项目依赖中，如果需要手动安装：
-
-```bash
-pip install powermem
-```
-
-## 配置说明
-
-### 基础配置
-
-在 `config.yaml` 中配置 PowerMem：
-
-```yaml
-selected_module:
-  Memory: powermem
-
-Memory:
-  powermem:
-    type: powermem
-    # 是否启用用户画像功能
-    # 用户画像支持: oceanbase、seekdb、sqlite (powermem 0.3.0+)
-    enable_user_profile: true
-    
-    # ========== LLM 配置 ==========
-    llm:
-      provider: openai  # 可选: qwen, openai, zhipu 等
-      config:
-        api_key: 你的LLM API密钥
-        model: qwen-plus
-        # openai_base_url: https://api.openai.com/v1  # 可选，自定义服务地址
-    
-    # ========== Embedding 配置 ==========
-    embedder:
-      provider: openai  # 可选: qwen, openai 等
-      config:
-        api_key: 你的嵌入模型API密钥
-        model: text-embedding-v4
-        openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
-        # embedding_dims: 1024  # 向量维度，非1536时需配置
-    
-    # ========== Database 配置 ==========
-    vector_store:
-      provider: sqlite  # 可选: oceanbase(推荐), seekdb(推荐), postgres, sqlite(轻量)
-      config: {}  # SQLite 无需额外配置
-```
-
-### 配置参数详解
-
-#### LLM 配置
-
-| 参数 | 说明 | 可选值 |
-|------|------|--------|
-| `llm.provider` | LLM 提供商 | `qwen`, `openai`, `zhipu` 等 |
-| `llm.config.api_key` | API 密钥 | - |
-| `llm.config.model` | 模型名称 | 根据提供商选择 |
-| `llm.config.openai_base_url` | 自定义服务地址（可选） | - |
-
-#### Embedding 配置
-
-| 参数 | 说明 | 可选值 |
-|------|------|--------|
-| `embedder.provider` | 嵌入模型提供商 | `qwen`, `openai` 等 |
-| `embedder.config.api_key` | API 密钥 | - |
-| `embedder.config.model` | 模型名称 | 根据提供商选择 |
-| `embedder.config.openai_base_url` | 自定义服务地址（可选） | - |
-
-#### Database 配置
-
-| 参数 | 说明 | 可选值 |
-|------|------|--------|
-| `vector_store.provider` | 存储后端类型 | `oceanbase`(推荐), `seekdb`(推荐), `postgres`, `sqlite`(轻量) |
-| `vector_store.config` | 数据库连接配置 | 根据 provider 设置 |
-
-### 记忆模式说明
-
-PowerMem 支持两种记忆模式：
-
-| 模式 | 配置 | 功能 | 存储要求 |
-|------|------|------|----------|
-| **普通记忆** | `enable_user_profile: false` | 对话记忆存储与检索 | 支持所有数据库 |
-| **用户画像** | `enable_user_profile: true` | 记忆 + 自动提取用户画像 | oceanbase、seekdb、sqlite |
-
-> 📌 **版本说明**：PowerMem 0.3.0+ 版本，用户画像功能支持 OceanBase、SeekDB、SQLite 三种存储后端。
-
-### 使用通义千问（推荐）
-
-1. 访问 [阿里云百炼平台](https://bailian.console.aliyun.com/) 注册账号
-2. 在 [API Key 管理](https://bailian.console.aliyun.com/?apiKey=1#/api-key) 页面获取 API 密钥
-3. 配置如下：
-
-```yaml
-Memory:
-  powermem:
-    type: powermem
-    enable_user_profile: true
-    llm:
-      provider: qwen
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: qwen-plus
-    embedder:
-      provider: openai
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: text-embedding-v4
-        openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
-    vector_store:
-      provider: sqlite
-      config: {}
-```
-
-### 使用智谱免费 LLM（完全免费方案）
-
-智谱提供免费的 glm-4-flash 模型，配合 SQLite 可实现完全免费使用：
-
-1. 访问 [智谱AI开放平台](https://bigmodel.cn/) 注册账号
-2. 在 [API Keys](https://bigmodel.cn/usercenter/proj-mgmt/apikeys) 页面获取 API 密钥
-3. 配置如下：
-
-```yaml
-Memory:
-  powermem:
-    type: powermem
-    enable_user_profile: true
-    llm:
-      provider: openai  # 使用 openai 兼容模式
-      config:
-        api_key: xxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx
-        model: glm-4-flash
-        openai_base_url: https://open.bigmodel.cn/api/paas/v4/
-    embedder:
-      provider: openai
-      config:
-        api_key: xxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx
-        model: embedding-3
-        openai_base_url: https://open.bigmodel.cn/api/paas/v4/
-    vector_store:
-      provider: sqlite
-      config: {}
-```
-
-### 使用 OpenAI
-
-```yaml
-Memory:
-  powermem:
-    type: powermem
-    enable_user_profile: true
-    llm:
-      provider: openai
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: gpt-4o-mini
-        openai_base_url: https://api.openai.com/v1
-    embedder:
-      provider: openai
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: text-embedding-3-small
-        openai_base_url: https://api.openai.com/v1
-    vector_store:
-      provider: sqlite
-      config: {}
-```
-
-### 使用 OceanBase（最佳性能方案）
-
-OceanBase 是 PowerMem 的最佳搭档，可实现最大性能释放：
-
-1. 部署 OceanBase 数据库（支持开源本地部署或使用云服务）
-   - 开源部署：https://github.com/oceanbase/oceanbase
-   - 云服务：https://www.oceanbase.com/
-2. 配置如下：
-
-```yaml
-Memory:
-  powermem:
-    type: powermem
-    enable_user_profile: true
-    llm:
-      provider: qwen
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: qwen-plus
-    embedder:
-      provider: openai
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: text-embedding-v4
-        openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
-    vector_store:
-      provider: oceanbase
-      config:
-        host: 127.0.0.1
-        port: 2881
-        user: root@test
-        password: your_password
-        db_name: powermem
-        collection_name: memories  # 默认值
-        embedding_model_dims: 1536  # 嵌入向量维度，必需参数
-```
-
-## 设备记忆隔离
-
-PowerMem 会自动使用设备 ID（`device_id`）作为 `user_id` 进行记忆隔离。这意味着：
-
-- 每个设备拥有独立的记忆空间
-- 不同设备之间的记忆完全隔离
-- 同一设备的多次对话可以共享记忆上下文
-
-## 用户画像（UserMemory）
-
-PowerMem 提供 `UserMemory` 类，可自动从对话中提取用户画像信息。
-
-> 📌 **版本说明**：PowerMem 0.3.0+ 版本，用户画像功能支持 OceanBase、SeekDB、SQLite 三种存储后端。
-
-### 启用用户画像
-
-在配置中设置 `enable_user_profile: true` 即可启用：
-
-```yaml
-Memory:
-  powermem:
-    type: powermem
-    enable_user_profile: true  # 启用用户画像
-    llm:
-      provider: qwen
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: qwen-plus
-    embedder:
-      provider: openai
-      config:
-        api_key: sk-xxxxxxxxxxxxxxxx
-        model: text-embedding-v4
-        openai_base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
-    vector_store:
-      provider: sqlite  # 用户画像支持: oceanbase、seekdb、sqlite
-      config: {}
-```
-
-### 用户画像能力
-
-| 能力 | 说明 |
-|------|------|
-| **信息提取** | 自动从对话中提取姓名、年龄、职业、兴趣等 |
-| **持续更新** | 随着对话进行，不断完善用户画像 |
-| **画像检索** | 将用户画像与记忆搜索结合，提升检索相关性 |
-| **智能遗忘** | 基于艾宾浩斯遗忘曲线，淡化过时信息 |
-
-### 工作原理
-
-启用用户画像后，小智在查询记忆时会自动返回：
-1. **用户画像**：用户的基本信息、兴趣爱好等
-2. **相关记忆**：与当前对话相关的历史记忆
-
-> ✅ **版本说明**：PowerMem 0.3.0+ 版本，用户画像功能支持 OceanBase、SeekDB、SQLite 三种存储后端。
-
-## 与其他记忆组件的对比
-
-| 特性 | PowerMem | mem0ai | mem_local_short |
-|------|----------|--------|-----------------|
-| 工作方式 | 本地总结 | 云端接口 | 本地总结 |
-| 存储位置 | 本地/云端DB | 云端 | 本地YAML |
-| 费用 | 取决于LLM和DB | 1000次/月免费 | 完全免费 |
-| 智能检索 | ✅ 向量搜索 | ✅ 向量搜索 | ❌ 全量返回 |
-| 用户画像 | ✅ UserMemory | ❌ | ❌ |
-| 智能遗忘 | ✅ 遗忘曲线 | ❌ | ❌ |
-| 私有部署 | ✅ 支持 | ❌ 仅云端 | ✅ 支持 |
-| 数据库支持 | OceanBase(推荐)/SeekDB/PostgreSQL/SQLite | - | YAML 文件 |
-
-## 常见问题
-
-### 1. API 密钥错误
-
-如果出现 `API key is required` 错误，请检查：
-- `llm_api_key` 和 `embedding_api_key` 是否正确填写
-- API 密钥是否有效
-
-### 2. 模型不存在
-
-如果出现模型不存在的错误，请确认：
-- `llm_model` 和 `embedding_model` 名称是否正确
-- 对应的模型服务是否已开通
-
-### 3. 连接超时
-
-如果出现连接超时，可以尝试：
-- 检查网络连接
-- 如果使用代理，配置 `llm_base_url` 和 `embedding_base_url`
-
-## 测试验证
-
-可以在虚拟环境中测试 PowerMem 是否正常工作：
-
-```bash
-# 激活虚拟环境
-source .venv/bin/activate
-
-# 测试 PowerMem 导入
-python -c "from powermem import AsyncMemory; print('PowerMem 导入成功')"
-
-# 测试 UserMemory 导入（用户画像功能）
-python -c "from powermem import UserMemory; print('UserMemory 导入成功')"
-```
-
-## 更多资源
-
-- [PowerMem 官方文档](https://www.powermem.ai/)
-- [PowerMem GitHub 仓库](https://github.com/oceanbase/powermem)
-- [PowerMem 使用示例](https://github.com/oceanbase/powermem/tree/main/examples)
-- [OceanBase 官网](https://www.oceanbase.com/)
-- [OceanBase GitHub](https://github.com/oceanbase/oceanbase)
-- [SeekDB GitHub](https://github.com/oceanbase/seekdb)（AI原生搜索数据库）
-- [阿里云百炼平台](https://bailian.console.aliyun.com/)
-

main/manager-api/src/main/java/xiaozhi/common/config/RestTemplateConfig.java

@@ -2,9 +2,7 @@ package xiaozhi.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
-import java.time.Duration;
 
 /**
  * RestTemplate配置
@@ -14,8 +12,6 @@ public class RestTemplateConfig {
 
     @Bean
     public RestTemplate restTemplate() {
-        JdkClientHttpRequestFactory factory = new JdkClientHttpRequestFactory();
-        factory.setReadTimeout(Duration.ofSeconds(30));
-        return new RestTemplate(factory);
+        return new RestTemplate();
     }
 }

main/manager-api/src/main/java/xiaozhi/common/config/SwaggerConfig.java

@@ -43,7 +43,7 @@ public class SwaggerConfig {
     public GroupedOpenApi oatApi() {
         return GroupedOpenApi.builder()
                 .group("ota")
-                .pathsToMatch("/ota/**", "/otaMag/**")
+                .pathsToMatch("/ota/**")
                 .build();
     }
 
@@ -79,22 +79,6 @@ public class SwaggerConfig {
                 .build();
     }
 
-    @Bean
-    public GroupedOpenApi knowledgeApi() {
-        return GroupedOpenApi.builder()
-                .group("knowledge")
-                .pathsToMatch("/datasets/**")
-                .build();
-    }
-
-    @Bean
-    public GroupedOpenApi botApi() {
-        return GroupedOpenApi.builder()
-                .group("bot")
-                .pathsToMatch("/api/v1/**")
-                .build();
-    }
-
     @Bean
     public OpenAPI customOpenAPI() {
         return new OpenAPI().info(new Info()

main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java

@@ -151,21 +151,6 @@ public interface Constant {
      */
     String MEMORY_NO_MEM = "Memory_nomem";
 
-    /**
-     * 仅上报聊天记录（不总结记忆）
-     */
-    String MEMORY_MEM_REPORT_ONLY = "Memory_mem_report_only";
-
-    /**
-     * Mem0AI记忆
-     */
-    String MEMORY_MEM0AI = "Memory_mem0ai";
-
-    /**
-     * PowerMem记忆
-     */
-    String MEMORY_POWERMEM = "Memory_powermem";
-
     /**
      * 火山引擎双声道语音克隆
      */
@@ -319,7 +304,7 @@ public interface Constant {
     /**
      * 版本号
      */
-    public static final String VERSION = "0.9.3";
+    public static final String VERSION = "0.8.10";
 
     /**
      * 无效固件URL

main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java

@@ -240,20 +240,4 @@ public interface ErrorCode {
     int RAG_ADAPTER_CACHE_ERROR = 10191; // 适配器缓存错误
     int RAG_ADAPTER_TYPE_NOT_FOUND = 10192; // 适配器类型未找到
 
-    // 设备工具相关错误码
-    int DEVICE_ID_NOT_NULL = 10193; // 设备ID不能为空
-    int DEVICE_NOT_EXIST = 10194; // 设备不存在
-    int OTA_UPLOAD_COUNT_EXCEED = 10195; // OTA上传次数超过限制
-
-    // 智能体标签相关错误码
-    int AGENT_TAG_NAME_DUPLICATE = 10196; // 标签名称已存在
-    int AGENT_TAG_NAME_EMPTY = 10197; // 标签名称不能为空
-    int AGENT_TAG_NOT_EXIST = 10198; // 标签不存在
-
-    int RAG_DOCUMENT_PARSING_DELETE_ERROR = 10199; // 文档解析中，禁止删除
-
-    // 智能体MCP相关错误码
-    int MCP_ACCESS_POINT_ADDRESS_NO_PERMISSION = 10200; // 没有权限查看该智能体的MCP接入点地址
-    int MCP_ACCESS_POINT_ADDRESS_NOT_CONFIGURED = 10201; // 请联系管理员进入参数管理配置mcp接入点地址
-    int MCP_ACCESS_POINT_TOOLS_LIST_NO_PERMISSION = 10202; // 没有权限查看该智能体的MCP工具列表
 }

main/manager-api/src/main/java/xiaozhi/common/exception/RenException.java

@@ -13,25 +13,23 @@ public class RenException extends RuntimeException {
     private String msg;
 
     public RenException(int code) {
-        super(MessageUtils.getMessage(code));
         this.code = code;
         this.msg = MessageUtils.getMessage(code);
     }
 
     public RenException(int code, String... params) {
-        super(MessageUtils.getMessage(code, params));
         this.code = code;
         this.msg = MessageUtils.getMessage(code, params);
     }
 
     public RenException(int code, Throwable e) {
-        super(MessageUtils.getMessage(code), e);
+        super(e);
         this.code = code;
         this.msg = MessageUtils.getMessage(code);
     }
 
     public RenException(int code, Throwable e, String... params) {
-        super(MessageUtils.getMessage(code, params), e);
+        super(e);
         this.code = code;
         this.msg = MessageUtils.getMessage(code, params);
     }

main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java

@@ -166,26 +166,4 @@ public class RedisKeys {
     public static String getTmpRegisterMacKey(String deviceId) {
         return "tmp_register_mac:" + deviceId;
     }
-
-    /**
-     * OTA绑定设备
-     */
-    public static String getOtaActivationCode(String activationCode) {
-        return "ota:activation:code:" + activationCode;
-    }
-
-    /**
-     * OTA获取设备mac相关信息
-     */
-    public static String getOtaDeviceActivationInfo(String deviceId) {
-        return "ota:activation:data:" + deviceId;
-    }
-
-    /**
-     * OTA上传次数
-     */
-    public static String getOtaUploadCountKey(Long username) {
-        return "ota:upload:count:" + username;
-    }
-
 }

main/manager-api/src/main/java/xiaozhi/common/utils/Sm2DecryptUtil.java

@@ -12,29 +12,28 @@ import xiaozhi.modules.sys.service.SysParamsService;
  * 封装了重复的SM2解密、验证码提取和验证逻辑
  */
 public class Sm2DecryptUtil {
-
+    
     /**
      * 验证码长度
      */
     private static final int CAPTCHA_LENGTH = 5;
-
+    
     /**
      * 解密SM2加密内容，提取验证码并验证
-     * 
      * @param encryptedPassword SM2加密的密码字符串
-     * @param captchaId         验证码ID
-     * @param captchaService    验证码服务
-     * @param sysParamsService  系统参数服务
+     * @param captchaId 验证码ID
+     * @param captchaService 验证码服务
+     * @param sysParamsService 系统参数服务
      * @return 解密后的实际密码
      */
-    public static String decryptAndValidateCaptcha(String encryptedPassword, String captchaId,
-            CaptchaService captchaService, SysParamsService sysParamsService) {
+    public static String decryptAndValidateCaptcha(String encryptedPassword, String captchaId, 
+                                                 CaptchaService captchaService, SysParamsService sysParamsService) {
         // 获取SM2私钥
         String privateKeyStr = sysParamsService.getValue(Constant.SM2_PRIVATE_KEY, true);
         if (StringUtils.isBlank(privateKeyStr)) {
             throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
         }
-
+        
         // 使用SM2私钥解密密码
         String decryptedContent;
         try {
@@ -42,20 +41,19 @@ public class Sm2DecryptUtil {
         } catch (Exception e) {
             throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
         }
-
+        
         // 分离验证码和密码：前5位是验证码，后面是密码
         if (decryptedContent.length() > CAPTCHA_LENGTH) {
             String embeddedCaptcha = decryptedContent.substring(0, CAPTCHA_LENGTH);
             String actualPassword = decryptedContent.substring(CAPTCHA_LENGTH);
-
+            
+            // 验证嵌入的验证码是否正确
             boolean embeddedCaptchaValid = captchaService.validate(captchaId, embeddedCaptcha, true);
             if (!embeddedCaptchaValid) {
                 throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
             }
-
+            
             return actualPassword;
-        } else if (decryptedContent.length() > 0) {
-            throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
         } else {
             throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
         }

main/manager-api/src/main/java/xiaozhi/common/utils/ToolUtil.java

@@ -1,89 +0,0 @@
-package xiaozhi.common.utils;
-
-import cn.hutool.core.util.ReUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 通用工具类
- */
-public class ToolUtil {
-    private static final Logger logger = LoggerFactory.getLogger(ToolUtil.class);
-
-    /**
-     * 对象是否不为空(新增)
-     */
-    public static boolean isNotEmpty(Object o) {
-        return !isEmpty(o);
-    }
-
-    /**
-     * 对象是否为空
-     */
-    public static boolean isEmpty(Object o) {
-        if (o == null) {
-            return true;
-        }
-        if (o instanceof String) {
-            if (o.toString().trim().equals("")) {
-                return true;
-            }
-        } else if (o instanceof List) {
-            if (((List) o).size() == 0) {
-                return true;
-            }
-        } else if (o instanceof Map) {
-            if (((Map) o).size() == 0) {
-                return true;
-            }
-        } else if (o instanceof Set) {
-            if (((Set) o).size() == 0) {
-                return true;
-            }
-        } else if (o instanceof Object[]) {
-            if (((Object[]) o).length == 0) {
-                return true;
-            }
-        } else if (o instanceof int[]) {
-            if (((int[]) o).length == 0) {
-                return true;
-            }
-        } else if (o instanceof long[]) {
-            if (((long[]) o).length == 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 对象组中是否存在空对象
-     */
-    public static boolean isOneEmpty(Object... os) {
-        for (Object o : os) {
-            if (isEmpty(o)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 对象组中是否全是空对象
-     */
-    public static boolean isAllEmpty(Object... os) {
-        for (Object o : os) {
-            if (!isEmpty(o)) {
-                return false;
-            }
-        }
-        return true;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java

@@ -42,9 +42,6 @@ import xiaozhi.modules.agent.dto.AgentMemoryDTO;
 import xiaozhi.modules.agent.dto.AgentUpdateDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.entity.AgentTemplateEntity;
-import xiaozhi.modules.agent.dto.AgentTagDTO;
-import xiaozhi.modules.agent.entity.AgentTagEntity;
-import xiaozhi.modules.agent.service.AgentTagService;
 import xiaozhi.modules.agent.service.AgentChatAudioService;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentChatSummaryService;
@@ -72,18 +69,13 @@ public class AgentController {
     private final AgentContextProviderService agentContextProviderService;
     private final AgentChatSummaryService agentChatSummaryService;
     private final RedisUtils redisUtils;
-    private final AgentTagService agentTagService;
 
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
     @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentDTO>> getUserAgents(
-            @RequestParam(value = "keyword", required = false) String keyword,
-            @RequestParam(value = "searchType", defaultValue = "name") String searchType) {
+    public Result<List<AgentDTO>> getUserAgents() {
         UserDetail user = SecurityUser.getUser();
-
-        // 直接调用整合后的getUserAgents方法，无需再区分搜索和普通查询
-        List<AgentDTO> agents = agentService.getUserAgents(user.getId(), keyword, searchType);
+        List<AgentDTO> agents = agentService.getUserAgents(user.getId());
         return new Result<List<AgentDTO>>().ok(agents);
     }
 
@@ -150,13 +142,6 @@ public class AgentController {
         }
     }
 
-    @PostMapping("/chat-title/{sessionId}/generate")
-    @Operation(summary = "根据会话ID生成聊天标题")
-    public Result<Void> generateAndSaveChatTitle(@PathVariable String sessionId) {
-        agentChatSummaryService.generateAndSaveChatTitle(sessionId);
-        return new Result<Void>().ok(null);
-    }
-
     @PutMapping("/{id}")
     @Operation(summary = "更新智能体")
     @RequiresPermissions("sys:role:normal")
@@ -286,50 +271,4 @@ public class AgentController {
                 .body(audioData);
     }
 
-    @PostMapping("/tag")
-    @Operation(summary = "创建标签")
-    @RequiresPermissions("sys:role:normal")
-    public Result<AgentTagEntity> createTag(@RequestBody Map<String, String> params) {
-        String tagName = params.get("tagName");
-        if (StringUtils.isBlank(tagName)) {
-            return new Result<AgentTagEntity>().error("标签名称不能为空");
-        }
-        AgentTagEntity tag = agentTagService.saveTag(tagName);
-        return new Result<AgentTagEntity>().ok(tag);
-    }
-
-    @GetMapping("/tag/list")
-    @Operation(summary = "获取所有标签列表")
-    @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentTagDTO>> getAllTags() {
-        List<AgentTagDTO> tags = agentTagService.getAllTags();
-        return new Result<List<AgentTagDTO>>().ok(tags);
-    }
-
-    @DeleteMapping("/tag/{id}")
-    @Operation(summary = "删除标签")
-    @RequiresPermissions("sys:role:normal")
-    public Result<Void> deleteTag(@PathVariable String id) {
-        agentTagService.deleteTag(id);
-        return new Result<Void>().ok(null);
-    }
-
-    @GetMapping("/{id}/tags")
-    @Operation(summary = "获取智能体的标签")
-    @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentTagDTO>> getAgentTags(@PathVariable String id) {
-        List<AgentTagDTO> tags = agentTagService.getTagsByAgentId(id);
-        return new Result<List<AgentTagDTO>>().ok(tags);
-    }
-
-    @PutMapping("/{id}/tags")
-    @Operation(summary = "保存智能体的标签")
-    @RequiresPermissions("sys:role:normal")
-    public Result<Void> saveAgentTags(@PathVariable String id, @RequestBody Map<String, Object> params) {
-        List<String> tagIds = (List<String>) params.get("tagIds");
-        List<String> tagNames = (List<String>) params.get("tagNames");
-        agentTagService.saveAgentTags(id, tagIds, tagNames);
-        return new Result<Void>().ok(null);
-    }
-
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentMcpAccessPointController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.service.AgentMcpAccessPointService;
@@ -29,7 +28,7 @@ public class AgentMcpAccessPointController {
     /**
      * 获取智能体的Mcp接入点地址
      * 
-     * @param agentId 智能体id
+     * @param audioId 智能体id
      * @return 返回错误提醒或者Mcp接入点地址
      */
     @Operation(summary = "获取智能体的Mcp接入点地址")
@@ -41,11 +40,11 @@ public class AgentMcpAccessPointController {
 
         // 检查权限
         if (!agentService.checkAgentPermission(agentId, user.getId())) {
-            return new Result<String>().error(ErrorCode.MCP_ACCESS_POINT_ADDRESS_NO_PERMISSION);
+            return new Result<String>().error("没有权限查看该智能体的MCP接入点地址");
         }
         String agentMcpAccessAddress = agentMcpAccessPointService.getAgentMcpAccessAddress(agentId);
         if (agentMcpAccessAddress == null) {
-            return new Result<String>().error(ErrorCode.MCP_ACCESS_POINT_ADDRESS_NOT_CONFIGURED);
+            return new Result<String>().ok("请联系管理员进入参数管理配置mcp接入点地址");
         }
         return new Result<String>().ok(agentMcpAccessAddress);
     }
@@ -59,7 +58,7 @@ public class AgentMcpAccessPointController {
 
         // 检查权限
         if (!agentService.checkAgentPermission(agentId, user.getId())) {
-            return new Result<List<String>>().error(ErrorCode.MCP_ACCESS_POINT_TOOLS_LIST_NO_PERMISSION);
+            return new Result<List<String>>().error("没有权限查看该智能体的MCP工具列表");
         }
         List<String> agentMcpToolsList = agentMcpAccessPointService.getAgentMcpToolsList(agentId);
         return new Result<List<String>>().ok(agentMcpToolsList);

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentChatTitleDao.java

@@ -1,12 +0,0 @@
-package xiaozhi.modules.agent.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import xiaozhi.modules.agent.entity.AgentChatTitleEntity;
-
-@Mapper
-public interface AgentChatTitleDao extends BaseMapper<AgentChatTitleEntity> {
-
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentTagDao.java

@@ -1,24 +0,0 @@
-package xiaozhi.modules.agent.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import xiaozhi.common.dao.BaseDao;
-import xiaozhi.modules.agent.entity.AgentTagEntity;
-
-import java.util.List;
-
-@Mapper
-public interface AgentTagDao extends BaseDao<AgentTagEntity> {
-
-    List<AgentTagEntity> selectByAgentId(@Param("agentId") String agentId);
-
-    List<AgentTagEntity> selectByAgentIds(@Param("agentIds") List<String> agentIds);
-
-    List<AgentTagEntity> selectAll();
-
-    List<String> selectAgentIdsByTagName(@Param("tagName") String tagName);
-
-    List<AgentTagEntity> selectByTagNames(@Param("tagNames") List<String> tagNames);
-
-    int batchInsert(@Param("list") List<AgentTagEntity> tagList);
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentTagRelationDao.java

@@ -1,18 +0,0 @@
-package xiaozhi.modules.agent.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import xiaozhi.common.dao.BaseDao;
-import xiaozhi.modules.agent.entity.AgentTagRelationEntity;
-
-import java.util.List;
-
-@Mapper
-public interface AgentTagRelationDao extends BaseDao<AgentTagRelationEntity> {
-
-    int deleteByAgentId(@Param("agentId") String agentId);
-
-    int insertRelation(AgentTagRelationEntity relation);
-
-    int batchInsertRelation(@Param("list") List<AgentTagRelationEntity> relations);
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSessionDTO.java

@@ -23,9 +23,4 @@ public class AgentChatSessionDTO {
      * 聊天条数
      */
     private Integer chatCount;
-
-    /**
-     * 会话标题
-     */
-    private String title;
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentDTO.java

@@ -1,11 +1,9 @@
 package xiaozhi.modules.agent.dto;
 
 import java.util.Date;
-import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import xiaozhi.modules.agent.dto.AgentTagDTO;
 
 /**
  * 智能体数据传输对象
@@ -47,7 +45,4 @@ public class AgentDTO {
 
     @Schema(description = "设备数量", example = "10")
     private Integer deviceCount;
-
-    @Schema(description = "标签列表")
-    private List<AgentTagDTO> tags;
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentTagDTO.java

@@ -1,20 +0,0 @@
-package xiaozhi.modules.agent.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@Schema(description = "智能体标签DTO")
-public class AgentTagDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Schema(description = "标签ID")
-    private String id;
-
-    @Schema(description = "标签名称")
-    private String tagName;
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java

@@ -1,7 +1,6 @@
 package xiaozhi.modules.agent.dto;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 
@@ -33,9 +32,6 @@ public class AgentUpdateDTO implements Serializable {
     @Schema(description = "大语言模型标识", example = "llm_model_02", nullable = true)
     private String llmModelId;
 
-    @Schema(description = "小模型标识", example = "slm_model_02", nullable = true)
-    private String slmModelId;
-
     @Schema(description = "VLLM模型标识", example = "vllm_model_02", required = false)
     private String vllmModelId;
 
@@ -45,18 +41,6 @@ public class AgentUpdateDTO implements Serializable {
     @Schema(description = "音色标识", example = "voice_02", nullable = true)
     private String ttsVoiceId;
 
-    @Schema(description = "音色语言", example = "普通话", nullable = true)
-    private String ttsLanguage;
-
-    @Schema(description = "TTS音量", example = "50", nullable = true)
-    private Integer ttsVolume;
-
-    @Schema(description = "TTS语速", example = "50", nullable = true)
-    private Integer ttsRate;
-
-    @Schema(description = "TTS音调", example = "50", nullable = true)
-    private Integer ttsPitch;
-
     @Schema(description = "记忆模型标识", example = "mem_model_02", nullable = true)
     private String memModelId;
 

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatTitleEntity.java

@@ -1,36 +0,0 @@
-package xiaozhi.modules.agent.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "ai_agent_chat_title")
-public class AgentChatTitleEntity {
-
-    @TableId(type = IdType.ASSIGN_UUID)
-    private String id;
-
-    @TableField(value = "session_id")
-    private String sessionId;
-
-    @TableField(value = "title")
-    private String title;
-
-    @TableField(value = "created_at")
-    private Date createdAt;
-
-    @TableField(value = "updated_at")
-    private Date updatedAt;
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java

@@ -1,6 +1,5 @@
 package xiaozhi.modules.agent.entity;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -37,9 +36,6 @@ public class AgentEntity {
     @Schema(description = "大语言模型标识")
     private String llmModelId;
 
-    @Schema(description = "小模型标识")
-    private String slmModelId;
-
     @Schema(description = "VLLM模型标识")
     private String vllmModelId;
 
@@ -49,18 +45,6 @@ public class AgentEntity {
     @Schema(description = "音色标识")
     private String ttsVoiceId;
 
-    @Schema(description = "音色语言")
-    private String ttsLanguage;
-
-    @Schema(description = "TTS音量")
-    private Integer ttsVolume;
-
-    @Schema(description = "TTS语速")
-    private Integer ttsRate;
-
-    @Schema(description = "TTS音调")
-    private Integer ttsPitch;
-
     @Schema(description = "记忆模型标识")
     private String memModelId;
 

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTagEntity.java

@@ -1,41 +0,0 @@
-package xiaozhi.modules.agent.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Data
-@TableName("ai_agent_tag")
-@Schema(description = "智能体标签")
-public class AgentTagEntity {
-
-    @TableId(type = IdType.ASSIGN_UUID)
-    @Schema(description = "主键")
-    private String id;
-
-    @Schema(description = "标签名称")
-    private String tagName;
-
-    @Schema(description = "排序")
-    private Integer sort;
-
-    @Schema(description = "创建者")
-    private Long creator;
-
-    @Schema(description = "创建时间")
-    private Date createdAt;
-
-    @Schema(description = "更新者")
-    private Long updater;
-
-    @Schema(description = "更新时间")
-    private Date updatedAt;
-
-    @Schema(description = "删除标记")
-    private Integer deleted;
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTagRelationEntity.java

@@ -1,41 +0,0 @@
-package xiaozhi.modules.agent.entity;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Data
-@TableName("ai_agent_tag_relation")
-@Schema(description = "智能体标签关联")
-public class AgentTagRelationEntity {
-
-    @TableId(type = IdType.ASSIGN_UUID)
-    @Schema(description = "主键")
-    private String id;
-
-    @Schema(description = "智能体ID")
-    private String agentId;
-
-    @Schema(description = "标签ID")
-    private String tagId;
-
-    @Schema(description = "排序")
-    private Integer sort;
-
-    @Schema(description = "创建者")
-    private Long creator;
-
-    @Schema(description = "创建时间")
-    private Date createdAt;
-
-    @Schema(description = "更新者")
-    private Long updater;
-
-    @Schema(description = "更新时间")
-    private Date updatedAt;
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java

@@ -1,7 +1,6 @@
 package xiaozhi.modules.agent.entity;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -65,26 +64,6 @@ public class AgentTemplateEntity implements Serializable {
      */
     private String ttsVoiceId;
 
-    /**
-     * 音色语言
-     */
-    private String ttsLanguage;
-
-    /**
-     * TTS音量
-     */
-    private Integer ttsVolume;
-
-    /**
-     * TTS语速
-     */
-    private Integer ttsRate;
-
-    /**
-     * TTS音调
-     */
-    private Integer ttsPitch;
-
     /**
      * 记忆模型标识
      */

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatSummaryService.java

@@ -12,12 +12,4 @@ public interface AgentChatSummaryService {
      * @return 保存结果
      */
     boolean generateAndSaveChatSummary(String sessionId);
-
-    /**
-     * 根据会话ID生成聊天标题并保存
-     *
-     * @param sessionId 会话ID
-     * @return 是否成功
-     */
-    boolean generateAndSaveChatTitle(String sessionId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatTitleService.java

@@ -1,10 +0,0 @@
-package xiaozhi.modules.agent.service;
-
-import xiaozhi.modules.agent.entity.AgentChatTitleEntity;
-
-public interface AgentChatTitleService {
-
-    void saveOrUpdateTitle(String sessionId, String title);
-
-    String getTitleBySessionId(String sessionId);
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java

@@ -54,11 +54,9 @@ public interface AgentService extends BaseService<AgentEntity> {
      * 获取用户智能体列表
      *
      * @param userId 用户ID
-     * @param keyword 搜索关键词
-     * @param searchType 搜索类型（name - 按名称搜索，mac - 按MAC地址搜索）
      * @return 智能体列表
      */
-    List<AgentDTO> getUserAgents(Long userId, String keyword, String searchType);
+    List<AgentDTO> getUserAgents(Long userId);
 
     /**
      * 根据智能体ID获取设备数量
@@ -100,6 +98,4 @@ public interface AgentService extends BaseService<AgentEntity> {
      * @return 创建的智能体ID
      */
     String createAgent(AgentCreateDTO dto);
-
-
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTagService.java

@@ -1,25 +0,0 @@
-package xiaozhi.modules.agent.service;
-
-import java.util.List;
-
-import xiaozhi.modules.agent.dto.AgentTagDTO;
-import xiaozhi.modules.agent.entity.AgentTagEntity;
-
-public interface AgentTagService {
-
-    AgentTagEntity saveTag(String tagName);
-
-    void deleteTag(String tagId);
-
-    List<AgentTagDTO> getTagsByAgentId(String agentId);
-
-    void saveAgentTags(String agentId, List<String> tagIds, List<String> tagNames);
-
-    void deleteAgentTags(String agentId);
-
-    List<AgentTagDTO> getTagsByAgentIds(List<String> agentIds);
-
-    List<AgentTagDTO> getAllTags();
-
-    List<String> getAgentIdsByTagName(String tagName);
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java

@@ -52,7 +52,7 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
     public Boolean report(AgentChatHistoryReportDTO report) {
         String macAddress = report.getMacAddress();
         Byte chatType = report.getChatType();
-        Long reportTimeMillis = null != report.getReportTime() ? report.getReportTime()
+        Long reportTimeMillis = null != report.getReportTime() ? report.getReportTime() * 1000
                 : System.currentTimeMillis();
         log.info("小智设备聊天上报请求: macAddress={}, type={} reportTime={}", macAddress, chatType, reportTimeMillis);
 

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java

@@ -5,8 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.collection.ListUtil;
-import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,14 +18,12 @@ import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.JsonUtils;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.agent.Enums.AgentChatHistoryType;
 import xiaozhi.modules.agent.dao.AiAgentChatHistoryDao;
 import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
 import xiaozhi.modules.agent.dto.AgentChatSessionDTO;
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
-import xiaozhi.modules.agent.service.AgentChatTitleService;
 import xiaozhi.modules.agent.vo.AgentChatHistoryUserVO;
 
 /**
@@ -38,12 +34,9 @@ import xiaozhi.modules.agent.vo.AgentChatHistoryUserVO;
  * @since 1.0.0
  */
 @Service
-@RequiredArgsConstructor
 public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryDao, AgentChatHistoryEntity>
         implements AgentChatHistoryService {
 
-    private final AgentChatTitleService agentChatTitleService;
-
     @Override
     public PageData<AgentChatSessionDTO> getSessionListByAgentId(Map<String, Object> params) {
         String agentId = (String) params.get("agentId");
@@ -66,7 +59,6 @@ public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryD
             dto.setSessionId((String) map.get("session_id"));
             dto.setCreatedAt((LocalDateTime) map.get("created_at"));
             dto.setChatCount(((Number) map.get("chat_count")).intValue());
-            dto.setTitle(agentChatTitleService.getTitleBySessionId(dto.getSessionId()));
             return dto;
         }).collect(Collectors.toList());
 
@@ -94,12 +86,13 @@ public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryD
         if (deleteAudio) {
             // 分批删除音频,避免超时
             List<String> audioIds = baseMapper.getAudioIdsByAgentId(agentId);
-            if (ToolUtil.isNotEmpty(audioIds)) {
-                // 每批删除1000条
-                List<List<String>> batch = ListUtil.split(audioIds, 1000);
-                batch.forEach(dataList -> {
-                    baseMapper.deleteAudioByIds(dataList);
-                });
+            if (audioIds != null && !audioIds.isEmpty()) {
+                int batchSize = 1000; // 每批删除1000条
+                for (int i = 0; i < audioIds.size(); i += batchSize) {
+                    int end = Math.min(i + batchSize, audioIds.size());
+                    List<String> batch = audioIds.subList(i, end);
+                    baseMapper.deleteAudioByIds(batch);
+                }
             }
         }
         if (deleteAudio && !deleteText) {

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import lombok.RequiredArgsConstructor;
-import xiaozhi.common.constant.Constant;
 import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
 import xiaozhi.modules.agent.dto.AgentChatSummaryDTO;
 import xiaozhi.modules.agent.dto.AgentMemoryDTO;
@@ -22,7 +21,6 @@ import xiaozhi.modules.agent.dto.AgentUpdateDTO;
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentChatSummaryService;
-import xiaozhi.modules.agent.service.AgentChatTitleService;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.vo.AgentInfoVO;
 import xiaozhi.modules.device.entity.DeviceEntity;
@@ -43,7 +41,6 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
 
     private final AgentChatHistoryService agentChatHistoryService;
     private final AgentService agentService;
-    private final AgentChatTitleService agentChatTitleService;
     private final DeviceService deviceService;
     private final LLMService llmService;
     private final ModelConfigService modelConfigService;
@@ -81,11 +78,11 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             // 4. 生成总结（generateSummaryFromMessages方法已包含长度限制逻辑）
             String summary = generateSummaryFromMessages(meaningfulMessages, agentId);
 
-            log.info("成功生成会话 {} 的聊天记录总结，长度: {} 字符", sessionId, summary.length());
+            System.out.println("成功生成会话 " + sessionId + " 的聊天记录总结，长度: " + summary.length() + " 字符");
             return new AgentChatSummaryDTO(sessionId, agentId, summary);
 
         } catch (Exception e) {
-            log.error("生成会话 {} 的聊天记录总结时发生错误: {}", sessionId, e.getMessage());
+            System.err.println("生成会话 " + sessionId + " 的聊天记录总结时发生错误: " + e.getMessage());
             return new AgentChatSummaryDTO(sessionId, "生成总结时发生错误: " + e.getMessage());
         }
     }
@@ -93,140 +90,41 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
     @Override
     public boolean generateAndSaveChatSummary(String sessionId) {
         try {
-            DeviceEntity device = getDeviceBySessionId(sessionId);
-            if (device == null) {
-                log.info("未找到与会话 {} 关联的设备", sessionId);
+            // 1. 生成总结
+            AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
+            if (!summaryDTO.isSuccess()) {
+                System.err.println("生成总结失败: " + summaryDTO.getErrorMessage());
                 return false;
             }
 
-            String agentId = device.getAgentId();
-            String memModelId = agentService.getAgentById(agentId).getMemModelId();
-
-            if (memModelId == null || memModelId.equals(Constant.MEMORY_MEM_REPORT_ONLY)) {
-                log.info("会话 {} 使用仅上报聊天记录模式，跳过记忆总结", sessionId);
-                return true;
+            // 2. 获取设备信息（通过会话关联的设备）
+            DeviceEntity device = getDeviceBySessionId(sessionId);
+            if (device == null) {
+                System.err.println("未找到与会话 " + sessionId + " 关联的设备");
+                return false;
             }
 
-            boolean shouldSummarizeMemory = !memModelId.equals(Constant.MEMORY_NO_MEM)
-                    && !memModelId.equals(Constant.MEMORY_MEM0AI)
-                    && !memModelId.equals(Constant.MEMORY_POWERMEM);
+            // 3. 更新智能体记忆
+            AgentMemoryDTO memoryDTO = new AgentMemoryDTO();
+            memoryDTO.setSummaryMemory(summaryDTO.getSummary());
 
-            if (shouldSummarizeMemory) {
-                AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
-                if (summaryDTO.isSuccess()) {
-                    agentService.updateAgentById(agentId, new AgentUpdateDTO() {
+            // 调用现有接口更新记忆
+            agentService.updateAgentById(device.getAgentId(),
+                    new AgentUpdateDTO() {
                         {
                             setSummaryMemory(summaryDTO.getSummary());
                         }
                     });
-                    log.info("成功保存会话 {} 的聊天记录总结到智能体 {}", sessionId, agentId);
-                } else {
-                    log.info("生成总结失败: {}", summaryDTO.getErrorMessage());
-                }
-            } else {
-                log.info("会话 {} 使用 {} 模式，跳过记忆总结", sessionId, memModelId);
-            }
 
+            System.out.println("成功保存会话 " + sessionId + " 的聊天记录总结到智能体 " + device.getAgentId());
             return true;
 
         } catch (Exception e) {
-            log.error("保存会话 {} 的聊天记录总结时发生错误: {}", sessionId, e.getMessage());
+            System.err.println("保存会话 " + sessionId + " 的聊天记录总结时发生错误: " + e.getMessage());
             return false;
         }
     }
 
-    @Override
-    public boolean generateAndSaveChatTitle(String sessionId) {
-        try {
-            // 自动获取agentId
-            String agentId = findAgentIdBySessionId(sessionId);
-            if (StringUtils.isBlank(agentId)) {
-                log.warn("会话 {} 无法获取智能体信息，跳过标题生成", sessionId);
-                return false;
-            }
-
-            List<AgentChatHistoryDTO> chatHistory = getChatHistoryBySessionId(sessionId);
-            if (chatHistory == null || chatHistory.isEmpty()) {
-                return false;
-            }
-
-            List<String> meaningfulMessages = extractMeaningfulMessages(chatHistory);
-            if (meaningfulMessages.isEmpty()) {
-                return false;
-            }
-
-            StringBuilder conversation = new StringBuilder();
-            for (int i = 0; i < meaningfulMessages.size(); i++) {
-                conversation.append("消息").append(i + 1).append(": ").append(meaningfulMessages.get(i)).append("\n");
-            }
-
-            String slmModelId = getSlmModelId(agentId);
-            String title = llmService.generateTitle(conversation.toString(), slmModelId);
-
-            if (StringUtils.isNotBlank(title)) {
-                agentChatTitleService.saveOrUpdateTitle(sessionId, title);
-                log.info("成功保存会话 {} 的标题: {}", sessionId, title);
-                return true;
-            }
-            return false;
-        } catch (Exception e) {
-            log.error("生成会话 {} 的标题时发生错误: {}", sessionId, e.getMessage());
-            return false;
-        }
-    }
-
-    private String getSlmModelId(String agentId) {
-        try {
-            if (StringUtils.isBlank(agentId)) {
-                return null;
-            }
-
-            AgentInfoVO agentInfo = agentService.getAgentById(agentId);
-            if (agentInfo == null) {
-                return null;
-            }
-
-            String slmModelId = agentInfo.getSlmModelId();
-            if (StringUtils.isNotBlank(slmModelId)) {
-                log.info("会话 {} 使用SLM模型: {}", agentId, slmModelId);
-                return slmModelId;
-            }
-
-            ModelConfigEntity defaultLlmConfig = getDefaultLLMConfig();
-            if (defaultLlmConfig != null) {
-                log.info("会话 {} 使用默认LLM模型: {}", agentId, defaultLlmConfig.getId());
-                return defaultLlmConfig.getId();
-            }
-
-            String llmModelId = agentInfo.getLlmModelId();
-            log.info("会话 {} 使用LLM模型(最终回退): {}", agentId, llmModelId);
-            return llmModelId;
-        } catch (Exception e) {
-            log.error("获取智能体slm模型ID失败，agentId: {}, 错误: {}", agentId, e.getMessage());
-            return null;
-        }
-    }
-
-    private ModelConfigEntity getDefaultLLMConfig() {
-        try {
-            List<ModelConfigEntity> llmConfigs = modelConfigService.getEnabledModelsByType("LLM");
-            if (llmConfigs == null || llmConfigs.isEmpty()) {
-                return null;
-            }
-
-            for (ModelConfigEntity config : llmConfigs) {
-                if (config.getIsDefault() != null && config.getIsDefault() == 1) {
-                    return config;
-                }
-            }
-
-            return llmConfigs.get(0);
-        } catch (Exception e) {
-            log.error("获取默认LLM配置失败: {}", e.getMessage());
-            return null;
-        }
-    }
-
     /**
      * 根据会话ID获取聊天记录
      */
@@ -240,7 +138,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             }
             return agentChatHistoryService.getChatHistoryBySessionId(agentId, sessionId);
         } catch (Exception e) {
-            log.error("获取会话 {} 的聊天记录失败: {}", sessionId, e.getMessage());
+            System.err.println("获取会话 " + sessionId + " 的聊天记录失败: " + e.getMessage());
             return null;
         }
     }
@@ -259,7 +157,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             AgentChatHistoryEntity entity = agentChatHistoryService.getOne(wrapper);
             return entity != null ? entity.getAgentId() : null;
         } catch (Exception e) {
-            log.error("根据会话ID {} 查找智能体ID失败: {}", sessionId, e.getMessage());
+            System.err.println("根据会话ID " + sessionId + " 查找智能体ID失败: " + e.getMessage());
             return null;
         }
     }
@@ -374,7 +272,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
 
             return summary;
         } catch (Exception e) {
-            log.error("调用Java端LLM服务失败: {}", e.getMessage());
+            System.err.println("调用Java端LLM服务失败: " + e.getMessage());
             throw new RuntimeException("LLM服务不可用，无法生成聊天总结");
         }
     }
@@ -397,7 +295,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             // 返回智能体的当前总结记忆
             return agentInfo.getSummaryMemory();
         } catch (Exception e) {
-            log.error("获取智能体历史记忆失败，agentId: {}, 错误: {}", agentId, e.getMessage());
+            System.err.println("获取智能体历史记忆失败，agentId: " + agentId + ", 错误: " + e.getMessage());
             return null;
         }
     }
@@ -407,13 +305,15 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
      */
     private String callJavaLLMForSummaryWithHistory(String conversation, String historyMemory, String agentId) {
         try {
-            String modelId = getSlmModelId(agentId);
+            // 获取智能体配置，从中提取记忆总结的模型ID
+            String modelId = getMemorySummaryModelId(agentId);
 
             if (StringUtils.isBlank(modelId)) {
-                log.info("未找到SLM模型，使用默认LLM服务");
+                System.out.println("未找到记忆总结的LLM模型配置，使用默认LLM服务");
                 return llmService.generateSummaryWithHistory(conversation, historyMemory, null, null);
             }
 
+            // 使用指定的模型ID调用LLM服务（支持历史记忆合并）
             String summary = llmService.generateSummaryWithHistory(conversation, historyMemory, null, modelId);
 
             if (StringUtils.isNotBlank(summary) && !summary.equals("服务暂不可用") && !summary.equals("总结生成失败")) {
@@ -423,7 +323,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             throw new RuntimeException("Java端LLM服务返回异常: " + summary);
 
         } catch (Exception e) {
-            log.error("调用Java端LLM服务异常，agentId: {}, 错误: {}", agentId, e.getMessage());
+            System.err.println("调用Java端LLM服务异常，agentId: " + agentId + ", 错误: " + e.getMessage());
             throw e;
         }
     }
@@ -433,13 +333,15 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
      */
     private String callJavaLLMForSummary(String conversation, String agentId) {
         try {
-            String modelId = getSlmModelId(agentId);
+            // 获取智能体配置，从中提取记忆总结的模型ID
+            String modelId = getMemorySummaryModelId(agentId);
 
             if (StringUtils.isBlank(modelId)) {
-                log.info("未找到SLM模型，使用默认LLM服务");
+                System.out.println("未找到记忆总结的LLM模型配置，使用默认LLM服务");
                 return llmService.generateSummary(conversation);
             }
 
+            // 使用指定的模型ID调用LLM服务
             String summary = llmService.generateSummaryWithModel(conversation, modelId);
 
             if (StringUtils.isNotBlank(summary) && !summary.equals("服务暂不可用") && !summary.equals("总结生成失败")) {
@@ -449,7 +351,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             throw new RuntimeException("Java端LLM服务返回异常: " + summary);
 
         } catch (Exception e) {
-            log.error("调用Java端LLM服务异常，agentId: {}, 错误: {}", agentId, e.getMessage());
+            System.err.println("调用Java端LLM服务异常，agentId: " + agentId + ", 错误: " + e.getMessage());
             throw e;
         }
     }
@@ -492,7 +394,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
 
             return llmModelId;
         } catch (Exception e) {
-            log.error("获取记忆总结LLM模型ID失败，agentId: {}, 错误: {}", agentId, e.getMessage());
+            System.err.println("获取记忆总结LLM模型ID失败，agentId: " + agentId + ", 错误: " + e.getMessage());
             return null;
         }
     }
@@ -514,7 +416,7 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
             }
             return null;
         } catch (Exception e) {
-            log.error("根据会话ID {} 查找设备信息失败: {}", sessionId, e.getMessage());
+            System.err.println("根据会话ID " + sessionId + " 查找设备信息失败: " + e.getMessage());
             return null;
         }
     }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatTitleServiceImpl.java

@@ -1,60 +0,0 @@
-package xiaozhi.modules.agent.service.impl;
-
-import java.util.Date;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import lombok.RequiredArgsConstructor;
-import xiaozhi.modules.agent.dao.AgentChatTitleDao;
-import xiaozhi.modules.agent.entity.AgentChatTitleEntity;
-import xiaozhi.modules.agent.service.AgentChatTitleService;
-
-@Service
-@RequiredArgsConstructor
-public class AgentChatTitleServiceImpl implements AgentChatTitleService {
-
-    private final AgentChatTitleDao agentChatTitleDao;
-
-    @Override
-    public void saveOrUpdateTitle(String sessionId, String title) {
-        if (StringUtils.isBlank(sessionId) || StringUtils.isBlank(title)) {
-            return;
-        }
-
-        QueryWrapper<AgentChatTitleEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("session_id", sessionId);
-
-        AgentChatTitleEntity existing = agentChatTitleDao.selectOne(wrapper);
-
-        if (existing != null) {
-            existing.setTitle(title);
-            existing.setUpdatedAt(new Date());
-            agentChatTitleDao.updateById(existing);
-        } else {
-            AgentChatTitleEntity newEntity = AgentChatTitleEntity.builder()
-                    .id(java.util.UUID.randomUUID().toString().replace("-", ""))
-                    .sessionId(sessionId)
-                    .title(title)
-                    .createdAt(new Date())
-                    .updatedAt(new Date())
-                    .build();
-            agentChatTitleDao.insert(newEntity);
-        }
-    }
-
-    @Override
-    public String getTitleBySessionId(String sessionId) {
-        if (StringUtils.isBlank(sessionId)) {
-            return null;
-        }
-
-        QueryWrapper<AgentChatTitleEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("session_id", sessionId);
-
-        AgentChatTitleEntity entity = agentChatTitleDao.selectOne(wrapper);
-        return entity != null ? entity.getTitle() : null;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentMcpAccessPointServiceImpl.java

@@ -147,7 +147,6 @@ public class AgentMcpAccessPointServiceImpl implements AgentMcpAccessPointServic
                                     List<String> result = toolsList.stream()
                                             .map(tool -> (String) tool.get("name"))
                                             .filter(name -> name != null)
-                                            .sorted()
                                             .collect(Collectors.toList());
                                     log.info("成功获取MCP工具列表，智能体ID: {}, 工具数量: {}", id, result.size());
                                     return result;

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -29,26 +28,20 @@ import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.JsonUtils;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.agent.dao.AgentDao;
-import xiaozhi.modules.agent.dao.AgentTagDao;
 import xiaozhi.modules.agent.dto.AgentCreateDTO;
 import xiaozhi.modules.agent.dto.AgentDTO;
-import xiaozhi.modules.agent.dto.AgentTagDTO;
 import xiaozhi.modules.agent.dto.AgentUpdateDTO;
 import xiaozhi.modules.agent.entity.AgentContextProviderEntity;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.entity.AgentPluginMapping;
-import xiaozhi.modules.agent.entity.AgentTagEntity;
 import xiaozhi.modules.agent.entity.AgentTemplateEntity;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentContextProviderService;
 import xiaozhi.modules.agent.service.AgentPluginMappingService;
 import xiaozhi.modules.agent.service.AgentService;
-import xiaozhi.modules.agent.service.AgentTagService;
 import xiaozhi.modules.agent.service.AgentTemplateService;
 import xiaozhi.modules.agent.vo.AgentInfoVO;
-import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.dto.VoiceDTO;
@@ -63,7 +56,6 @@ import xiaozhi.modules.timbre.service.TimbreService;
 @AllArgsConstructor
 public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> implements AgentService {
     private final AgentDao agentDao;
-    private final AgentTagDao agentTagDao;
     private final TimbreService timbreModelService;
     private final ModelConfigService modelConfigService;
     private final RedisUtils redisUtils;
@@ -73,7 +65,6 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
     private final AgentTemplateService agentTemplateService;
     private final ModelProviderService modelProviderService;
     private final AgentContextProviderService agentContextProviderService;
-    private final AgentTagService agentTagService;
 
     @Override
     public PageData<AgentEntity> adminAgentList(Map<String, Object> params) {
@@ -93,17 +84,17 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
 
         if (agent.getMemModelId() != null && agent.getMemModelId().equals(Constant.MEMORY_NO_MEM)) {
             agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.IGNORE.getCode());
+            if (agent.getChatHistoryConf() == null) {
+                agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode());
+            }
         }
-        if (agent.getChatHistoryConf() == null) {
-            agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode());
-        }
-
+        
         // 查询上下文源配置
         AgentContextProviderEntity contextProviderEntity = agentContextProviderService.getByAgentId(id);
         if (contextProviderEntity != null) {
             agent.setContextProviders(contextProviderEntity.getContextProviders());
         }
-
+        
         // 无需额外查询插件列表，已通过SQL查询出来
         return agent;
     }
@@ -136,91 +127,38 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
     }
 
     @Override
-    public List<AgentDTO> getUserAgents(Long userId, String keyword, String searchType) {
-        QueryWrapper<AgentEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", userId).orderByDesc("created_at");
+    public List<AgentDTO> getUserAgents(Long userId) {
+        QueryWrapper<AgentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        List<AgentEntity> agents = agentDao.selectList(wrapper);
+        return agents.stream().map(agent -> {
+            AgentDTO dto = new AgentDTO();
+            dto.setId(agent.getId());
+            dto.setAgentName(agent.getAgentName());
+            dto.setSystemPrompt(agent.getSystemPrompt());
 
-        // 如果有搜索关键词，根据搜索类型添加相应的查询条件
-        if (StringUtils.isNotBlank(keyword)) {
-            if ("mac".equals(searchType)) {
-                // 按MAC地址搜索：先搜索设备，再获取对应的智能体
-                List<DeviceEntity> devices = Optional
-                        .ofNullable(deviceService.searchDevicesByMacAddress(keyword, userId)).orElseGet(ArrayList::new);
-                // 获取设备对应的智能体ID列表
-                List<String> agentIds = devices.stream()
-                        .map(DeviceEntity::getAgentId)
-                        .distinct()
-                        .collect(Collectors.toList());
-                if (ToolUtil.isNotEmpty(agentIds)) {
-                    queryWrapper.in("id", agentIds);
-                } else {
-                    return new ArrayList<>();
-                }
-            } else {
-                // 按名称搜索（默认）：同时搜索智能体名称和标签名
-                List<String> tagAgentIds = agentTagService.getAgentIdsByTagName(keyword);
-                if (ToolUtil.isNotEmpty(tagAgentIds)) {
-                    queryWrapper.and(wrapper -> wrapper
-                            .like("agent_name", keyword)
-                            .or()
-                            .in("id", tagAgentIds));
-                } else {
-                    queryWrapper.like("agent_name", keyword);
-                }
-            }
-        }
+            // 获取 TTS 模型名称
+            dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
 
-        // 执行查询
-        List<AgentEntity> agentEntities = baseDao.selectList(queryWrapper);
+            // 获取 LLM 模型名称
+            dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
 
-        // 转换为DTO并设置所有必要字段
-        return agentEntities.stream().map(this::buildAgentDTO).collect(Collectors.toList());
-    }
+            // 获取 VLLM 模型名称
+            dto.setVllmModelName(modelConfigService.getModelNameById(agent.getVllmModelId()));
 
-    /**
-     * 将AgentEntity转换为AgentDTO
-     */
-    private AgentDTO buildAgentDTO(AgentEntity agent) {
-        AgentDTO dto = new AgentDTO();
-        dto.setId(agent.getId());
-        dto.setAgentName(agent.getAgentName());
-        dto.setSystemPrompt(agent.getSystemPrompt());
+            // 获取记忆模型名称
+            dto.setMemModelId(agent.getMemModelId());
 
-        // 获取 TTS 模型名称
-        dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
+            // 获取 TTS 音色名称
+            dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
 
-        // 获取 LLM 模型名称
-        dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
+            // 获取智能体最近的最后连接时长
+            dto.setLastConnectedAt(deviceService.getLatestLastConnectionTime(agent.getId()));
 
-        // 获取 VLLM 模型名称
-        dto.setVllmModelName(modelConfigService.getModelNameById(agent.getVllmModelId()));
-
-        // 获取记忆模型名称
-        dto.setMemModelId(agent.getMemModelId());
-
-        // 获取 TTS 音色名称
-        dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
-
-        // 获取智能体最近的最后连接时长
-        dto.setLastConnectedAt(deviceService.getLatestLastConnectionTime(agent.getId()));
-
-        // 获取设备数量
-        dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
-
-        // 获取标签列表
-        List<AgentTagEntity> tags = agentTagDao.selectByAgentId(agent.getId());
-        if (ToolUtil.isNotEmpty(tags)) {
-            dto.setTags(tags.stream().map(this::convertTagToDTO).collect(Collectors.toList()));
-        }
-
-        return dto;
-    }
-
-    private AgentTagDTO convertTagToDTO(AgentTagEntity entity) {
-        AgentTagDTO dto = new AgentTagDTO();
-        dto.setId(entity.getId());
-        dto.setTagName(entity.getTagName());
-        return dto;
+            // 获取设备数量
+            dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
+            return dto;
+        }).collect(Collectors.toList());
     }
 
     @Override
@@ -300,9 +238,6 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         if (dto.getLlmModelId() != null) {
             existingEntity.setLlmModelId(dto.getLlmModelId());
         }
-        if (dto.getSlmModelId() != null) {
-            existingEntity.setSlmModelId(dto.getSlmModelId());
-        }
         if (dto.getVllmModelId() != null) {
             existingEntity.setVllmModelId(dto.getVllmModelId());
         }
@@ -312,18 +247,6 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         if (dto.getTtsVoiceId() != null) {
             existingEntity.setTtsVoiceId(dto.getTtsVoiceId());
         }
-        if (dto.getTtsLanguage() != null) {
-            existingEntity.setTtsLanguage(dto.getTtsLanguage());
-        }
-        if (dto.getTtsVolume() != null) {
-            existingEntity.setTtsVolume(dto.getTtsVolume());
-        }
-        if (dto.getTtsRate() != null) {
-            existingEntity.setTtsRate(dto.getTtsRate());
-        }
-        if (dto.getTtsPitch() != null) {
-            existingEntity.setTtsPitch(dto.getTtsPitch());
-        }
         if (dto.getMemModelId() != null) {
             existingEntity.setMemModelId(dto.getMemModelId());
         }
@@ -409,14 +332,13 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         existingEntity.setUpdatedAt(new Date());
 
         // 更新记忆策略
-        // 删除所有记录
-        if (existingEntity.getMemModelId() != null && existingEntity.getMemModelId().equals(Constant.MEMORY_NO_MEM)) {
+        if (existingEntity.getMemModelId() == null || existingEntity.getMemModelId().equals(Constant.MEMORY_NO_MEM)) {
+            // 删除所有记录
             agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, true);
             existingEntity.setSummaryMemory("");
-            // 删除记忆
-        } else if (existingEntity.getMemModelId() != null
-                && existingEntity.getMemModelId().equals(Constant.MEMORY_MEM_REPORT_ONLY)) {
-            existingEntity.setSummaryMemory("");
+        } else if (existingEntity.getChatHistoryConf() != null && existingEntity.getChatHistoryConf() == 1) {
+            // 删除音频数据
+            agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, false);
         }
 
         // 更新上下文源配置
@@ -509,13 +431,6 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
             entity.setLanguage(template.getLanguage());
         }
 
-        if (entity.getSlmModelId() == null) {
-            String defaultSlmModelId = getDefaultLLMModelId();
-            if (defaultSlmModelId != null) {
-                entity.setSlmModelId(defaultSlmModelId);
-            }
-        }
-
         // 设置用户ID和创建者信息
         UserDetail user = SecurityUser.getUser();
         entity.setUserId(user.getId());
@@ -553,24 +468,4 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         agentPluginMappingService.saveBatch(toInsert);
         return entity.getId();
     }
-
-    private String getDefaultLLMModelId() {
-        try {
-            List<ModelConfigEntity> llmConfigs = modelConfigService.getEnabledModelsByType("LLM");
-            if (llmConfigs == null || llmConfigs.isEmpty()) {
-                return null;
-            }
-
-            for (ModelConfigEntity config : llmConfigs) {
-                if (config.getIsDefault() != null && config.getIsDefault() == 1) {
-                    return config.getId();
-                }
-            }
-
-            return llmConfigs.get(0).getId();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-}
+}

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTagServiceImpl.java

@@ -1,198 +0,0 @@
-package xiaozhi.modules.agent.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import lombok.AllArgsConstructor;
-import xiaozhi.common.exception.ErrorCode;
-import xiaozhi.common.exception.RenException;
-import xiaozhi.common.service.impl.BaseServiceImpl;
-import xiaozhi.modules.agent.dao.AgentTagDao;
-import xiaozhi.modules.agent.dao.AgentTagRelationDao;
-import xiaozhi.modules.agent.dto.AgentTagDTO;
-import xiaozhi.modules.agent.entity.AgentTagEntity;
-import xiaozhi.modules.agent.entity.AgentTagRelationEntity;
-import xiaozhi.modules.agent.service.AgentTagService;
-
-@Service
-@AllArgsConstructor
-public class AgentTagServiceImpl extends BaseServiceImpl<AgentTagDao, AgentTagEntity> implements AgentTagService {
-
-    private final AgentTagRelationDao agentTagRelationDao;
-
-    @Override
-    public AgentTagEntity saveTag(String tagName) {
-        if (tagName == null || tagName.trim().isEmpty()) {
-            throw new RenException(ErrorCode.AGENT_TAG_NAME_EMPTY);
-        }
-
-        QueryWrapper<AgentTagEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("tag_name", tagName);
-        wrapper.eq("deleted", 0);
-        AgentTagEntity existTag = baseDao.selectOne(wrapper);
-        if (existTag != null) {
-            return existTag;
-        }
-
-        AgentTagEntity tag = new AgentTagEntity();
-        tag.setId(UUID.randomUUID().toString().replace("-", ""));
-        tag.setTagName(tagName);
-        tag.setSort(0);
-        tag.setCreatedAt(new Date());
-        tag.setUpdatedAt(new Date());
-        tag.setDeleted(0);
-        baseDao.insert(tag);
-        return tag;
-    }
-
-    @Override
-    public void deleteTag(String tagId) {
-        AgentTagEntity tag = baseDao.selectById(tagId);
-        if (tag != null) {
-            tag.setDeleted(1);
-            tag.setUpdatedAt(new Date());
-            baseDao.updateById(tag);
-        }
-    }
-
-    @Override
-    public List<AgentTagDTO> getTagsByAgentId(String agentId) {
-        List<AgentTagEntity> tags = baseDao.selectByAgentId(agentId);
-        return tags.stream().map(this::convertToDTO).collect(Collectors.toList());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void saveAgentTags(String agentId, List<String> tagIds, List<String> tagNames) {
-        agentTagRelationDao.deleteByAgentId(agentId);
-
-        List<AgentTagEntity> currentTags = baseDao.selectByAgentId(agentId);
-        List<String> currentTagNames = currentTags.stream()
-                .map(AgentTagEntity::getTagName)
-                .collect(Collectors.toList());
-
-        List<String> allTagIds = new ArrayList<>();
-        List<String> newTagNames = new ArrayList<>();
-
-        if (tagNames != null && !tagNames.isEmpty()) {
-            Set<String> addedTagNames = new HashSet<>();
-            for (String tagName : tagNames) {
-                if (tagName == null || tagName.trim().isEmpty()) {
-                    throw new RenException(ErrorCode.AGENT_TAG_NAME_EMPTY);
-                }
-
-                if (currentTagNames.contains(tagName) || addedTagNames.contains(tagName)) {
-                    throw new RenException(ErrorCode.AGENT_TAG_NAME_DUPLICATE);
-                }
-                addedTagNames.add(tagName);
-                newTagNames.add(tagName);
-            }
-        }
-
-        List<AgentTagEntity> existTags = new ArrayList<>();
-        if (!newTagNames.isEmpty()) {
-            existTags = baseDao.selectByTagNames(newTagNames);
-        }
-
-        Map<String, AgentTagEntity> existTagMap = existTags.stream()
-                .collect(Collectors.toMap(AgentTagEntity::getTagName, t -> t, (a, b) -> a));
-
-        List<AgentTagEntity> tagsToInsert = new ArrayList<>();
-        for (String tagName : newTagNames) {
-            AgentTagEntity existTag = existTagMap.get(tagName);
-            if (existTag != null) {
-                allTagIds.add(existTag.getId());
-            } else {
-                AgentTagEntity tag = new AgentTagEntity();
-                tag.setId(UUID.randomUUID().toString().replace("-", ""));
-                tag.setTagName(tagName);
-                tag.setSort(0);
-                tag.setDeleted(0);
-                tag.setCreatedAt(new Date());
-                tag.setUpdatedAt(new Date());
-                tagsToInsert.add(tag);
-            }
-        }
-
-        if (!tagsToInsert.isEmpty()) {
-            baseDao.batchInsert(tagsToInsert);
-            for (AgentTagEntity tag : tagsToInsert) {
-                allTagIds.add(tag.getId());
-            }
-        }
-
-        if (tagIds != null && !tagIds.isEmpty()) {
-            List<AgentTagEntity> tagIdEntities = baseDao.selectBatchIds(tagIds);
-            for (AgentTagEntity tag : tagIdEntities) {
-                if (tag != null && (currentTagNames.contains(tag.getTagName()) ||
-                        newTagNames.contains(tag.getTagName()))) {
-                    throw new RenException(ErrorCode.AGENT_TAG_NAME_DUPLICATE);
-                }
-            }
-            allTagIds.addAll(tagIds);
-        }
-
-        if (allTagIds.isEmpty()) {
-            return;
-        }
-
-        List<AgentTagRelationEntity> relations = new ArrayList<>();
-        Date now = new Date();
-        int sort = 0;
-        for (String tagId : allTagIds) {
-            AgentTagRelationEntity relation = new AgentTagRelationEntity();
-            relation.setId(UUID.randomUUID().toString().replace("-", ""));
-            relation.setAgentId(agentId);
-            relation.setTagId(tagId);
-            relation.setSort(sort++);
-            relation.setCreatedAt(now);
-            relation.setUpdatedAt(now);
-            relations.add(relation);
-        }
-        agentTagRelationDao.batchInsertRelation(relations);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteAgentTags(String agentId) {
-        agentTagRelationDao.deleteByAgentId(agentId);
-    }
-
-    @Override
-    public List<AgentTagDTO> getTagsByAgentIds(List<String> agentIds) {
-        if (agentIds == null || agentIds.isEmpty()) {
-            return List.of();
-        }
-        List<AgentTagEntity> tags = baseDao.selectByAgentIds(agentIds);
-        return tags.stream().map(this::convertToDTO).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<AgentTagDTO> getAllTags() {
-        List<AgentTagEntity> tags = baseDao.selectAll();
-        return tags.stream().map(this::convertToDTO).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<String> getAgentIdsByTagName(String tagName) {
-        return baseDao.selectAgentIdsByTagName(tagName);
-    }
-
-    private AgentTagDTO convertToDTO(AgentTagEntity entity) {
-        AgentTagDTO dto = new AgentTagDTO();
-        dto.setId(entity.getId());
-        dto.setTagName(entity.getTagName());
-        return dto;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java

@@ -87,10 +87,6 @@ public class ConfigServiceImpl implements ConfigService {
                 null,
                 null,
                 null,
-                null,
-                null,
-                null,
-                null,
                 agent.getVadModelId(),
                 agent.getAsrModelId(),
                 null,
@@ -99,7 +95,6 @@ public class ConfigServiceImpl implements ConfigService {
                 null,
                 null,
                 null,
-                null,
                 result,
                 isCache);
 
@@ -114,7 +109,7 @@ public class ConfigServiceImpl implements ConfigService {
         // 检查是否为管理控制台请求
         String redisKey = RedisKeys.getTmpRegisterMacKey(macAddress);
         Object isAdminRequest = redisUtils.get(redisKey);
-
+        
         if (isAdminRequest != null && "true".equals(isAdminRequest)) {
             // 管理控制台请求，返回getConfig的结果
             redisUtils.delete(redisKey); // 使用后清理
@@ -140,24 +135,15 @@ public class ConfigServiceImpl implements ConfigService {
         String voice = null;
         String referenceAudio = null;
         String referenceText = null;
-        String language = null;
         TimbreDetailsVO timbre = timbreService.get(agent.getTtsVoiceId());
         if (timbre != null) {
             voice = timbre.getTtsVoice();
             referenceAudio = timbre.getReferenceAudio();
             referenceText = timbre.getReferenceText();
-            // 优先使用用户选择的语言，如果没有则使用音色支持的第一个语言
-            if (StringUtils.isNotBlank(agent.getTtsLanguage())) {
-                language = agent.getTtsLanguage();
-            } else if (StringUtils.isNotBlank(timbre.getLanguages())) {
-                language = timbre.getLanguages().split("、")[0].trim();
-            }
         } else {
             VoiceCloneEntity voice_print = cloneVoiceService.selectById(agent.getTtsVoiceId());
             if (voice_print != null) {
                 voice = voice_print.getVoiceId();
-                // 优先使用用户选择的语言，如果没有则使用默认值
-                language = StringUtils.isNotBlank(agent.getTtsLanguage()) ? agent.getTtsLanguage() : "普通话";
             }
         }
         // 构建返回数据
@@ -177,11 +163,11 @@ public class ConfigServiceImpl implements ConfigService {
         }
         result.put("chat_history_conf", chatHistoryConf);
         // 如果客户端已实例化模型，则不返回
-        String alreadySelectedVadModelId = selectedModule.get("VAD");
+        String alreadySelectedVadModelId = (String) selectedModule.get("VAD");
         if (alreadySelectedVadModelId != null && alreadySelectedVadModelId.equals(agent.getVadModelId())) {
             agent.setVadModelId(null);
         }
-        String alreadySelectedAsrModelId = selectedModule.get("ASR");
+        String alreadySelectedAsrModelId = (String) selectedModule.get("ASR");
         if (alreadySelectedAsrModelId != null && alreadySelectedAsrModelId.equals(agent.getAsrModelId())) {
             agent.setAsrModelId(null);
         }
@@ -204,11 +190,10 @@ public class ConfigServiceImpl implements ConfigService {
             mcpEndpoint = mcpEndpoint.replace("/mcp/", "/call/");
             result.put("mcp_endpoint", mcpEndpoint);
         }
-
+        
         // 获取上下文源配置
         AgentContextProviderEntity contextProviderEntity = agentContextProviderService.getByAgentId(agent.getId());
-        if (contextProviderEntity != null && contextProviderEntity.getContextProviders() != null
-                && !contextProviderEntity.getContextProviders().isEmpty()) {
+        if (contextProviderEntity != null && contextProviderEntity.getContextProviders() != null && !contextProviderEntity.getContextProviders().isEmpty()) {
             result.put("context_providers", contextProviderEntity.getContextProviders());
         }
 
@@ -223,15 +208,10 @@ public class ConfigServiceImpl implements ConfigService {
                 voice,
                 referenceAudio,
                 referenceText,
-                language,
-                agent.getTtsVolume(),
-                agent.getTtsRate(),
-                agent.getTtsPitch(),
                 agent.getVadModelId(),
                 agent.getAsrModelId(),
                 agent.getLlmModelId(),
                 agent.getVllmModelId(),
-                agent.getSlmModelId(),
                 agent.getTtsModelId(),
                 agent.getMemModelId(),
                 agent.getIntentModelId(),
@@ -322,7 +302,7 @@ public class ConfigServiceImpl implements ConfigService {
     private void buildVoiceprintConfig(String agentId, Map<String, Object> result) {
         try {
             // 获取声纹接口地址
-            String voiceprintUrl = sysParamsService.getValue(Constant.SERVER_VOICE_PRINT, true);
+            String voiceprintUrl = sysParamsService.getValue("server.voice_print", true);
             if (StringUtils.isBlank(voiceprintUrl) || "null".equals(voiceprintUrl)) {
                 return;
             }
@@ -405,15 +385,10 @@ public class ConfigServiceImpl implements ConfigService {
             String voice,
             String referenceAudio,
             String referenceText,
-            String language,
-            Integer ttsVolume,
-            Integer ttsRate,
-            Integer ttsPitch,
             String vadModelId,
             String asrModelId,
             String llmModelId,
             String vllmModelId,
-            String slmModelId,
             String ttsModelId,
             String memModelId,
             String intentModelId,
@@ -422,9 +397,9 @@ public class ConfigServiceImpl implements ConfigService {
             boolean isCache) {
         Map<String, String> selectedModule = new HashMap<>();
 
-        String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM", "SLM", "RAG" };
+        String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM", "RAG" };
         String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId,
-                slmModelId, ragModelId };
+                ragModelId };
         String intentLLMModelId = null;
         String memLocalShortLLMModelId = null;
 
@@ -448,19 +423,11 @@ public class ConfigServiceImpl implements ConfigService {
                         ((Map<String, Object>) model.getConfigJson()).put("ref_audio", referenceAudio);
                     if (referenceText != null)
                         ((Map<String, Object>) model.getConfigJson()).put("ref_text", referenceText);
-                    if (language != null)
-                        ((Map<String, Object>) model.getConfigJson()).put("language", language);
-                    if (ttsVolume != null)
-                        ((Map<String, Object>) model.getConfigJson()).put("ttsVolume", ttsVolume);
-                    if (ttsRate != null)
-                        ((Map<String, Object>) model.getConfigJson()).put("ttsRate", ttsRate);
-                    if (ttsPitch != null)
-                        ((Map<String, Object>) model.getConfigJson()).put("ttsPitch", ttsPitch);
 
                     // 火山引擎声音克隆需要替换resource_id
                     Map<String, Object> map = (Map<String, Object>) model.getConfigJson();
                     if (Constant.VOICE_CLONE_HUOSHAN_DOUBLE_STREAM.equals(map.get("type"))) {
-                        // 如果voice是”S_”开头的，使用seed-icl-1.0
+                        // 如果voice是”S_“开头的，使用seed-icl-1.0
                         if (voice != null && voice.startsWith("S_")) {
                             map.put("resource_id", "seed-icl-1.0");
                         }
@@ -478,7 +445,7 @@ public class ConfigServiceImpl implements ConfigService {
                     if (map.get("functions") != null) {
                         String functionStr = (String) map.get("functions");
                         if (StringUtils.isNotBlank(functionStr)) {
-                            String[] functions = functionStr.split(";");
+                            String[] functions = functionStr.split("\\;");
                             map.put("functions", functions);
                         }
                     }
@@ -511,15 +478,6 @@ public class ConfigServiceImpl implements ConfigService {
                             typeConfig.put(memLocalShortLLM.getId(), memLocalShortLLM.getConfigJson());
                         }
                     }
-                    // LLM也返回所选的SLM，如果同名id则不重复显示
-                    if (StringUtils.isNotBlank(slmModelId) && !slmModelId.equals(llmModelId)) {
-                        if (!typeConfig.containsKey(slmModelId)) {
-                            ModelConfigEntity slmModel = modelConfigService.getModelByIdFromCache(slmModelId);
-                            if (slmModel != null && slmModel.getConfigJson() != null) {
-                                typeConfig.put(slmModel.getId(), slmModel.getConfigJson());
-                            }
-                        }
-                    }
                 }
             }
             result.put(modelTypes[i], typeConfig);

main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java

@@ -1,11 +1,14 @@
 package xiaozhi.modules.device.controller;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +16,9 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,7 +30,6 @@ import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.device.dto.DeviceManualAddDTO;
 import xiaozhi.modules.device.dto.DeviceRegisterDTO;
-import xiaozhi.modules.device.dto.DeviceToolsCallReqDTO;
 import xiaozhi.modules.device.dto.DeviceUnBindDTO;
 import xiaozhi.modules.device.dto.DeviceUpdateDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
@@ -39,11 +44,16 @@ public class DeviceController {
     private final DeviceService deviceService;
     private final RedisUtils redisUtils;
     private final SysParamsService sysParamsService;
+    private final RestTemplate restTemplate;
+    private final ObjectMapper objectMapper;
 
-    public DeviceController(DeviceService deviceService, RedisUtils redisUtils, SysParamsService sysParamsService) {
+    public DeviceController(DeviceService deviceService, RedisUtils redisUtils, SysParamsService sysParamsService,
+            RestTemplate restTemplate, ObjectMapper objectMapper) {
         this.deviceService = deviceService;
         this.redisUtils = redisUtils;
         this.sysParamsService = sysParamsService;
+        this.restTemplate = restTemplate;
+        this.objectMapper = objectMapper;
     }
 
     @PostMapping("/bind/{agentId}/{deviceCode}")
@@ -89,12 +99,83 @@ public class DeviceController {
     @RequiresPermissions("sys:role:normal")
     public Result<String> forwardToMqttGateway(@PathVariable String agentId, @RequestBody String requestBody) {
         try {
-            return new Result<String>().ok(deviceService.getDeviceOnlineData(agentId));
+            // 从系统参数中获取MQTT网关地址
+            String mqttGatewayUrl = sysParamsService.getValue("server.mqtt_manager_api", true);
+            if (StringUtils.isBlank(mqttGatewayUrl) || "null".equals(mqttGatewayUrl)) {
+                return new Result<>();
+            }
+
+            // 获取当前用户的设备列表
+            UserDetail user = SecurityUser.getUser();
+            List<DeviceEntity> devices = deviceService.getUserDevices(user.getId(), agentId);
+
+            // 构建deviceIds数组
+            java.util.List<String> deviceIds = new java.util.ArrayList<>();
+            for (DeviceEntity device : devices) {
+                String macAddress = device.getMacAddress() != null ? device.getMacAddress() : "unknown";
+                String groupId = device.getBoard() != null ? device.getBoard() : "GID_default";
+
+                // 替换冒号为下划线
+                groupId = groupId.replace(":", "_");
+                macAddress = macAddress.replace(":", "_");
+
+                // 构建mqtt客户端ID格式：groupId@@@macAddress@@@macAddress
+                String mqttClientId = groupId + "@@@" + macAddress + "@@@" + macAddress;
+                deviceIds.add(mqttClientId);
+            }
+
+            // 构建完整的URL
+            String url = "http://" + mqttGatewayUrl + "/api/devices/status";
+
+            // 设置请求头
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("Content-Type", "application/json");
+
+            // 生成Bearer令牌
+            String token = generateBearerToken();
+            if (token == null) {
+                return new Result<String>().error("令牌生成失败");
+            }
+            headers.set("Authorization", "Bearer " + token);
+
+            // 构建请求体JSON
+            String jsonBody = "{\"clientIds\":" + objectMapper.writeValueAsString(deviceIds) + "}";
+            HttpEntity<String> requestEntity = new HttpEntity<>(jsonBody, headers);
+
+            // 发送POST请求
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+
+            // 返回响应
+            return new Result<String>().ok(response.getBody());
         } catch (Exception e) {
             return new Result<String>().error("转发请求失败: " + e.getMessage());
         }
     }
 
+    private String generateBearerToken() {
+        try {
+            // 获取当前日期，格式为yyyy-MM-dd
+            String dateStr = java.time.LocalDate.now()
+                    .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+            // 获取MQTT签名密钥
+            String signatureKey = sysParamsService.getValue("server.mqtt_signature_key", false);
+            if (StringUtils.isBlank(signatureKey)) {
+                return null;
+            }
+
+            // 将日期字符串与MQTT_SIGNATURE_KEY连接
+            String tokenContent = dateStr + signatureKey;
+
+            // 对连接后的字符串进行SHA256哈希计算
+            String token = org.apache.commons.codec.digest.DigestUtils.sha256Hex(tokenContent);
+
+            return token;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     @PostMapping("/unbind")
     @Operation(summary = "解绑设备")
     @RequiresPermissions("sys:role:normal")
@@ -129,34 +210,4 @@ public class DeviceController {
         deviceService.manualAddDevice(user.getId(), dto);
         return new Result<>();
     }
-
-    @PostMapping("/tools/list/{deviceId}")
-    @Operation(summary = "获取设备工具列表")
-    @RequiresPermissions("sys:role:normal")
-    public Result<Object> getDeviceTools(@PathVariable String deviceId) {
-        Object toolsData = deviceService.getDeviceTools(deviceId);
-        if (toolsData == null) {
-            return new Result<Object>().error(ErrorCode.DEVICE_NOT_EXIST);
-        }
-
-        return new Result<Object>().ok(toolsData);
-    }
-
-    @PostMapping("/tools/call/{deviceId}")
-    @Operation(summary = "调用设备工具")
-    @RequiresPermissions("sys:role:normal")
-    public Result<Object> callDeviceTool(@PathVariable String deviceId,
-            @Valid @RequestBody DeviceToolsCallReqDTO request) {
-        String toolName = request.getName();
-        Map<String, Object> arguments = request.getArguments();
-
-        Object result = deviceService.callDeviceTool(deviceId, toolName, arguments);
-        if (result == null) {
-            return new Result<Object>().error(ErrorCode.DEVICE_NOT_EXIST);
-        }
-
-        Result<Object> response = new Result<Object>();
-        response.setMsg("Tools called successfully");
-        return response.ok(result);
-    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAMagController.java

@@ -7,9 +7,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
@@ -38,7 +36,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import xiaozhi.common.constant.Constant;
-import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
@@ -46,11 +43,8 @@ import xiaozhi.common.utils.Result;
 import xiaozhi.common.validator.ValidatorUtils;
 import xiaozhi.modules.device.entity.OtaEntity;
 import xiaozhi.modules.device.service.OtaService;
-import xiaozhi.modules.security.user.SecurityUser;
-import xiaozhi.modules.sys.enums.SuperAdminEnum;
-import xiaozhi.modules.sys.service.SysParamsService;
 
-@Tag(name = "固件升级管理", description = "OTA 相关接口")
+@Tag(name = "设备管理", description = "OTA 相关接口")
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -59,7 +53,6 @@ public class OTAMagController {
     private static final Logger logger = LoggerFactory.getLogger(OTAController.class);
     private final OtaService otaService;
     private final RedisUtils redisUtils;
-    private final SysParamsService sysParamsService;
 
     @GetMapping
     @Operation(summary = "分页查询 OTA 固件信息")
@@ -152,11 +145,15 @@ public class OTAMagController {
 
         // 检查下载次数
         String downloadCountKey = RedisKeys.getOtaDownloadCountKey(uuid);
-        Integer downloadCount = (Integer) Optional.ofNullable(redisUtils.get(downloadCountKey)).orElse(0);
+        Integer downloadCount = (Integer) redisUtils.get(downloadCountKey);
+        if (downloadCount == null) {
+            downloadCount = 0;
+        }
 
         // 如果下载次数超过3次，返回404
         if (downloadCount >= 3) {
-            redisUtils.delete(List.of(downloadCountKey, RedisKeys.getOtaIdKey(uuid)));
+            redisUtils.delete(downloadCountKey);
+            redisUtils.delete(RedisKeys.getOtaIdKey(uuid));
             logger.warn("Download limit exceeded for UUID: {}", uuid);
             return ResponseEntity.notFound().build();
         }
@@ -165,17 +162,7 @@ public class OTAMagController {
 
         try {
             // 获取固件信息
-            OtaEntity otaEntity = null;
-            if (id.indexOf("file:") == 0) {
-                id = id.substring(5);
-                otaEntity = new OtaEntity();
-                otaEntity.setFirmwarePath(id);
-                otaEntity.setType("assets");
-                otaEntity.setVersion("1.0.0");
-            } else {
-                otaEntity = otaService.selectById(id);
-            }
-
+            OtaEntity otaEntity = otaService.selectById(id);
             if (otaEntity == null || StringUtils.isBlank(otaEntity.getFirmwarePath())) {
                 logger.warn("Firmware not found or path is empty for ID: {}", id);
                 return ResponseEntity.notFound().build();
@@ -183,7 +170,6 @@ public class OTAMagController {
 
             // 获取文件路径 - 确保路径是绝对路径或正确的相对路径
             String firmwarePath = otaEntity.getFirmwarePath();
-            String originalFilename = otaEntity.getType() + "_" + otaEntity.getVersion();
             Path path;
 
             // 检查是否是绝对路径
@@ -217,7 +203,7 @@ public class OTAMagController {
             byte[] fileContent = Files.readAllBytes(path);
 
             // 设置响应头
-
+            String originalFilename = otaEntity.getType() + "_" + otaEntity.getVersion();
             if (firmwarePath.contains(".")) {
                 String extension = firmwarePath.substring(firmwarePath.lastIndexOf("."));
                 originalFilename += extension;
@@ -293,42 +279,6 @@ public class OTAMagController {
         }
     }
 
-    @PostMapping("/uploadAssetsBin")
-    @Operation(summary = "上传资源固件文件")
-    @RequiresPermissions("sys:role:normal")
-    public Result<String> uploadAssetsBin(@RequestParam("file") MultipartFile file) {
-        String otaUrl = sysParamsService.getValue(Constant.SERVER_OTA, true);
-        if (StringUtils.isBlank(otaUrl) || otaUrl.equals("null")) {
-            return new Result<String>().error(ErrorCode.OTA_URL_EMPTY);
-        }
-        logger.info("username:{},uploadAssetsBin size: {}", SecurityUser.getUser().getUsername(), file.getSize());
-        // 验证文件大小 (资源固件最大20MB)
-        if (file.getSize() > 20 * 1024 * 1024) {
-            return new Result<String>().error(ErrorCode.VOICE_CLONE_AUDIO_TOO_LARGE);
-        }
-        // 普通用户只能每天上传50次
-        if (SecurityUser.getUser().getSuperAdmin() == SuperAdminEnum.NO.value()) {
-            String uploadCountKey = RedisKeys.getOtaUploadCountKey(SecurityUser.getUser().getId());
-            Integer uploadCount = (Integer) Optional.ofNullable(redisUtils.get(uploadCountKey)).orElse(0);
-            if (uploadCount >= 50) {
-                return new Result<String>().error(ErrorCode.OTA_UPLOAD_COUNT_EXCEED);
-            }
-            // 增加上传次数
-            redisUtils.increment(RedisKeys.getOtaUploadCountKey(SecurityUser.getUser().getId()),
-                    RedisUtils.DEFAULT_EXPIRE);
-        }
-        Result<String> result = uploadFirmware(file);
-
-        // 生成资源文件路径
-        if (StringUtils.isNotBlank(result.getData())) {
-            String uuid = UUID.randomUUID().toString();
-            redisUtils.set(RedisKeys.getOtaIdKey(uuid), "file:" + result.getData());
-            String downloadUrl = otaUrl.replace("/ota/", "/otaMag/download/") + uuid;
-            result.setData(downloadUrl);
-        }
-        return result;
-    }
-
     private String calculateMD5(MultipartFile file) throws IOException, NoSuchAlgorithmException {
         MessageDigest md = MessageDigest.getInstance("MD5");
         byte[] digest = md.digest(file.getBytes());

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceToolsCallReqDTO.java

@@ -1,15 +0,0 @@
-package xiaozhi.modules.device.dto;
-
-import java.util.Map;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-
-@Data
-public class DeviceToolsCallReqDTO {
-
-    @NotBlank(message = "工具名称不能为空")
-    private String name;
-
-    private Map<String, Object> arguments;
-}

main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java

@@ -2,22 +2,17 @@ package xiaozhi.modules.device.service;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
-import xiaozhi.modules.device.dto.DeviceManualAddDTO;
 import xiaozhi.modules.device.dto.DevicePageUserDTO;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
+import xiaozhi.modules.device.dto.DeviceManualAddDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.vo.UserShowDeviceListVO;
 
 public interface DeviceService extends BaseService<DeviceEntity> {
-    /**
-     * 获取设备在线数据
-     */
-    String getDeviceOnlineData(String agentId);
 
     /**
      * 检查设备是否激活
@@ -88,7 +83,6 @@ public interface DeviceService extends BaseService<DeviceEntity> {
 
     /**
      * 获取这个智能体设备理的最近的最后连接时间
-     * 
      * @param agentId 智能体id
      * @return 返回设备最近的最后连接时间
      */
@@ -114,23 +108,4 @@ public interface DeviceService extends BaseService<DeviceEntity> {
      */
     String generateWebSocketToken(String clientId, String username) throws Exception;
 
-    /**
-     * 根据MAC地址搜索设备
-     *
-     * @param macAddress MAC地址关键词
-     * @param userId     用户ID
-     * @return 设备列表
-     */
-    List<DeviceEntity> searchDevicesByMacAddress(String macAddress, Long userId);
-
-    /**
-     * 获取设备工具列表
-     */
-    Object getDeviceTools(String deviceId);
-
-    /**
-     * 调用设备工具
-     */
-    Object callDeviceTool(String deviceId, String toolName, Map<String, Object> arguments);
-
 }

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java

@@ -4,17 +4,13 @@ import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -30,18 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.ContentType;
-import cn.hutool.http.Header;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +40,6 @@ import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.DateUtils;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.device.dao.DeviceDao;
 import xiaozhi.modules.device.dto.DeviceManualAddDTO;
 import xiaozhi.modules.device.dto.DevicePageUserDTO;
@@ -104,16 +88,16 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         if (StringUtils.isBlank(activationCode)) {
             throw new RenException(ErrorCode.ACTIVATION_CODE_EMPTY);
         }
-        String deviceKey = RedisKeys.getOtaActivationCode(activationCode);
+        String deviceKey = "ota:activation:code:" + activationCode;
         Object cacheDeviceId = redisUtils.get(deviceKey);
-        if (ToolUtil.isEmpty(cacheDeviceId)) {
+        if (cacheDeviceId == null) {
             throw new RenException(ErrorCode.ACTIVATION_CODE_ERROR);
         }
         String deviceId = (String) cacheDeviceId;
         String safeDeviceId = deviceId.replace(":", "_").toLowerCase();
-        String cacheDeviceKey = RedisKeys.getOtaDeviceActivationInfo(safeDeviceId);
+        String cacheDeviceKey = String.format("ota:activation:data:%s", safeDeviceId);
         Map<String, Object> cacheMap = (Map<String, Object>) redisUtils.get(cacheDeviceKey);
-        if (ToolUtil.isEmpty(cacheMap)) {
+        if (cacheMap == null) {
             throw new RenException(ErrorCode.ACTIVATION_CODE_ERROR);
         }
         String cachedCode = (String) cacheMap.get("activation_code");
@@ -149,56 +133,19 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         deviceEntity.setLastConnectedAt(currentTime);
         deviceDao.insert(deviceEntity);
 
-        // 清理redis缓存、清除智能体设备数量缓存
-        redisUtils.delete(List.of(cacheDeviceKey, deviceKey, RedisKeys.getAgentDeviceCountById(agentId)));
+        // 清理redis缓存
+        redisUtils.delete(cacheDeviceKey);
+        redisUtils.delete(deviceKey);
+
+        // 添加：清除智能体设备数量缓存
+        redisUtils.delete(RedisKeys.getAgentDeviceCountById(agentId));
+
         return true;
     }
 
-    /**
-     * 获取设备在线数据
-     */
     @Override
-    public String getDeviceOnlineData(String agentId) {
-        // 从系统参数中获取MQTT网关地址
-        String mqttGatewayUrl = sysParamsService.getValue("server.mqtt_manager_api", true);
-        if (StringUtils.isBlank(mqttGatewayUrl) || "null".equals(mqttGatewayUrl)) {
-            return "";
-        }
-        // 构建完整的URL
-        String url = StrUtil.format("http://{}/api/devices/status", mqttGatewayUrl);
-
-        // 获取当前用户的设备列表
-        UserDetail user = SecurityUser.getUser();
-        List<DeviceEntity> devices = getUserDevices(user.getId(), agentId);
-
-        // 构建deviceIds数组
-        Set<String> deviceIds = devices.stream().map(o -> {
-            String macAddress = Optional.ofNullable(o.getMacAddress()).orElse("unknown").replace(":", "_");
-            String groupId = Optional.ofNullable(o.getBoard()).orElse("GID_default").replace(":", "_");
-            return StrUtil.format("{}@@@{}@@@{}", groupId, macAddress, macAddress);
-        }).collect(Collectors.toSet());
-
-        // 构建请求入参
-        Map<String, Set<String>> params = MapUtil
-                .builder(new HashMap<String, Set<String>>())
-                .put("clientIds", deviceIds).build();
-
-        if (ToolUtil.isNotEmpty(deviceIds)) {
-            // 发送请求
-            String resultMessage = HttpRequest.post(url)
-                    .header(Header.CONTENT_TYPE, ContentType.JSON.getValue())
-                    .header(Header.AUTHORIZATION, "Bearer " + generateBearerToken())
-                    .body(JSONUtil.toJsonStr(params))
-                    .timeout(10000) // 超时，毫秒
-                    .execute().body();
-            return resultMessage;
-        }
-        // 返回响应
-        return "";
-    }
-
-    @Override
-    public DeviceReportRespDTO checkDeviceActive(String macAddress, String clientId, DeviceReportReqDTO deviceReport) {
+    public DeviceReportRespDTO checkDeviceActive(String macAddress, String clientId,
+            DeviceReportReqDTO deviceReport) {
         DeviceReportRespDTO response = new DeviceReportRespDTO();
         response.setServer_time(buildServerTime());
 
@@ -409,7 +356,8 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
 
     private String getDeviceCacheKey(String deviceId) {
         String safeDeviceId = deviceId.replace(":", "_").toLowerCase();
-        return RedisKeys.getOtaDeviceActivationInfo(safeDeviceId);
+        String dataKey = String.format("ota:activation:data:%s", safeDeviceId);
+        return dataKey;
     }
 
     public DeviceReportRespDTO.Activation buildActivation(String deviceId, DeviceReportReqDTO deviceReport) {
@@ -448,7 +396,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
             redisUtils.set(dataKey, dataMap);
 
             // 写入反查激活码 key
-            String codeKey = RedisKeys.getOtaActivationCode(newCode);
+            String codeKey = "ota:activation:code:" + newCode;
             redisUtils.set(codeKey, deviceId);
         }
         return code;
@@ -548,14 +496,6 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         redisUtils.delete(RedisKeys.getAgentDeviceCountById(dto.getAgentId()));
     }
 
-    @Override
-    public List<DeviceEntity> searchDevicesByMacAddress(String macAddress, Long userId) {
-        QueryWrapper<DeviceEntity> wrapper = new QueryWrapper<>();
-        wrapper.like("mac_address", macAddress);
-        wrapper.eq("user_id", userId);
-        return deviceDao.selectList(wrapper);
-    }
-
     /**
      * 生成MQTT密码签名
      * 
@@ -658,218 +598,4 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
 
         return mqtt;
     }
-
-    /**
-     * 生成BearerToken
-     */
-    private String generateBearerToken() {
-        try {
-            String dateStr = DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN);
-            String signatureKey = sysParamsService.getValue(Constant.SERVER_MQTT_SECRET, false);
-            if (ToolUtil.isEmpty(signatureKey)) {
-                return null;
-            }
-            return DigestUtil.sha256Hex(dateStr + signatureKey);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public Object getDeviceTools(String deviceId) {
-        // 从系统参数中获取MQTT网关地址
-        String mqttGatewayUrl = sysParamsService.getValue("server.mqtt_manager_api", true);
-        if (StringUtils.isBlank(mqttGatewayUrl) || "null".equals(mqttGatewayUrl)) {
-            return null;
-        }
-
-        // 获取设备信息
-        DeviceEntity device = baseDao.selectById(deviceId);
-        if (device == null) {
-            return null;
-        }
-
-        // 检查设备是否属于当前用户
-        UserDetail user = SecurityUser.getUser();
-        if (!device.getUserId().equals(user.getId())) {
-            return null;
-        }
-
-        // 构建clientId
-        String macAddress = Optional.ofNullable(device.getMacAddress()).orElse("unknown").replace(":", "_");
-        String groupId = Optional.ofNullable(device.getBoard()).orElse("GID_default").replace(":", "_");
-        String clientId = StrUtil.format("{}@@@{}@@@{}", groupId, macAddress, macAddress);
-
-        // 构建完整的URL
-        String url = StrUtil.format("http://{}/api/commands/{}", mqttGatewayUrl, clientId);
-
-        // 存储所有工具列表
-        List<Object> allTools = new ArrayList<>();
-        String cursor = null;
-
-        // 循环获取分页数据
-        while (true) {
-            // 构建params
-            Map<String, Object> paramsMap = MapUtil.builder(new HashMap<String, Object>())
-                    .put("withUserTools", true)
-                    .build();
-            // 如果有cursor，添加到请求参数中
-            if (StringUtils.isNotBlank(cursor)) {
-                paramsMap.put("cursor", cursor);
-            }
-
-            // 构建请求体
-            Map<String, Object> payload = MapUtil
-                    .builder(new HashMap<String, Object>())
-                    .put("jsonrpc", "2.0")
-                    .put("id", 2)
-                    .put("method", "tools/list")
-                    .put("params", paramsMap)
-                    .build();
-
-            Map<String, Object> requestBody = MapUtil
-                    .builder(new HashMap<String, Object>())
-                    .put("type", "mcp")
-                    .put("payload", payload)
-                    .build();
-
-            // 发送请求
-            String resultMessage = HttpRequest.post(url)
-                    .header(Header.CONTENT_TYPE, ContentType.JSON.getValue())
-                    .header(Header.AUTHORIZATION, "Bearer " + generateBearerToken())
-                    .body(JSONUtil.toJsonStr(requestBody))
-                    .timeout(10000) // 超时，毫秒
-                    .execute().body();
-
-            // 解析响应
-            if (StringUtils.isBlank(resultMessage)) {
-                break;
-            }
-
-            JSONObject jsonObject = JSONUtil.parseObj(resultMessage);
-            if (!jsonObject.getBool("success", false)) {
-                break;
-            }
-
-            JSONObject data = jsonObject.getJSONObject("data");
-            if (data == null) {
-                break;
-            }
-
-            // 获取当前页的工具列表
-            JSONArray tools = data.getJSONArray("tools");
-            if (tools != null && !tools.isEmpty()) {
-                allTools.addAll(tools);
-            }
-
-            // 获取下一页的cursor
-            String nextCursor = data.getStr("nextCursor");
-            if (StringUtils.isBlank(nextCursor)) {
-                // 没有下一页了
-                break;
-            }
-            cursor = nextCursor;
-        }
-
-        // 构建返回结果
-        if (allTools.isEmpty()) {
-            return null;
-        }
-
-        Map<String, Object> resultData = new HashMap<>();
-        resultData.put("tools", allTools);
-        return resultData;
-    }
-
-    @Override
-    public Object callDeviceTool(String deviceId, String toolName, Map<String, Object> arguments) {
-        // 从系统参数中获取MQTT网关地址
-        String mqttGatewayUrl = sysParamsService.getValue("server.mqtt_manager_api", true);
-        if (StringUtils.isBlank(mqttGatewayUrl) || "null".equals(mqttGatewayUrl)) {
-            return null;
-        }
-
-        // 获取设备信息
-        DeviceEntity device = baseDao.selectById(deviceId);
-        if (device == null) {
-            return null;
-        }
-
-        // 检查设备是否属于当前用户
-        UserDetail user = SecurityUser.getUser();
-        if (!device.getUserId().equals(user.getId())) {
-            return null;
-        }
-
-        // 构建clientId
-        String macAddress = Optional.ofNullable(device.getMacAddress()).orElse("unknown").replace(":", "_");
-        String groupId = Optional.ofNullable(device.getBoard()).orElse("GID_default").replace(":", "_");
-        String clientId = StrUtil.format("{}@@@{}@@@{}", groupId, macAddress, macAddress);
-
-        // 构建完整的URL
-        String url = StrUtil.format("http://{}/api/commands/{}", mqttGatewayUrl, clientId);
-
-        // 构建请求体
-        Map<String, Object> params = MapUtil
-                .builder(new HashMap<String, Object>())
-                .put("name", toolName)
-                .put("arguments", arguments)
-                .build();
-
-        Map<String, Object> payload = MapUtil
-                .builder(new HashMap<String, Object>())
-                .put("jsonrpc", "2.0")
-                .put("id", 2)
-                .put("method", "tools/call")
-                .put("params", params)
-                .build();
-
-        Map<String, Object> requestBody = MapUtil
-                .builder(new HashMap<String, Object>())
-                .put("type", "mcp")
-                .put("payload", payload)
-                .build();
-
-        // 发送请求
-        String resultMessage = HttpRequest.post(url)
-                .header(Header.CONTENT_TYPE, ContentType.JSON.getValue())
-                .header(Header.AUTHORIZATION, "Bearer " + generateBearerToken())
-                .body(JSONUtil.toJsonStr(requestBody))
-                .timeout(10000) // 超时，毫秒
-                .execute().body();
-
-        // 解析响应
-        if (StringUtils.isNotBlank(resultMessage)) {
-            cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resultMessage);
-            if (jsonObject.getBool("success", false)) {
-                cn.hutool.json.JSONObject data = jsonObject.getJSONObject("data");
-                if (data != null) {
-                    cn.hutool.json.JSONArray content = data.getJSONArray("content");
-                    if (content != null && content.size() > 0) {
-                        cn.hutool.json.JSONObject firstContent = content.getJSONObject(0);
-                        if (firstContent != null && "text".equals(firstContent.getStr("type"))) {
-                            String text = firstContent.getStr("text");
-                            if (StringUtils.isNotBlank(text)) {
-                                String trimmedText = text.trim();
-                                if (trimmedText.startsWith("{") || trimmedText.startsWith("[")) {
-                                    try {
-                                        return JSONUtil.parseObj(trimmedText);
-                                    } catch (Exception e) {
-                                        return trimmedText;
-                                    }
-                                } else if ("true".equals(trimmedText)) {
-                                    return true;
-                                } else if ("false".equals(trimmedText)) {
-                                    return false;
-                                } else {
-                                    return trimmedText;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java

@@ -66,7 +66,7 @@ public class OtaServiceImpl extends BaseServiceImpl<OtaDao, OtaEntity> implement
         // 同类固件只保留最新的一条
         List<OtaEntity> otaList = baseDao.selectList(queryWrapper);
         if (otaList != null && otaList.size() > 0) {
-            OtaEntity otaBefore = otaList.get(0);
+            OtaEntity otaBefore = otaList.getFirst();
             entity.setId(otaBefore.getId());
             baseDao.updateById(entity);
             return true;

main/manager-api/src/main/java/xiaozhi/modules/knowledge/config/RAGTaskConfig.java

@@ -1,13 +0,0 @@
-package xiaozhi.modules.knowledge.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-/**
- * 知识库模块定时任务配置
- * 启用 Spring Schedule 能力
- */
-@Configuration
-@EnableScheduling
-public class RAGTaskConfig {
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java

@@ -1,6 +1,7 @@
 package xiaozhi.modules.knowledge.controller;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -23,11 +24,8 @@ import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
 import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
-import xiaozhi.modules.knowledge.service.KnowledgeManagerService;
-import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.security.user.SecurityUser;
 
 @AllArgsConstructor
@@ -37,7 +35,6 @@ import xiaozhi.modules.security.user.SecurityUser;
 public class KnowledgeBaseController {
 
     private final KnowledgeBaseService knowledgeBaseService;
-    private final KnowledgeManagerService knowledgeManagerService;
 
     @GetMapping
     @Operation(summary = "分页查询知识库列表")
@@ -98,8 +95,6 @@ public class KnowledgeBaseController {
             throw new RenException(ErrorCode.NO_PERMISSION);
         }
 
-        // [FIX] 注入 ID，防止 Service 层找不到记录
-        knowledgeBaseDTO.setId(existingKnowledgeBase.getId());
         knowledgeBaseDTO.setDatasetId(datasetId);
         KnowledgeBaseDTO resp = knowledgeBaseService.update(knowledgeBaseDTO);
         return new Result<KnowledgeBaseDTO>().ok(resp);
@@ -121,8 +116,7 @@ public class KnowledgeBaseController {
             throw new RenException(ErrorCode.NO_PERMISSION);
         }
 
-        // [Architecture Fix] 通过编排层级联删除，防止孤儿数据并解决循环依赖
-        knowledgeManagerService.deleteDatasetWithFiles(datasetId);
+        knowledgeBaseService.deleteByDatasetId(datasetId);
         return new Result<>();
     }
 
@@ -137,18 +131,20 @@ public class KnowledgeBaseController {
 
         // 获取当前登录用户ID
         Long currentUserId = SecurityUser.getUserId();
-        List<String> idList = Arrays.asList(ids.split(","));
-        List<KnowledgeBaseDTO> knowledgeBaseDTOs = Optional.ofNullable(knowledgeBaseService.getByDatasetIdList(idList))
-                .orElseGet(ArrayList::new);
-        if (ToolUtil.isNotEmpty(knowledgeBaseDTOs)) {
-            knowledgeBaseDTOs.forEach(item -> {
+        String[] idArray = ids.split(",");
+        for (String datasetId : idArray) {
+            if (StringUtils.isNotBlank(datasetId)) {
+                // 先获取现有知识库信息以检查权限
+                KnowledgeBaseDTO existingKnowledgeBase = knowledgeBaseService.getByDatasetId(datasetId.trim());
+
                 // 检查权限：用户只能删除自己创建的知识库
-                if (item.getCreator() == null || !item.getCreator().equals(currentUserId)) {
+                if (existingKnowledgeBase.getCreator() == null
+                        || !existingKnowledgeBase.getCreator().equals(currentUserId)) {
                     throw new RenException(ErrorCode.NO_PERMISSION);
                 }
-                // [Architecture Fix] 通过编排层级联删除
-                knowledgeManagerService.deleteDatasetWithFiles(item.getDatasetId());
-            });
+
+                knowledgeBaseService.deleteByDatasetId(datasetId.trim());
+            }
         }
         return new Result<>();
     }
@@ -156,8 +152,8 @@ public class KnowledgeBaseController {
     @GetMapping("/rag-models")
     @Operation(summary = "获取RAG模型列表")
     @RequiresPermissions("sys:role:normal")
-    public Result<List<ModelConfigEntity>> getRAGModels() {
-        List<ModelConfigEntity> result = knowledgeBaseService.getRAGModels();
-        return new Result<List<ModelConfigEntity>>().ok(result);
+    public Result<List<Map<String, Object>>> getRAGModels() {
+        List<Map<String, Object>> result = knowledgeBaseService.getRAGModels();
+        return new Result<List<Map<String, Object>>>().ok(result);
     }
 }

main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -12,6 +11,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import xiaozhi.common.exception.ErrorCode;
@@ -20,9 +20,6 @@ import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
 import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
-import xiaozhi.modules.knowledge.dto.document.ChunkDTO;
-import xiaozhi.modules.knowledge.dto.document.DocumentDTO;
-import xiaozhi.modules.knowledge.dto.document.RetrievalDTO;
 import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
 import xiaozhi.modules.knowledge.service.KnowledgeFilesService;
 import xiaozhi.modules.security.user.SecurityUser;
@@ -60,17 +57,22 @@ public class KnowledgeFilesController {
     public Result<PageData<KnowledgeFilesDTO>> getPageList(
             @PathVariable("dataset_id") String datasetId,
             @RequestParam(required = false) String name,
-            @RequestParam(required = false) String status,
+            @RequestParam(required = false) Integer status,
             @RequestParam(required = false, defaultValue = "1") Integer page,
             @RequestParam(required = false, defaultValue = "10") Integer page_size) {
         // 验证知识库权限
         validateKnowledgeBasePermission(datasetId);
 
-        // 组装参数
+        // 如果指定了状态参数，使用状态查询接口
+        if (status != null) {
+            PageData<KnowledgeFilesDTO> pageData = knowledgeFilesService.getPageListByStatus(datasetId, status, page, page_size);
+            return new Result<PageData<KnowledgeFilesDTO>>().ok(pageData);
+        }
+
+        // 否则使用通用查询接口
         KnowledgeFilesDTO knowledgeFilesDTO = new KnowledgeFilesDTO();
         knowledgeFilesDTO.setDatasetId(datasetId);
         knowledgeFilesDTO.setName(name);
-        knowledgeFilesDTO.setStatus(status);
         PageData<KnowledgeFilesDTO> pageData = knowledgeFilesService.getPageList(knowledgeFilesDTO, page, page_size);
         return new Result<PageData<KnowledgeFilesDTO>>().ok(pageData);
     }
@@ -80,16 +82,13 @@ public class KnowledgeFilesController {
     @RequiresPermissions("sys:role:normal")
     public Result<PageData<KnowledgeFilesDTO>> getPageListByStatus(
             @PathVariable("dataset_id") String datasetId,
-            @PathVariable("status") String status,
+            @PathVariable("status") Integer status,
             @RequestParam(required = false, defaultValue = "1") Integer page,
             @RequestParam(required = false, defaultValue = "10") Integer page_size) {
         // 验证知识库权限
         validateKnowledgeBasePermission(datasetId);
-        // 组装参数
-        KnowledgeFilesDTO knowledgeFilesDTO = new KnowledgeFilesDTO();
-        knowledgeFilesDTO.setDatasetId(datasetId);
-        knowledgeFilesDTO.setStatus(status);
-        PageData<KnowledgeFilesDTO> pageData = knowledgeFilesService.getPageList(knowledgeFilesDTO, page, page_size);
+
+        PageData<KnowledgeFilesDTO> pageData = knowledgeFilesService.getPageListByStatus(datasetId, status, page, page_size);
         return new Result<PageData<KnowledgeFilesDTO>>().ok(pageData);
     }
 
@@ -114,29 +113,16 @@ public class KnowledgeFilesController {
         return new Result<KnowledgeFilesDTO>().ok(resp);
     }
 
-    @DeleteMapping("/documents")
-    @Operation(summary = "批量删除文档")
-    @RequiresPermissions("sys:role:normal")
-    public Result<Void> delete(@PathVariable("dataset_id") String datasetId,
-            @RequestBody DocumentDTO.BatchIdReq req) {
-        // 验证知识库权限
-        validateKnowledgeBasePermission(datasetId);
-
-        knowledgeFilesService.deleteDocuments(datasetId, req);
-        return new Result<>();
-    }
-
     @DeleteMapping("/documents/{document_id}")
     @Operation(summary = "删除单个文档")
+    @Parameter(name = "document_id", description = "文档ID", required = true)
     @RequiresPermissions("sys:role:normal")
-    public Result<Void> deleteSingle(@PathVariable("dataset_id") String datasetId,
+    public Result<Void> delete(@PathVariable("dataset_id") String datasetId,
             @PathVariable("document_id") String documentId) {
         // 验证知识库权限
         validateKnowledgeBasePermission(datasetId);
 
-        DocumentDTO.BatchIdReq req = new DocumentDTO.BatchIdReq();
-        req.setIds(java.util.Collections.singletonList(documentId));
-        knowledgeFilesService.deleteDocuments(datasetId, req);
+        knowledgeFilesService.deleteByDocumentId(documentId, datasetId);
         return new Result<>();
     }
 
@@ -164,53 +150,65 @@ public class KnowledgeFilesController {
     @GetMapping("/documents/{document_id}/chunks")
     @Operation(summary = "列出指定文档的切片")
     @RequiresPermissions("sys:role:normal")
-    public Result<ChunkDTO.ListVO> listChunks(
-            @PathVariable("dataset_id") String datasetId,
+    public Result<Map<String, Object>> listChunks(@PathVariable("dataset_id") String datasetId,
             @PathVariable("document_id") String documentId,
-            @ParameterObject ChunkDTO.ListReq req) {
-
-        // 验证权限 (内部已包含知识库存在性校验与归属权校验)
-        validateKnowledgeBasePermission(datasetId);
-
-        // 设置默认值
-        if (req.getPage() == null)
-            req.setPage(1);
-        if (req.getPageSize() == null)
-            req.setPageSize(50);
-
-        // 调用服务层获取强类型切片列表
-        ChunkDTO.ListVO result = knowledgeFilesService.listChunks(datasetId, documentId, req);
-        return new Result<ChunkDTO.ListVO>().ok(result);
-    }
-
-    @PostMapping("/retrieval-test")
-    @Operation(summary = "召回测试")
-    @RequiresPermissions("sys:role:normal")
-    public Result<RetrievalDTO.ResultVO> retrievalTest(
-            @PathVariable("dataset_id") String datasetId,
-            @RequestBody RetrievalDTO.TestReq req) {
-
+            @RequestParam(required = false) String keywords,
+            @RequestParam(required = false, defaultValue = "1") Integer page,
+            @RequestParam(required = false, defaultValue = "1024") Integer page_size,
+            @RequestParam(required = false) String id) {
         // 验证知识库权限
         validateKnowledgeBasePermission(datasetId);
 
-        // 业务下沉逻辑：如果未指定知识库ID，则设为当前路径中的 datasetId
-        if (req.getDatasetIds() == null || req.getDatasetIds().isEmpty()) {
-            req.setDatasetIds(java.util.Arrays.asList(datasetId));
-        }
-
-        // [Reinforce] 强管控分页参数，防止 RAGFlow 端出现 Negative Slicing 报错
-        if (req.getPage() == null || req.getPage() < 1) {
-            req.setPage(1);
-        }
-        if (req.getPageSize() == null || req.getPageSize() < 1) {
-            req.setPageSize(100);
-        }
-
-        // 调用检索服务，返回强类型聚合对象
-        RetrievalDTO.ResultVO result = knowledgeFilesService.retrievalTest(req);
-        return new Result<RetrievalDTO.ResultVO>().ok(result);
+        Map<String, Object> result = knowledgeFilesService.listChunks(datasetId, documentId, keywords, page, page_size,
+                id);
+        return new Result<Map<String, Object>>().ok(result);
     }
 
+    /**
+     * 召回测试
+     */
+    @PostMapping("/retrieval-test")
+    @Operation(summary = "召回测试")
+    @RequiresPermissions("sys:role:normal")
+    public Result<Map<String, Object>> retrievalTest(@PathVariable("dataset_id") String datasetId,
+            @RequestBody Map<String, Object> params) {
+        // 验证知识库权限
+        validateKnowledgeBasePermission(datasetId);
+
+        try {
+            // 提取参数
+            String question = (String) params.get("question");
+            if (question == null || question.trim().isEmpty()) {
+                return new Result<Map<String, Object>>().error("问题不能为空");
+            }
+
+            List<String> datasetIds = (List<String>) params.get("dataset_ids");
+            List<String> documentIds = (List<String>) params.get("document_ids");
+            Integer page = (Integer) params.get("page");
+            Integer pageSize = (Integer) params.get("page_size");
+            Float similarityThreshold = (Float) params.get("similarity_threshold");
+            Float vectorSimilarityWeight = (Float) params.get("vector_similarity_weight");
+            Integer topK = (Integer) params.get("top_k");
+            String rerankId = (String) params.get("rerank_id");
+            Boolean keyword = (Boolean) params.get("keyword");
+            Boolean highlight = (Boolean) params.get("highlight");
+            List<String> crossLanguages = (List<String>) params.get("cross_languages");
+            Map<String, Object> metadataCondition = (Map<String, Object>) params.get("metadata_condition");
+
+            // 如果未指定数据集ID，使用当前数据集
+            if (datasetIds == null || datasetIds.isEmpty()) {
+                datasetIds = java.util.Arrays.asList(datasetId);
+            }
+
+            Map<String, Object> result = knowledgeFilesService.retrievalTest(
+                    question, datasetIds, documentIds, page, pageSize, similarityThreshold,
+                    vectorSimilarityWeight, topK, rerankId, keyword, highlight, crossLanguages, metadataCondition);
+
+            return new Result<Map<String, Object>>().ok(result);
+        } catch (Exception e) {
+            return new Result<Map<String, Object>>().error("召回测试失败: " + e.getMessage());
+        }
+    }
     /**
      * 解析JSON字符串为Map对象
      */

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dao/DocumentDao.java

@@ -1,12 +0,0 @@
-package xiaozhi.modules.knowledge.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import xiaozhi.common.dao.BaseDao;
-import xiaozhi.modules.knowledge.entity.DocumentEntity;
-
-/**
- * 文档 DAO
- */
-@Mapper
-public interface DocumentDao extends BaseDao<DocumentEntity> {
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dao/KnowledgeBaseDao.java

@@ -19,17 +19,4 @@ public interface KnowledgeBaseDao extends BaseDao<KnowledgeBaseEntity> {
      */
     void deletePluginMappingByKnowledgeBaseId(@Param("knowledgeBaseId") String knowledgeBaseId);
 
-    /**
-     * 通用维度原子更新知识库统计信息
-     * 
-     * @param datasetId  数据集ID
-     * @param docDelta   文档数增量
-     * @param chunkDelta 分块数增量
-     * @param tokenDelta Token数增量
-     */
-    void updateStatsAfterChange(@Param("datasetId") String datasetId,
-            @Param("docDelta") Integer docDelta,
-            @Param("chunkDelta") Long chunkDelta,
-            @Param("tokenDelta") Long tokenDelta);
-
 }

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/DocumentDTO.java

@@ -1,68 +0,0 @@
-package xiaozhi.modules.knowledge.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 文档 DTO
- */
-@Data
-@Schema(description = "知识库文档")
-public class DocumentDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Schema(description = "本地ID")
-    private String id;
-
-    @Schema(description = "知识库ID")
-    private String datasetId;
-
-    @Schema(description = "RAGFlow文档ID")
-    private String documentId;
-
-    @Schema(description = "文档名称")
-    private String name;
-
-    @Schema(description = "文件大小")
-    private Long size;
-
-    @Schema(description = "文件类型")
-    private String type;
-
-    @Schema(description = "分块方法")
-    private String chunkMethod;
-
-    @Schema(description = "解析配置")
-    private Map<String, Object> parserConfig;
-
-    @Schema(description = "处理状态 (1:解析中 3:成功 4:失败)")
-    private Integer status;
-
-    @Schema(description = "错误信息")
-    private String error;
-
-    @Schema(description = "分块数量")
-    private Integer chunkCount;
-
-    @Schema(description = "Token数量")
-    private Long tokenCount;
-
-    @Schema(description = "是否启用")
-    private Integer enabled;
-
-    @Schema(description = "创建时间")
-    private Date createdAt;
-
-    @Schema(description = "更新时间")
-    private Date updatedAt;
-
-    @Schema(description = "上传进度 (虚拟字段)")
-    private Double progress;
-
-    @Schema(description = "缩略图/预览图 (虚拟字段)")
-    private String thumbnail;
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeBaseDTO.java

@@ -26,30 +26,9 @@ public class KnowledgeBaseDTO implements Serializable {
     @Schema(description = "知识库名称")
     private String name;
 
-    @Schema(description = "知识库头像(Base64)")
-    private String avatar;
-
     @Schema(description = "知识库描述")
     private String description;
 
-    @Schema(description = "嵌入模型名称")
-    private String embeddingModel;
-
-    @Schema(description = "权限设置: me/team")
-    private String permission;
-
-    @Schema(description = "分块方法")
-    private String chunkMethod;
-
-    @Schema(description = "解析器配置(JSON String)")
-    private String parserConfig;
-
-    @Schema(description = "分块总数")
-    private Long chunkCount;
-
-    @Schema(description = "总Token数")
-    private Long tokenNum;
-
     @Schema(description = "状态(0:禁用 1:启用)")
     private Integer status;
 

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeFilesDTO.java

@@ -6,12 +6,10 @@ import java.util.Date;
 import java.util.Map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 @Data
 @Schema(description = "知识库文档")
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class KnowledgeFilesDTO implements Serializable {
 
     @Serial
@@ -37,19 +35,7 @@ public class KnowledgeFilesDTO implements Serializable {
     @Schema(description = "文件路径")
     private String filePath;
 
-    @Schema(description = "解析进度 (0.0 ~ 1.0)")
-    private Double progress;
-
-    @Schema(description = "缩略图 (Base64 或 URL)")
-    private String thumbnail;
-
-    @Schema(description = "解析耗时 (单位: 秒)")
-    private Double processDuration;
-
-    @Schema(description = "来源类型 (local, s3, url 等)")
-    private String sourceType;
-
-    @Schema(description = "元数据字段 (Map 格式)")
+    @Schema(description = "元数据字段")
     private Map<String, Object> metaFields;
 
     @Schema(description = "分块方法")
@@ -58,10 +44,10 @@ public class KnowledgeFilesDTO implements Serializable {
     @Schema(description = "解析器配置")
     private Map<String, Object> parserConfig;
 
-    @Schema(description = "可用状态 (1: 启用/正常, 0: 禁用/失效)")
-    private String status;
+    @Schema(description = "状态")
+    private Integer status;
 
-    @Schema(description = "运行状态 (UNSTART/RUNNING/CANCEL/DONE/FAIL)")
+    @Schema(description = "文档解析状态")
     private String run;
 
     @Schema(description = "创建者")
@@ -76,15 +62,6 @@ public class KnowledgeFilesDTO implements Serializable {
     @Schema(description = "更新时间")
     private Date updatedAt;
 
-    @Schema(description = "分块数量")
-    private Integer chunkCount;
-
-    @Schema(description = "Token数量")
-    private Long tokenCount;
-
-    @Schema(description = "解析错误信息")
-    private String error;
-
     // 文档解析状态常量定义
     private static final Integer STATUS_UNSTART = 0;
     private static final Integer STATUS_RUNNING = 1;

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/agent/AgentDTO.java

@@ -1,421 +0,0 @@
-package xiaozhi.modules.knowledge.dto.agent;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.*;
-
-@Schema(description = "智能体 (Agent) 管理聚合 DTO")
-public class AgentDTO {
-
-    // ========== 1. Agent 管理 (CRUD) - 对应 RAGFlow_Agent接口详解 ==========
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Agent 创建请求")
-    public static class CreateReq implements Serializable {
-        @Schema(description = "Agent 标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "My Agent")
-        @NotBlank(message = "Agent 标题不能为空")
-        @JsonProperty("title")
-        private String title;
-
-        @Schema(description = "DSL 定义 (画布 JSON)", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotNull(message = "DSL 定义不能为空")
-        @JsonProperty("dsl")
-        private Map<String, Object> dsl;
-
-        @Schema(description = "描述", example = "这是一个测试 Agent")
-        @JsonProperty("description")
-        private String description;
-
-        @Schema(description = "头像 URL", example = "http://example.com/avatar.png")
-        @JsonProperty("avatar")
-        private String avatar;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Agent 更新请求")
-    public static class UpdateReq implements Serializable {
-        @Schema(description = "Agent 标题", example = "Updated Agent")
-        @JsonProperty("title")
-        private String title;
-
-        @Schema(description = "DSL 定义 (画布 JSON)")
-        @JsonProperty("dsl")
-        private Map<String, Object> dsl;
-
-        @Schema(description = "描述")
-        @JsonProperty("description")
-        private String description;
-
-        @Schema(description = "头像 URL")
-        @JsonProperty("avatar")
-        private String avatar;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Agent 列表请求")
-    public static class ListReq implements Serializable {
-        @Schema(description = "页码", defaultValue = "1")
-        @JsonProperty("page")
-        @Builder.Default
-        private Integer page = 1;
-
-        @Schema(description = "每页大小", defaultValue = "10")
-        @JsonProperty("page_size")
-        @Builder.Default
-        private Integer pageSize = 10;
-
-        @Schema(description = "排序字段", defaultValue = "update_time")
-        @JsonProperty("orderby")
-        @Builder.Default
-        private String orderby = "update_time";
-
-        @Schema(description = "是否降序", defaultValue = "true")
-        @JsonProperty("desc")
-        @Builder.Default
-        private Boolean desc = true;
-
-        @Schema(description = "Agent ID 过滤")
-        @JsonProperty("id")
-        private String id;
-
-        @Schema(description = "标题模糊搜索")
-        @JsonProperty("title")
-        private String title;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Agent 响应对象")
-    public static class AgentVO implements Serializable {
-        @Schema(description = "Agent ID")
-        @JsonProperty("id")
-        private String id;
-
-        @Schema(description = "标题")
-        @JsonProperty("title")
-        private String title;
-
-        @Schema(description = "描述")
-        @JsonProperty("description")
-        private String description;
-
-        @Schema(description = "头像")
-        @JsonProperty("avatar")
-        private String avatar;
-
-        @Schema(description = "DSL 定义")
-        @JsonProperty("dsl")
-        private Map<String, Object> dsl;
-
-        @Schema(description = "创建者 ID")
-        @JsonProperty("user_id")
-        private String userId;
-
-        @Schema(description = "画布分类")
-        @JsonProperty("canvas_category")
-        private String canvasCategory;
-
-        @Schema(description = "创建时间 (时间戳)")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "更新时间 (时间戳)")
-        @JsonProperty("update_time")
-        private Long updateTime;
-    }
-
-    // ========== 2. Webhook 调试与追踪 - 对应 RAGFlow_Agent接口详解 ==========
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Webhook 触发请求 (参数动态)")
-    public static class WebhookTriggerReq implements Serializable {
-        @Schema(description = "输入变量", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotNull(message = "输入变量不能为空")
-        @JsonProperty("inputs")
-        private Map<String, Object> inputs;
-
-        @Schema(description = "查询词", example = "Hello")
-        @JsonProperty("query")
-        private String query;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Webhook 追踪请求")
-    public static class WebhookTraceReq implements Serializable {
-        @Schema(description = "时间戳游标", example = "1700000000.0")
-        @JsonProperty("since_ts")
-        private Double sinceTs;
-
-        @Schema(description = "Webhook ID")
-        @JsonProperty("webhook_id")
-        private String webhookId;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Webhook 追踪响应")
-    public static class WebhookTraceVO implements Serializable {
-        @Schema(description = "Webhook ID")
-        @JsonProperty("webhook_id")
-        private String webhookId;
-
-        @Schema(description = "是否结束")
-        @JsonProperty("finished")
-        private Boolean finished;
-
-        @Schema(description = "下一次查询的时间戳游标")
-        @JsonProperty("next_since_ts")
-        private Double nextSinceTs;
-
-        @Schema(description = "事件列表")
-        @JsonProperty("events")
-        private List<TraceEvent> events;
-
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "追踪事件项")
-        public static class TraceEvent implements Serializable {
-            @Schema(description = "时间戳")
-            @JsonProperty("ts")
-            private Double ts;
-
-            @Schema(description = "事件类型")
-            @JsonProperty("event")
-            private String event;
-
-            @Schema(description = "事件数据")
-            @JsonProperty("data")
-            private Object data;
-        }
-    }
-
-    // ========== 3. Agent 会话 (Session) - 对应 RAGFlow_Agent_Dify接口详解 ==========
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Session 创建请求")
-    public static class SessionCreateReq implements Serializable {
-        @Schema(description = "用户 ID")
-        @JsonProperty("user_id")
-        private String userId;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Session 列表请求")
-    public static class SessionListReq implements Serializable {
-        @Schema(description = "页码", defaultValue = "1")
-        @JsonProperty("page")
-        @Builder.Default
-        private Integer page = 1;
-
-        @Schema(description = "每页大小", defaultValue = "10")
-        @JsonProperty("page_size")
-        @Builder.Default
-        private Integer pageSize = 10;
-
-        @Schema(description = "排序字段", defaultValue = "create_time")
-        @JsonProperty("orderby")
-        @Builder.Default
-        private String orderby = "create_time";
-
-        @Schema(description = "是否降序", defaultValue = "true")
-        @JsonProperty("desc")
-        @Builder.Default
-        private Boolean desc = true;
-
-        @Schema(description = "Session ID")
-        @JsonProperty("id")
-        private String id;
-
-        @Schema(description = "用户 ID")
-        @JsonProperty("user_id")
-        private String userId;
-
-        @Schema(description = "是否返回 DSL")
-        @JsonProperty("dsl")
-        @Builder.Default
-        private Boolean dsl = false;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Session 批量删除请求")
-    public static class SessionBatchDeleteReq implements Serializable {
-        @Schema(description = "会话 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("ids")
-        @NotEmpty(message = "ID列表不能为空")
-        private List<String> ids;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Session 响应对象")
-    public static class SessionVO implements Serializable {
-        @Schema(description = "Session ID")
-        @JsonProperty("id")
-        private String id;
-
-        @Schema(description = "Agent ID")
-        @JsonProperty("agent_id")
-        private String agentId;
-
-        @Schema(description = "用户 ID")
-        @JsonProperty("user_id")
-        private String userId;
-
-        @Schema(description = "来源")
-        @JsonProperty("source")
-        private String source;
-
-        @Schema(description = "DSL 定义")
-        @JsonProperty("dsl")
-        private Map<String, Object> dsl;
-
-        @Schema(description = "消息列表")
-        @JsonProperty("messages")
-        private List<Map<String, Object>> messages;
-    }
-
-    // ========== 4. Agent 对话 (Completion) - 对应 RAGFlow_Agent_Dify接口详解 ==========
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Completion 对话请求")
-    public static class CompletionReq implements Serializable {
-        @Schema(description = "会话 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "会话 ID 不能为空")
-        @JsonProperty("session_id")
-        private String sessionId;
-
-        @Schema(description = "用户问题")
-        @JsonProperty("question")
-        private String question;
-
-        @Schema(description = "是否流式返回", defaultValue = "true")
-        @JsonProperty("stream")
-        @Builder.Default
-        private Boolean stream = true;
-
-        @Schema(description = "是否返回追踪信息", defaultValue = "false")
-        @JsonProperty("return_trace")
-        @Builder.Default
-        private Boolean returnTrace = false;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Completion 对话响应")
-    public static class CompletionVO implements Serializable {
-        @Schema(description = "会话 ID")
-        @JsonProperty("id")
-        private String id;
-
-        @Schema(description = "回复内容")
-        @JsonProperty("content")
-        private String content;
-
-        @Schema(description = "引用来源")
-        @JsonProperty("reference")
-        private Map<String, Object> reference;
-
-        @Schema(description = "追踪信息")
-        @JsonProperty("trace")
-        private List<Object> trace;
-    }
-
-    // ========== 5. Dify 兼容检索 - 对应 RAGFlow_Agent_Dify接口详解 ==========
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Dify 兼容检索请求")
-    public static class DifyRetrievalReq implements Serializable {
-        @Schema(description = "知识库 ID")
-        @JsonProperty("knowledge_id")
-        private String knowledgeId;
-
-        @Schema(description = "查询词")
-        @JsonProperty("query")
-        private String query;
-
-        @Schema(description = "检索设置")
-        @JsonProperty("retrieval_setting")
-        private Map<String, Object> retrievalSetting;
-
-        @Schema(description = "元数据过滤条件")
-        @JsonProperty("metadata_condition")
-        private Map<String, Object> metadataCondition;
-
-        @Schema(description = "是否使用知识图谱")
-        @JsonProperty("use_kg")
-        private Boolean useKg;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "Dify 兼容检索响应")
-    public static class DifyRetrievalVO implements Serializable {
-        @Schema(description = "检索结果列表")
-        @JsonProperty("records")
-        private List<Record> records;
-
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "检索记录")
-        public static class Record implements Serializable {
-            @Schema(description = "内容")
-            @JsonProperty("content")
-            private String content;
-
-            @Schema(description = "相似度分数")
-            @JsonProperty("score")
-            private Double score;
-
-            @Schema(description = "标题")
-            @JsonProperty("title")
-            private String title;
-
-            @Schema(description = "元数据")
-            @JsonProperty("metadata")
-            private Map<String, Object> metadata;
-        }
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/bot/BotDTO.java

@@ -1,126 +0,0 @@
-package xiaozhi.modules.knowledge.dto.bot;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.*;
-
-@Schema(description = "外部机器人 (Bot) 聚合 DTO")
-public class BotDTO {
-
-    // ========== 1. SearchBot (检索机器人) ==========
-
-    // 对应 /api/v1/searchbots/ask
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "SearchBot 提问请求")
-    public static class SearchAskReq implements Serializable {
-        @Schema(description = "用户问题", requiredMode = Schema.RequiredMode.REQUIRED, example = "What is RAG?")
-        @NotBlank(message = "问题不能为空")
-        @JsonProperty("question")
-        private String question;
-
-        @Schema(description = "是否返回引用", defaultValue = "false")
-        @JsonProperty("quote")
-        @Builder.Default
-        private Boolean quote = false;
-
-        @Schema(description = "是否流式返回", defaultValue = "true")
-        @JsonProperty("stream")
-        @Builder.Default
-        private Boolean stream = true;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "SearchBot 提问响应")
-    public static class SearchAskVO implements Serializable {
-        @Schema(description = "回答内容")
-        @JsonProperty("answer")
-        private String answer;
-
-        @Schema(description = "引用来源 (Value 结构通常对应 RetrievalDTO.HitVO)")
-        @JsonProperty("reference")
-        private Map<String, Object> reference;
-    }
-
-    // 对应 /api/v1/searchbots/related_questions
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "相关问题请求")
-    public static class RelatedQuestionReq implements Serializable {
-        @Schema(description = "用户问题", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "问题不能为空")
-        @JsonProperty("question")
-        private String question;
-    }
-
-    // 对应 /api/v1/searchbots/mindmap
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "思维导图请求")
-    public static class MindMapReq implements Serializable {
-        @Schema(description = "用户问题", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "问题不能为空")
-        @JsonProperty("question")
-        private String question;
-    }
-
-    // ========== 2. AgentBot (嵌入式 Agent) ==========
-
-    // 对应 /api/v1/agentbots/{id}/inputs
-    @Data
-    @Builder
-    @AllArgsConstructor
-    @Schema(description = "AgentBot 输入参数请求")
-    public static class AgentInputsReq implements Serializable {
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "AgentBot 输入参数定义响应")
-    public static class AgentInputsVO implements Serializable {
-        @Schema(description = "表单变量定义列表")
-        @JsonProperty("variables")
-        private List<Map<String, Object>> variables;
-    }
-
-    // 对应 /api/v1/agentbots/{id}/completions
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "AgentBot 对话请求")
-    public static class AgentCompletionReq implements Serializable {
-        @Schema(description = "输入参数值")
-        @JsonProperty("inputs")
-        private Map<String, Object> inputs;
-
-        @Schema(description = "用户查询", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "查询内容不能为空")
-        @JsonProperty("question")
-        private String question;
-
-        @Schema(description = "是否流式返回", defaultValue = "true")
-        @JsonProperty("stream")
-        @Builder.Default
-        private Boolean stream = true;
-
-        @Schema(description = "会话 ID")
-        @JsonProperty("session_id")
-        private String sessionId;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/chat/ChatCompletionRequest.java

@@ -1,50 +0,0 @@
-package xiaozhi.modules.knowledge.dto.chat;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 聊天对话请求 DTO (OpenAI 兼容格式)
- */
-@Data
-@Schema(description = "聊天对话请求")
-public class ChatCompletionRequest implements Serializable {
-
-    @Schema(description = "模型标识 (对应 agent_id 或 bot_id)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @JsonProperty("model")
-    private String model;
-
-    @Schema(description = "对话消息列表", requiredMode = Schema.RequiredMode.REQUIRED)
-    @JsonProperty("messages")
-    private List<Message> messages;
-
-    @Schema(description = "是否流式返回", defaultValue = "false")
-    @JsonProperty("stream")
-    private Boolean stream = false;
-
-    @Schema(description = "温度系数 (0-1)", defaultValue = "0.7")
-    @JsonProperty("temperature")
-    private Double temperature;
-
-    @Schema(description = "Session ID (可选，用于延续会话)")
-    @JsonProperty("session_id")
-    private String sessionId;
-
-    @Schema(description = "其他RAGFlow特定参数 (可选)")
-    private Map<String, Object> extra;
-
-    @Data
-    public static class Message implements Serializable {
-        @Schema(description = "角色 (system, user, assistant)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String role;
-
-        @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String content;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/chat/ChatDTO.java

@@ -1,523 +0,0 @@
-package xiaozhi.modules.knowledge.dto.chat;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.*;
-
-/**
- * 对话管理聚合 DTO
- * <p>
- * 容器类，内含对话助手、会话和消息的所有请求/响应对象。
- * </p>
- */
-@Schema(description = "对话管理聚合 DTO")
-public class ChatDTO {
-
-    // ========== 1. 对话助手 (Assistant/Bot) 相关 ==========
-
-    /**
-     * 提示词配置
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "提示词配置")
-    public static class PromptConfig implements Serializable {
-
-        @Schema(description = "系统提示词", example = "你是一个专业的客服助手...")
-        @JsonProperty("prompt")
-        private String systemPrompt;
-
-        @Schema(description = "开场白", example = "您好，我是您的智能助手，请问有什么可以帮您？")
-        private String opener;
-
-        @Schema(description = "空结果回复", example = "抱歉，我没有找到相关信息。")
-        @JsonProperty("empty_response")
-        private String emptyResponse;
-
-        @Schema(description = "是否展示引用", example = "true")
-        @JsonProperty("show_quote")
-        private Boolean quote;
-
-        @Schema(description = "是否启用 TTS", example = "false")
-        private Boolean tts;
-
-        @Schema(description = "相似度阈值 (0.0 - 1.0)", example = "0.2")
-        @JsonProperty("similarity_threshold")
-        private Float similarityThreshold;
-
-        @Schema(description = "关键词相似度权重 (0.0 - 1.0)", example = "0.7")
-        @JsonProperty("keywords_similarity_weight")
-        private Float vectorSimilarityWeight;
-
-        @Schema(description = "检索 Top N", example = "6")
-        @JsonProperty("top_n")
-        private Integer topK;
-
-        @Schema(description = "Rerank 模型", example = "rerank_model_001")
-        @JsonProperty("rerank_model")
-        private String rerankId;
-
-        @Schema(description = "是否启用多轮对话优化", example = "false")
-        @JsonProperty("refine_multiturn")
-        private Boolean refineMultigraph;
-
-        @Schema(description = "变量列表")
-        private List<Map<String, Object>> variables;
-    }
-
-    /**
-     * LLM 配置
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "LLM 模型配置")
-    public static class LLMConfig implements Serializable {
-
-        @NotBlank(message = "模型名称不能为空")
-        @Schema(description = "模型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "gpt-4")
-        @JsonProperty("model_name")
-        private String modelName;
-
-        @Schema(description = "温度参数 (0.0 - 2.0)", example = "0.7")
-        private Float temperature;
-
-        @Schema(description = "Top P 采样", example = "0.9")
-        @JsonProperty("top_p")
-        private Float topP;
-
-        @Schema(description = "最大 Token 数", example = "4096")
-        @JsonProperty("max_tokens")
-        private Integer maxTokens;
-
-        @Schema(description = "存在惩罚", example = "0.0")
-        @JsonProperty("presence_penalty")
-        private Float presencePenalty;
-
-        @Schema(description = "频率惩罚", example = "0.0")
-        @JsonProperty("frequency_penalty")
-        private Float frequencyPenalty;
-    }
-
-    /**
-     * 创建助手请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "创建助手请求")
-    public static class AssistantCreateReq implements Serializable {
-
-        @NotBlank(message = "助手名称不能为空")
-        @Schema(description = "助手名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "智能客服助手")
-        private String name;
-
-        @Schema(description = "助手头像 (Base64 编码)", example = "")
-        private String avatar;
-
-        @Schema(description = "关联的知识库 ID 列表", example = "[\"kb_001\", \"kb_002\"]")
-        @JsonProperty("dataset_ids")
-        private List<String> datasetIds;
-
-        @Schema(description = "助手描述", example = "这是一个智能客服助手")
-        private String description;
-
-        @Schema(description = "LLM 模型配置")
-        @JsonProperty("llm")
-        private LLMConfig llm;
-
-        @Schema(description = "提示词配置")
-        @JsonProperty("prompt")
-        private PromptConfig promptConfig;
-    }
-
-    /**
-     * 更新助手请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "更新助手请求")
-    public static class AssistantUpdateReq implements Serializable {
-
-        @Schema(description = "助手名称", example = "智能客服助手 V2")
-        private String name;
-
-        @Schema(description = "助手头像 (Base64 编码)", example = "")
-        private String avatar;
-
-        @Schema(description = "关联的知识库 ID 列表", example = "[\"kb_001\", \"kb_002\"]")
-        @JsonProperty("dataset_ids")
-        private List<String> datasetIds;
-
-        @Schema(description = "助手描述", example = "这是一个智能客服助手")
-        private String description;
-
-        @Schema(description = "LLM 模型配置")
-        @JsonProperty("llm")
-        private LLMConfig llm;
-
-        @Schema(description = "提示词配置")
-        @JsonProperty("prompt")
-        private PromptConfig promptConfig;
-    }
-
-    /**
-     * 查询助手列表请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "查询助手列表请求")
-    public static class AssistantListReq implements Serializable {
-
-        @Schema(description = "页码 (从 1 开始)", example = "1")
-        private Integer page;
-
-        @Schema(description = "每页数量", example = "30")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "按名称过滤 (模糊匹配)", example = "客服")
-        private String name;
-
-        @Schema(description = "排序字段: create_time / update_time", example = "create_time")
-        private String orderby;
-
-        @Schema(description = "是否降序", example = "true")
-        private Boolean desc;
-
-        @Schema(description = "按 ID 精确筛选", example = "assistant_001")
-        private String id;
-    }
-
-    /**
-     * 助手详情 VO
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "助手详情 VO")
-    public static class AssistantVO implements Serializable {
-
-        @Schema(description = "助手 ID", example = "assistant_001")
-        private String id;
-
-        @Schema(description = "租户 ID", example = "tenant_001")
-        @JsonProperty("tenant_id")
-        private String tenantId;
-
-        @Schema(description = "助手名称", example = "智能客服助手")
-        private String name;
-
-        @Schema(description = "助手头像", example = "")
-        private String avatar;
-
-        @Schema(description = "关联的知识库 ID 列表")
-        @JsonProperty("dataset_ids")
-        private List<String> datasetIds;
-
-        @Schema(description = "关联的知识库列表 (详情)")
-        private List<SimpleDatasetVO> datasets;
-
-        @Schema(description = "助手描述")
-        private String description;
-
-        @Schema(description = "LLM 模型配置")
-        @JsonProperty("llm")
-        private LLMConfig llm;
-
-        @Schema(description = "提示词配置")
-        @JsonProperty("prompt")
-        private PromptConfig promptConfig;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-    }
-
-    /**
-     * 删除助手请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "删除助手请求")
-    public static class AssistantDeleteReq implements Serializable {
-
-        @Schema(description = "要删除的助手 ID 列表", example = "[\"assistant_001\", \"assistant_002\"]")
-        private List<String> ids;
-    }
-
-    // ========== 2. 会话 (Session) 相关 ==========
-
-    /**
-     * 创建会话请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "创建会话请求")
-    public static class SessionCreateReq implements Serializable {
-
-        @Schema(description = "会话名称", example = "技术咨询会话")
-        private String name;
-
-        @Schema(description = "用户 ID", example = "user_001")
-        @JsonProperty("user_id")
-        private String userId;
-    }
-
-    /**
-     * 更新会话请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "更新会话请求")
-    public static class SessionUpdateReq implements Serializable {
-
-        @Schema(description = "会话名称", example = "技术咨询会话 - 更新")
-        private String name;
-    }
-
-    /**
-     * 查询会话列表请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "查询会话列表请求")
-    public static class SessionListReq implements Serializable {
-
-        @Schema(description = "助手 ID", example = "assistant_001")
-        @JsonProperty("assistant_id")
-        private String assistantId;
-
-        @Schema(description = "页码 (从 1 开始)", example = "1")
-        private Integer page;
-
-        @Schema(description = "每页数量", example = "30")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "按名称过滤", example = "技术")
-        private String name;
-
-        @Schema(description = "排序字段", example = "create_time")
-        private String orderby;
-
-        @Schema(description = "是否降序", example = "true")
-        private Boolean desc;
-
-        @Schema(description = "会话 ID 精确筛选", example = "session_001")
-        private String id;
-
-        @Schema(description = "用户标识筛选", example = "user_001")
-        @JsonProperty("user_id")
-        private String userId;
-    }
-
-    /**
-     * 会话详情 VO
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "会话详情 VO")
-    public static class SessionVO implements Serializable {
-
-        @Schema(description = "会话 ID", example = "session_001")
-        private String id;
-
-        @Schema(description = "助手 ID", example = "assistant_001")
-        @JsonProperty("chat_id")
-        private String chatId;
-
-        @Schema(description = "助手 ID (兼容旧版)", example = "assistant_001")
-        @JsonProperty("assistant_id")
-        private String assistantId;
-
-        @Schema(description = "会话名称", example = "技术咨询会话")
-        private String name;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-
-        @Schema(description = "创建日期", example = "2024-05-01 10:00:00")
-        @JsonProperty("create_date")
-        private String createDate;
-
-        @Schema(description = "更新日期", example = "2024-05-01 10:00:00")
-        @JsonProperty("update_date")
-        private String updateDate;
-
-        @Schema(description = "用户 ID", example = "user_001")
-        @JsonProperty("user_id")
-        private String userId;
-
-        @Schema(description = "对话历史消息列表")
-        private List<Map<String, Object>> messages;
-    }
-
-    /**
-     * 删除会话请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "删除会话请求")
-    public static class SessionDeleteReq implements Serializable {
-
-        @Schema(description = "要删除的会话 ID 列表", example = "[\"session_001\", \"session_002\"]")
-        private List<String> ids;
-    }
-
-    // ========== 3. 消息/对话 (Completion) 相关 ==========
-
-    /**
-     * 发送消息请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "发送消息请求")
-    public static class CompletionReq implements Serializable {
-
-        @NotBlank(message = "问题内容不能为空")
-        @Schema(description = "用户问题", requiredMode = Schema.RequiredMode.REQUIRED, example = "请介绍一下你们的产品")
-        private String question;
-
-        @Schema(description = "是否使用流式响应 (SSE)", example = "true")
-        @Builder.Default
-        private Boolean stream = true;
-
-        @NotBlank(message = "会话 ID 不能为空")
-        @Schema(description = "会话 ID (可选，不传则创建新会话)", example = "session_001")
-        @JsonProperty("session_id")
-        private String sessionId;
-
-        @Schema(description = "是否展示引用", example = "true")
-        private Boolean quote;
-
-        @Schema(description = "指定检索的文档 ID 列表 (逗号分隔)", example = "doc_001,doc_002")
-        @JsonProperty("doc_ids")
-        private String docIds;
-
-        @Schema(description = "元数据过滤条件")
-        @JsonProperty("metadata_condition")
-        private Map<String, Object> metadataCondition;
-    }
-
-    /**
-     * 消息响应 VO
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "消息响应 VO")
-    public static class CompletionVO implements Serializable {
-
-        @Schema(description = "AI 回答内容")
-        private String answer;
-
-        @Schema(description = "引用信息")
-        private Reference reference;
-
-        @Schema(description = "会话 ID", example = "session_001")
-        @JsonProperty("session_id")
-        private String sessionId;
-
-        @Schema(description = "任务 ID (用于流式响应追踪)", example = "task_001")
-        @JsonProperty("task_id")
-        private String taskId;
-
-        /**
-         * 引用信息 (检索命中结果)
-         */
-        @Data
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Builder
-        @Schema(description = "引用信息")
-        public static class Reference implements Serializable {
-
-            @Schema(description = "命中的文档块列表")
-            private List<xiaozhi.modules.knowledge.dto.document.RetrievalDTO.HitVO> chunks;
-
-            @Schema(description = "文档聚合信息")
-            @JsonProperty("doc_aggs")
-            private List<DocAgg> docAggs;
-        }
-
-        /**
-         * 文档聚合信息
-         */
-        @Data
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Builder
-        @Schema(description = "文档聚合信息")
-        public static class DocAgg implements Serializable {
-
-            @Schema(description = "文档 ID", example = "doc_001")
-            @JsonProperty("doc_id")
-            private String docId;
-
-            @Schema(description = "文档名称", example = "产品手册.pdf")
-            @JsonProperty("doc_name")
-            private String docName;
-
-            @Schema(description = "命中次数", example = "3")
-            private Integer count;
-        }
-    }
-
-    /**
-     * 简易知识库 VO (用于 Assistant 列表)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "简易知识库 VO")
-    public static class SimpleDatasetVO implements Serializable {
-        @Schema(description = "知识库 ID")
-        private String id;
-        @Schema(description = "知识库名称")
-        private String name;
-        @Schema(description = "头像")
-        private String avatar;
-        @Schema(description = "分块数量")
-        @JsonProperty("chunk_num")
-        private Integer chunkNum;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/common/CommonDTO.java

@@ -1,79 +0,0 @@
-package xiaozhi.modules.knowledge.dto.common;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.*;
-
-@Schema(description = "通用扩展功能 DTO")
-public class CommonDTO {
-
-    // ========== 1. 引用详情 (detail_share_embedded) ==========
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "引用详情请求")
-    public static class ReferenceDetailReq implements Serializable {
-        @Schema(description = "切片 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "切片 ID 不能为空")
-        @JsonProperty("chunk_id")
-        private String chunkId;
-
-        @Schema(description = "知识库 ID")
-        @JsonProperty("knowledge_id")
-        private String knowledgeId;
-    }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "引用详情响应")
-    public static class ReferenceDetailVO implements Serializable {
-        @Schema(description = "切片 ID")
-        @JsonProperty("chunk_id")
-        private String chunkId;
-
-        @Schema(description = "完整内容")
-        @JsonProperty("content_with_weight")
-        private String contentWithWeight;
-
-        @Schema(description = "文档名称")
-        @JsonProperty("doc_name")
-        private String docName;
-
-        @Schema(description = "图片 ID 列表")
-        @JsonProperty("img_id")
-        private String imageId; // 注意：RAGFlow 有时返回 String 有时返回 List，需根据实际情况确认，暂定 String 用于 ID
-
-        @Schema(description = "文档 ID")
-        @JsonProperty("doc_id")
-        private String docId;
-    }
-
-    // ========== 2. 通用问答 (ask_about) - 调试用 ==========
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "通用问答请求 (调试用)")
-    public static class AskAboutReq implements Serializable {
-        @Schema(description = "用户问题", requiredMode = Schema.RequiredMode.REQUIRED, example = "What is this dataset about?")
-        @NotBlank(message = "问题不能为空")
-        @JsonProperty("question")
-        private String question;
-
-        @Schema(description = "数据集 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotEmpty(message = "数据集列表不能为空")
-        @JsonProperty("dataset_ids")
-        private List<String> datasetIds;
-    }
-
-    // 响应通常复用 String 或者简单的 Map 结构，视具体实现而定，暂不定义专用 VO
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/dataset/DatasetDTO.java

@@ -1,449 +0,0 @@
-package xiaozhi.modules.knowledge.dto.dataset;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import jakarta.validation.constraints.*;
-
-/**
- * 知识库管理聚合 DTO
- * <p>
- * 容器类，内含知识库模块所有请求/响应对象的静态内部类定义。
- * </p>
- */
-@Schema(description = "知识库管理聚合 DTO")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class DatasetDTO {
-
-    // ========== 通用内部类 ==========
-
-    /**
-     * 解析器配置
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "解析器配置")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ParserConfig implements Serializable {
-
-        @Schema(description = "分块 token 数量", example = "128")
-        @JsonProperty("chunk_token_num")
-        private Integer chunkTokenNum;
-
-        @Schema(description = "分隔符", example = "\\n!?;。；！？")
-        private String delimiter;
-
-        @Schema(description = "布局识别模型: DeepDOC / Simple", example = "DeepDOC")
-        @JsonProperty("layout_recognize")
-        private String layoutRecognize;
-
-        @Schema(description = "是否将 Excel 转为 HTML", example = "false")
-        private Boolean html4excel;
-
-        @Schema(description = "自动生成关键词数量 (0 表示关闭)", example = "0")
-        @JsonProperty("auto_keywords")
-        private Integer autoKeywords;
-
-        @Schema(description = "自动生成问题数量 (0 表示关闭)", example = "0")
-        @JsonProperty("auto_questions")
-        private Integer autoQuestions;
-    }
-
-    // ========== 请求类 ==========
-
-    /**
-     * 创建知识库请求 (映射接口 1: create)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "创建知识库请求")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class CreateReq implements Serializable {
-
-        @NotBlank(message = "知识库名称不能为空")
-        @Schema(description = "知识库名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "my_dataset")
-        private String name;
-
-        @Schema(description = "知识库头像 (Base64 编码)", example = "")
-        private String avatar;
-
-        @Schema(description = "知识库描述", example = "用于存储产品文档")
-        private String description;
-
-        @Schema(description = "嵌入模型名称", example = "BAAI/bge-large-zh-v1.5")
-        @JsonProperty("embedding_model")
-        private String embeddingModel;
-
-        @Schema(description = "权限设置: me / team", example = "me")
-        private String permission;
-
-        @Schema(description = "分块方法: naive / manual / qa / table / paper / book / laws / presentation / picture / one / knowledge_graph / email", example = "naive")
-        @JsonProperty("chunk_method")
-        private String chunkMethod;
-
-        @Schema(description = "解析器配置")
-        @JsonProperty("parser_config")
-        private ParserConfig parserConfig;
-    }
-
-    /**
-     * 更新知识库请求 (映射接口 4: update)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "更新知识库请求")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class UpdateReq implements Serializable {
-
-        @Schema(description = "知识库名称", example = "updated_dataset")
-        private String name;
-
-        @Schema(description = "知识库头像 (Base64 编码)", example = "")
-        private String avatar;
-
-        @Schema(description = "知识库描述", example = "更新后的描述")
-        private String description;
-
-        @Schema(description = "权限设置: me / team", example = "team")
-        private String permission;
-
-        @Schema(description = "嵌入模型名称", example = "BAAI/bge-large-zh-v1.5")
-        @JsonProperty("embedding_model")
-        private String embeddingModel;
-
-        @Schema(description = "分块方法: naive / manual / qa / table / paper / book / laws / presentation / picture / one / knowledge_graph / email", example = "naive")
-        @JsonProperty("chunk_method")
-        private String chunkMethod;
-
-        @Schema(description = "解析器配置")
-        @JsonProperty("parser_config")
-        private ParserConfig parserConfig;
-
-        @JsonInclude(JsonInclude.Include.NON_NULL)
-        @Schema(description = "PageRank 权重 (0-100)", example = "50")
-        private Integer pagerank;
-    }
-
-    /**
-     * 查询知识库列表请求 (映射接口 3: list_datasets)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "查询知识库列表请求")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ListReq implements Serializable {
-
-        @Schema(description = "页码 (从 1 开始)", example = "1")
-        private Integer page;
-
-        @Schema(description = "每页数量", example = "30")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "排序字段: create_time / update_time", example = "create_time")
-        private String orderby;
-
-        @Schema(description = "是否降序", example = "true")
-        private Boolean desc;
-
-        @Schema(description = "按名称过滤 (模糊匹配)", example = "my_dataset")
-        private String name;
-
-        @Schema(description = "按知识库 ID 过滤", example = "abc123")
-        private String id;
-    }
-
-    /**
-     * 批量删除知识库请求 (映射接口 2: delete)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "批量删除知识库请求")
-    public static class BatchIdReq implements Serializable {
-
-        @NotNull(message = "知识库 ID 列表不能为空")
-        @Size(min = 1, message = "至少需要一个知识库 ID")
-        @Schema(description = "知识库 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"id1\", \"id2\"]")
-        private List<String> ids;
-    }
-
-    /**
-     * 运行 GraphRAG 请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "运行 GraphRAG 请求")
-    public static class RunGraphRagReq implements Serializable {
-
-        @Schema(description = "实体类型列表", example = "[\"person\", \"organization\"]")
-        @JsonProperty("entity_types")
-        private List<String> entityTypes;
-
-        @Schema(description = "构建方法: light / fast / full", example = "light")
-        private String method;
-    }
-
-    /**
-     * 运行 RAPTOR 请求
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "运行 RAPTOR 请求")
-    public static class RunRaptorReq implements Serializable {
-
-        @Schema(description = "最大聚类数", example = "64")
-        @JsonProperty("max_cluster")
-        private Integer maxCluster;
-
-        @Schema(description = "自定义提示词", example = "请总结以下内容...")
-        private String prompt;
-    }
-
-    /**
-     * 异步任务 ID 响应 VO (映射接口 7/8: run_graphrag/run_raptor)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "异步任务 ID 响应")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class TaskIdVO implements Serializable {
-
-        @Schema(description = "GraphRAG 任务 ID", example = "task_uuid_12345678")
-        @JsonProperty("graphrag_task_id")
-        private String graphragTaskId;
-
-        @Schema(description = "RAPTOR 任务 ID", example = "task_uuid_87654321")
-        @JsonProperty("raptor_task_id")
-        private String raptorTaskId;
-    }
-
-    // ========== 响应类 ==========
-
-    /**
-     * 知识库详情 VO (映射接口 1/3 的返回数据项)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "知识库详情 VO")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class InfoVO implements Serializable {
-
-        @Schema(description = "知识库 ID", example = "abc123")
-        private String id;
-
-        @Schema(description = "知识库名称", example = "my_dataset")
-        private String name;
-
-        @Schema(description = "知识库头像 (Base64 编码)", example = "")
-        private String avatar;
-
-        @Schema(description = "租户 ID", example = "tenant_001")
-        @JsonProperty("tenant_id")
-        private String tenantId;
-
-        @Schema(description = "知识库描述", example = "用于存储产品文档")
-        private String description;
-
-        @Schema(description = "嵌入模型名称", example = "BAAI/bge-large-zh-v1.5")
-        @JsonProperty("embedding_model")
-        private String embeddingModel;
-
-        @Schema(description = "权限设置: me / team", example = "me")
-        private String permission;
-
-        @Schema(description = "分块方法", example = "naive")
-        @JsonProperty("chunk_method")
-        private String chunkMethod;
-
-        @Schema(description = "解析器配置")
-        @JsonProperty("parser_config")
-        private ParserConfig parserConfig;
-
-        @Schema(description = "分块总数", example = "1024")
-        @JsonProperty("chunk_count")
-        private Long chunkCount;
-
-        @Schema(description = "文档总数", example = "50")
-        @JsonProperty("document_count")
-        private Long documentCount;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-
-        @Schema(description = "总 Token 数", example = "102400")
-        @JsonProperty("token_num")
-        private Long tokenNum;
-
-        @Schema(description = "创建日期 (格式: yyyy-MM-dd HH:mm:ss)")
-        @JsonProperty("create_date")
-        private String createDate;
-
-        @Schema(description = "最后更新日期 (格式: yyyy-MM-dd HH:mm:ss)")
-        @JsonProperty("update_date")
-        private String updateDate;
-    }
-
-    /**
-     * 批量操作响应 VO
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "批量操作响应 VO")
-    public static class BatchOperationVO implements Serializable {
-
-        @Schema(description = "成功操作数量", example = "5")
-        @JsonProperty("success_count")
-        private Integer successCount;
-
-        @Schema(description = "错误列表")
-        private List<Object> errors;
-    }
-
-    // ========== 知识图谱相关 ==========
-
-    /**
-     * 知识图谱数据 VO (映射接口 5: knowledge_graph)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "知识图谱数据 VO")
-    public static class GraphVO implements Serializable {
-
-        @Schema(description = "图谱节点列表")
-        private List<Node> nodes;
-
-        @Schema(description = "图谱边列表")
-        private List<Edge> edges;
-
-        @Schema(description = "思维导图数据")
-        @JsonProperty("mind_map")
-        private Map<String, Object> mindMap;
-
-        /**
-         * 图谱节点
-         */
-        @Data
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Builder
-        @Schema(description = "图谱节点")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class Node implements Serializable {
-
-            @Schema(description = "节点 ID", example = "node_001")
-            private String id;
-
-            @Schema(description = "节点标签", example = "产品")
-            private String label;
-
-            @Schema(description = "PageRank 值", example = "0.85")
-            private Double pagerank;
-
-            @Schema(description = "节点颜色", example = "#FF5733")
-            private String color;
-
-            @Schema(description = "节点图片 URL", example = "https://example.com/icon.png")
-            private String img;
-        }
-
-        /**
-         * 图谱边
-         */
-        @Data
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Builder
-        @Schema(description = "图谱边")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class Edge implements Serializable {
-
-            @Schema(description = "源节点 ID", example = "node_001")
-            private String source;
-
-            @Schema(description = "目标节点 ID", example = "node_002")
-            private String target;
-
-            @Schema(description = "边权重", example = "0.75")
-            private Double weight;
-
-            @Schema(description = "边标签 (关系描述)", example = "属于")
-            private String label;
-        }
-    }
-
-    // ========== 异步任务追踪 (GraphRAG/RAPTOR) ==========
-
-    /**
-     * 异步任务追踪 VO (映射接口 9/10: 任务进度返回)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "异步任务追踪 VO")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class TaskTraceVO implements Serializable {
-
-        @Schema(description = "任务 ID", example = "task_001")
-        private String id;
-
-        @Schema(description = "文档 ID", example = "doc_001")
-        @JsonProperty("doc_id")
-        private String docId;
-
-        @Schema(description = "起始页码", example = "1")
-        @JsonProperty("from_page")
-        private Integer fromPage;
-
-        @Schema(description = "结束页码", example = "10")
-        @JsonProperty("to_page")
-        private Integer toPage;
-
-        @Schema(description = "进度百分比 (0.0 - 1.0)", example = "0.75")
-        private Double progress;
-
-        @Schema(description = "进度消息", example = "正在处理第 5 页...")
-        @JsonProperty("progress_msg")
-        private String progressMsg;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/document/ChunkDTO.java

@@ -1,182 +0,0 @@
-package xiaozhi.modules.knowledge.dto.document;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.validation.constraints.*;
-
-/**
- * 切片管理聚合 DTO
- */
-@Schema(description = "切片管理聚合 DTO")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ChunkDTO {
-
-    /**
-     * 新增切片请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "新增切片请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class AddReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "切片内容", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "切片内容不能为空")
-        private String content;
-
-        @Schema(description = "重要关键词列表")
-        @JsonProperty("important_keywords")
-        private List<String> importantKeywords;
-
-        @Schema(description = "预设问题列表")
-        private List<String> questions;
-    }
-
-    /**
-     * 更新切片请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "更新切片请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class UpdateReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "新的切片内容")
-        private String content;
-
-        @Schema(description = "更新关键词列表 (覆盖原有列表)")
-        @JsonProperty("important_keywords")
-        private List<String> importantKeywords;
-
-        @Schema(description = "启用/禁用 (true: 启用, false: 禁用)")
-        private Boolean available;
-    }
-
-    /**
-     * 获取切片列表请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "获取切片列表请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ListReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "页码 (默认 1)")
-        private Integer page;
-
-        @Schema(description = "每页数量 (默认 30)")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "搜索关键词 (全文检索)")
-        private String keywords;
-
-        @Schema(description = "精确切片 ID")
-        private String id;
-    }
-
-    /**
-     * 批量删除切片请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "批量删除切片请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class RemoveReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "切片 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("chunk_ids")
-        @NotEmpty(message = "切片ID列表不能为空")
-        private List<String> chunkIds;
-    }
-
-    /**
-     * 文档切片信息 VO
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "文档切片信息")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class InfoVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "切片 ID (通常为 document_id + 索引)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String id;
-
-        @Schema(description = "切片文本内容 (全文检索的主要对象)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String content;
-
-        @Schema(description = "所属文档 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("document_id")
-        private String documentId;
-
-        @Schema(description = "文档名称 / 关键词")
-        @JsonProperty("docnm_kwd")
-        private String docnmKwd;
-
-        @Schema(description = "重要关键词列表 (用于关键词增强检索)")
-        @JsonProperty("important_keywords")
-        private List<String> importantKeywords;
-
-        @Schema(description = "预设问题列表 (用于 Q&A 模式增强)")
-        private List<String> questions;
-
-        @Schema(description = "关联的图片 ID")
-        @JsonProperty("image_id")
-        private String imageId;
-
-        @Schema(description = "所属知识库 ID")
-        @JsonProperty("dataset_id")
-        private String datasetId;
-
-        @Schema(description = "切片是否可用 (true: 参与检索, false: 被禁用)")
-        private Boolean available;
-
-        @Schema(description = "切片在原文中的位置索引列表 (RAGFlow返回嵌套数组, 如 [[start, end, filename]])")
-        private List<List<Object>> positions;
-
-        @Schema(description = "Token ID 列表")
-        @JsonProperty("token")
-        private List<Integer> token;
-    }
-
-    /**
-     * 分片列表聚合响应
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "分片列表聚合响应")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ListVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "切片信息列表")
-        private List<InfoVO> chunks;
-
-        @Schema(description = "关联的文档详细信息")
-        private DocumentDTO.InfoVO doc;
-
-        @Schema(description = "总记录数")
-        private Long total;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/document/DocumentDTO.java

@@ -1,407 +0,0 @@
-package xiaozhi.modules.knowledge.dto.document;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonAlias;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.validation.constraints.*;
-
-/**
- * 文档管理聚合 DTO
- */
-@Schema(description = "文档管理聚合 DTO")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class DocumentDTO {
-
-    /**
-     * 上传文档请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "上传文档请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class UploadReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "知识库 ID (必须指定归属)", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("dataset_id")
-        @NotBlank(message = "知识库ID不能为空")
-        private String datasetId;
-
-        @Schema(description = "文件名 (如果指定，则覆盖原始文件名)")
-        private String name;
-
-        @Schema(description = "分块方法")
-        @JsonProperty("chunk_method")
-        private DocumentDTO.InfoVO.ChunkMethod chunkMethod;
-
-        @Schema(description = "解析参数配置")
-        @JsonProperty("parser_config")
-        private DocumentDTO.InfoVO.ParserConfig parserConfig;
-
-        @Schema(description = "虚拟文件夹路径 (默认为 /)")
-        @JsonProperty("parent_path")
-        private String parentPath;
-
-        @Schema(description = "元数据字段")
-        @JsonProperty("meta")
-        private Map<String, Object> metaFields;
-
-        @Schema(description = "文件二进制流 (支持 PDF, DOCX, TXT, MD 等多种格式)", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotNull(message = "上传文件不能为空")
-        private org.springframework.web.multipart.MultipartFile file;
-    }
-
-    /**
-     * 更新文档请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "更新文档请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class UpdateReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "新文档名称 (必须包含文件后缀，且不能更改原始类型)")
-        private String name;
-
-        @Schema(description = "启用/禁用状态 (true: 启用, false: 禁用; 禁用后不参与检索)")
-        private Boolean enabled;
-
-        @Schema(description = "新解析方法 (修改此项会重置解析状态)")
-        @JsonProperty("chunk_method")
-        private InfoVO.ChunkMethod chunkMethod;
-
-        @Schema(description = "新解析器详细配置 (应与 chunk_method 配套使用)")
-        @JsonProperty("parser_config")
-        private InfoVO.ParserConfig parserConfig;
-    }
-
-    /**
-     * 获取文档列表请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "获取文档列表请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ListReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "页码 (默认: 1)")
-        private Integer page;
-
-        @Schema(description = "每页数量 (默认: 30)")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "排序字段 (可选: create_time, name, size; 默认: create_time)")
-        private String orderby;
-
-        @Schema(description = "是否降序排列 (true: 最新/最大在前; false: 最旧/最小在前; 默认: true)")
-        private Boolean desc;
-
-        @Schema(description = "精确筛选: 文档 ID")
-        private String id;
-
-        @Schema(description = "精确筛选: 文档完整名称 (含后缀)")
-        private String name;
-
-        @Schema(description = "模糊搜索: 文档名称关键词")
-        private String keywords;
-
-        @Schema(description = "筛选: 文件后缀列表 (如 ['pdf', 'docx'])")
-        private List<String> suffix;
-
-        @Schema(description = "筛选: 运行状态列表")
-        private List<InfoVO.RunStatus> run;
-
-        @Schema(description = "筛选: 起始创建时间 (时间戳, 毫秒)")
-        @JsonProperty("create_time_from")
-        private Long createTimeFrom;
-
-        @Schema(description = "筛选: 结束创建时间 (时间戳, 毫秒)")
-        @JsonProperty("create_time_to")
-        private Long createTimeTo;
-    }
-
-    /**
-     * 批量文档操作请求参数 (用于删除、解析等)
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "批量文档操作请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class BatchIdReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "文档 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("ids") // 为了兼容性，也可以考虑支持 document_ids，但这里统一叫 ids
-        @JsonAlias("document_ids")
-        @NotEmpty(message = "文档ID列表不能为空")
-        private List<String> ids;
-    }
-
-    /**
-     * 知识库文档信息 VO
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "知识库文档信息")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class InfoVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "文档 ID (唯一标识)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String id;
-
-        @Schema(description = "文档缩略图 URL (Base64 或 链接)")
-        private String thumbnail;
-
-        @Schema(description = "所属知识库 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("dataset_id")
-        private String datasetId;
-
-        @Schema(description = "文档解析方法 (决定了文档如何被切片)")
-        @JsonProperty("chunk_method")
-        private ChunkMethod chunkMethod;
-
-        @Schema(description = "关联的 ETL Pipeline ID (如有)")
-        @JsonProperty("pipeline_id")
-        private String pipelineId;
-
-        @Schema(description = "文档解析器的详细配置")
-        @JsonProperty("parser_config")
-        private ParserConfig parserConfig;
-
-        @Schema(description = "来源类型 (如 local, s3, url 等)")
-        @JsonProperty("source_type")
-        private String sourceType;
-
-        @Schema(description = "文档文件类型 (如 pdf, docx, txt)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String type;
-
-        @Schema(description = "创建者用户 ID")
-        @JsonProperty("created_by")
-        private String createdBy;
-
-        @Schema(description = "文档名称 (包含扩展名)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String name;
-
-        @Schema(description = "文件存储路径或位置标识")
-        private String location;
-
-        @Schema(description = "文件大小 (单位: Bytes)")
-        private Long size;
-
-        @Schema(description = "包含的 Token 总数 (解析后统计)")
-        @JsonProperty("token_count")
-        private Long tokenCount;
-
-        @Schema(description = "包含的切片 (Chunk) 总数")
-        @JsonProperty("chunk_count")
-        private Long chunkCount;
-
-        @Schema(description = "解析进度 (0.0 ~ 1.0, 1.0 表示完成)")
-        private Double progress;
-
-        @Schema(description = "当前进度描述或错误信息")
-        @JsonProperty("progress_msg")
-        private String progressMsg;
-
-        @Schema(description = "开始处理的时间戳 (RAGFlow返回RFC1123格式)")
-        @JsonProperty("process_begin_at")
-        private String processBeginAt;
-
-        @Schema(description = "处理总耗时 (单位: 秒)")
-        @JsonProperty("process_duration")
-        private Double processDuration;
-
-        @Schema(description = "自定义元数据字段 (Key-Value 键值对)")
-        @JsonProperty("meta_fields")
-        private Map<String, Object> metaFields;
-
-        @Schema(description = "文件后缀名 (不含点)")
-        private String suffix;
-
-        @Schema(description = "文档解析运行状态")
-        private RunStatus run;
-
-        @Schema(description = "文档可用状态 (1: 启用/正常, 0: 禁用/失效)", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String status;
-
-        @Schema(description = "创建时间 (时间戳, 毫秒)", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "创建日期 (RAGFlow返回RFC1123格式)")
-        @JsonProperty("create_date")
-        private String createDate;
-
-        @Schema(description = "最后更新时间 (时间戳, 毫秒)")
-        @JsonProperty("update_time")
-        private Long updateTime;
-
-        @Schema(description = "最后更新日期 (RAGFlow返回RFC1123格式)")
-        @JsonProperty("update_date")
-        private String updateDate;
-
-        /**
-         * 解析方法枚举 (ChunkMethod)
-         */
-        public enum ChunkMethod {
-            @Schema(description = "通用模式: 适用于大多数纯文本或混合文档")
-            @JsonProperty("naive")
-            NAIVE,
-            @Schema(description = "手动模式: 允许用户手动编辑切片")
-            @JsonProperty("manual")
-            MANUAL,
-            @Schema(description = "问答模式: 专门优化 Q&A 格式的文档")
-            @JsonProperty("qa")
-            QA,
-            @Schema(description = "表格模式: 专门优化 Excel 或 CSV 等表格数据")
-            @JsonProperty("table")
-            TABLE,
-            @Schema(description = "论文模式: 针对学术论文排版优化")
-            @JsonProperty("paper")
-            PAPER,
-            @Schema(description = "书籍模式: 针对书籍章节结构优化")
-            @JsonProperty("book")
-            BOOK,
-            @Schema(description = "法律法规模式: 针对法律条文结构优化")
-            @JsonProperty("laws")
-            LAWS,
-            @Schema(description = "演示文稿模式: 针对 PPT 等演示文件优化")
-            @JsonProperty("presentation")
-            PRESENTATION,
-            @Schema(description = "图片模式: 针对图片内容进行 OCR 和描述")
-            @JsonProperty("picture")
-            PICTURE,
-            @Schema(description = "整体模式: 将整个文档作为一个切片")
-            @JsonProperty("one")
-            ONE,
-            @Schema(description = "知识图谱模式: 提取实体关系构建图谱")
-            @JsonProperty("knowledge_graph")
-            KNOWLEDGE_GRAPH,
-            @Schema(description = "邮件模式: 针对邮件格式优化")
-            @JsonProperty("email")
-            EMAIL;
-        }
-
-        /**
-         * 运行状态枚举 (RunStatus)
-         */
-        public enum RunStatus {
-            @Schema(description = "未开始: 等待解析队列")
-            @JsonProperty("UNSTART")
-            UNSTART,
-            @Schema(description = "进行中: 正在解析或索引")
-            @JsonProperty("RUNNING")
-            RUNNING,
-            @Schema(description = "已取消: 用户手动取消")
-            @JsonProperty("CANCEL")
-            CANCEL,
-            @Schema(description = "已完成: 解析成功")
-            @JsonProperty("DONE")
-            DONE,
-            @Schema(description = "失败: 解析过程中出错")
-            @JsonProperty("FAIL")
-            FAIL;
-        }
-
-        /**
-         * 布局识别模型枚举
-         */
-        public enum LayoutRecognize {
-            @Schema(description = "深度文档理解模型: 适合复杂排版")
-            @JsonProperty("DeepDOC")
-            DeepDOC,
-            @Schema(description = "简单规则模型: 适合纯文本")
-            @JsonProperty("Simple")
-            Simple;
-        }
-
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "文档解析器参数配置")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class ParserConfig implements Serializable {
-            private static final long serialVersionUID = 1L;
-
-            @Schema(description = "切片最大 Token 数 (建议值: 512, 1024, 2048)")
-            @JsonProperty("chunk_token_num")
-            private Integer chunkTokenNum;
-
-            @Schema(description = "分段分隔符 (支持转义字符, 如 \\n)")
-            private String delimiter;
-
-            @Schema(description = "布局识别模型 (DeepDOC/Simple)")
-            @JsonProperty("layout_recognize")
-            private LayoutRecognize layoutRecognize;
-
-            @Schema(description = "是否将 Excel 转换为 HTML 表格")
-            @JsonProperty("html4excel")
-            private Boolean html4excel;
-
-            @Schema(description = "自动提取关键词数量 (0 表示不提取)")
-            @JsonProperty("auto_keywords")
-            private Integer autoKeywords;
-
-            @Schema(description = "自动生成问题数量 (0 表示不生成)")
-            @JsonProperty("auto_questions")
-            private Integer autoQuestions;
-
-            @Schema(description = "自动生成标签数量")
-            @JsonProperty("topn_tags")
-            private Integer topnTags;
-
-            @Schema(description = "RAPTOR 高级索引配置")
-            private RaptorConfig raptor;
-
-            @Schema(description = "GraphRAG 知识图谱配置")
-            @JsonProperty("graphrag")
-            private GraphRagConfig graphRag;
-
-            @Data
-            @Builder
-            @NoArgsConstructor
-            @AllArgsConstructor
-            @Schema(description = "RAPTOR (递归摘要索引) 配置")
-            @JsonIgnoreProperties(ignoreUnknown = true)
-            public static class RaptorConfig implements Serializable {
-                private static final long serialVersionUID = 1L;
-                @Schema(description = "是否启用 RAPTOR 索引")
-                @JsonProperty("use_raptor")
-                private Boolean useRaptor;
-            }
-
-            @Data
-            @Builder
-            @NoArgsConstructor
-            @AllArgsConstructor
-            @Schema(description = "GraphRAG (图增强检索) 配置")
-            @JsonIgnoreProperties(ignoreUnknown = true)
-            public static class GraphRagConfig implements Serializable {
-                private static final long serialVersionUID = 1L;
-                @Schema(description = "是否启用 GraphRAG 索引")
-                @JsonProperty("use_graphrag")
-                private Boolean useGraphRag;
-            }
-        }
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/document/RetrievalDTO.java

@@ -1,307 +0,0 @@
-package xiaozhi.modules.knowledge.dto.document;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.validation.constraints.*;
-
-/**
- * 检索与元数据管理聚合 DTO
- */
-@Schema(description = "检索与元数据管理聚合 DTO")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class RetrievalDTO {
-
-    /**
-     * 文档聚合信息 (VO)
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "文档聚合信息")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class DocAggVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "文档名称")
-        @JsonProperty("doc_name")
-        private String docName;
-
-        @Schema(description = "文档 ID")
-        @JsonProperty("doc_id")
-        private String docId;
-
-        @Schema(description = "数量")
-        private Integer count;
-    }
-
-    /**
-     * 检索测试请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "检索测试请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public static class TestReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "知识库 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("dataset_ids")
-        @NotEmpty(message = "知识库ID列表不能为空")
-        private List<String> datasetIds;
-
-        @Schema(description = "文档 ID 列表 (可选，用于限定检索范围)")
-        @JsonProperty("document_ids")
-        private List<String> documentIds;
-
-        @Schema(description = "检索问题", requiredMode = Schema.RequiredMode.REQUIRED)
-        @NotBlank(message = "检索问题不能为空")
-        private String question;
-
-        @Schema(description = "页码 (默认 1)")
-        private Integer page;
-
-        @Schema(description = "每页数量 (默认 10)")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "相似度阈值 (默认 0.2)")
-        @JsonProperty("similarity_threshold")
-        private Float similarityThreshold;
-
-        @Schema(description = "向量相似度权重 (默认 0.3)")
-        @JsonProperty("vector_similarity_weight")
-        private Float vectorSimilarityWeight;
-
-        @Schema(description = "返回 Top K 切片 (默认 1024)")
-        @JsonProperty("top_k")
-        private Integer topK;
-
-        @Schema(description = "重排序模型 ID")
-        @JsonProperty("rerank_id")
-        private String rerankId;
-
-        @Schema(description = "是否高亮关键词")
-        private Boolean highlight;
-
-        @Schema(description = "是否启用关键词检索")
-        private Boolean keyword;
-
-        @Schema(description = "跨语言翻译列表 (可选)")
-        @JsonProperty("cross_languages")
-        private List<String> crossLanguages;
-
-        @Schema(description = "元数据过滤条件 (JSON 对象)")
-        @JsonProperty("metadata_condition")
-        private Map<String, Object> metadataCondition;
-    }
-
-    /**
-     * 检索命中结果 (VO)
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "检索命中切片详情")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class HitVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "切片 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String id;
-
-        @Schema(description = "切片内容", requiredMode = Schema.RequiredMode.REQUIRED)
-        private String content;
-
-        @Schema(description = "所属文档 ID", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("document_id")
-        private String documentId;
-
-        @Schema(description = "所属知识库 ID")
-        @JsonProperty("dataset_id")
-        private String datasetId;
-
-        @Schema(description = "文档名称")
-        @JsonProperty("document_name")
-        private String documentName;
-
-        @Schema(description = "文档关键词")
-        @JsonProperty("document_keyword")
-        private String documentKeyword;
-
-        @Schema(description = "综合相似度", requiredMode = Schema.RequiredMode.REQUIRED)
-        private Float similarity;
-
-        @Schema(description = "向量相似度")
-        @JsonProperty("vector_similarity")
-        private Float vectorSimilarity;
-
-        @Schema(description = "关键词相似度")
-        @JsonProperty("term_similarity")
-        private Float termSimilarity;
-
-        @Schema(description = "索引位置")
-        private Integer index;
-
-        @Schema(description = "高亮内容")
-        private String highlight;
-
-        @Schema(description = "重要关键词列表")
-        @JsonProperty("important_keywords")
-        private List<String> importantKeywords;
-
-        @Schema(description = "预设问题列表")
-        private List<String> questions;
-
-        @Schema(description = "图片 ID")
-        @JsonProperty("image_id")
-        private String imageId;
-
-        @Schema(description = "位置索引 (RAGFlow返回嵌套数组, 如 [[start, end, filename]])")
-        private Object positions;
-    }
-
-    /**
-     * 知识库元数据摘要 (VO)
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "知识库元数据摘要信息")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class MetaSummaryVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "文档总数", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("total_doc_count")
-        private Long totalDocCount;
-
-        @Schema(description = "Token 总数", requiredMode = Schema.RequiredMode.REQUIRED)
-        @JsonProperty("total_token_count")
-        private Long totalTokenCount;
-
-        @Schema(description = "文件类型分布 (key: 文件后缀, value: 数量)")
-        @JsonProperty("file_type_distribution")
-        private Map<String, Long> fileTypeDistribution;
-
-        @Schema(description = "文状态分布 (key: 状态码, value: 数量)")
-        @JsonProperty("status_distribution")
-        private Map<String, Long> statusDistribution;
-
-        @Schema(description = "自定义元数据统计 (key: 字段名, value: 数量/值)")
-        @JsonProperty("custom_metadata")
-        private Map<String, Object> customMetadata;
-    }
-
-    /**
-     * 批量更新元数据请求参数
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "批量更新元数据请求参数")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class MetaBatchReq implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "筛选器: 用于指定要更新的文档范围 (默认全部)")
-        private Selector selector;
-
-        @Schema(description = "新增或更新的元数据列表")
-        private List<UpdateItem> updates;
-
-        @Schema(description = "需要删除的元数据键列表")
-        private List<DeleteItem> deletes;
-
-        /**
-         * 文档筛选器
-         */
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "元数据更新筛选器")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class Selector implements Serializable {
-            private static final long serialVersionUID = 1L;
-
-            @Schema(description = "指定文档 ID 列表")
-            @JsonProperty("document_ids")
-            private List<String> documentIds;
-
-            @Schema(description = "元数据条件匹配 (key: 字段名, value: 匹配值)")
-            @JsonProperty("metadata_condition")
-            private Map<String, Object> metadataCondition;
-        }
-
-        /**
-         * 更新项
-         */
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "元数据更新项")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class UpdateItem implements Serializable {
-            private static final long serialVersionUID = 1L;
-
-            @Schema(description = "元数据键名", requiredMode = Schema.RequiredMode.REQUIRED)
-            private String key;
-
-            @Schema(description = "元数据值", requiredMode = Schema.RequiredMode.REQUIRED)
-            private Object value;
-        }
-
-        /**
-         * 删除项
-         */
-        @Data
-        @Builder
-        @NoArgsConstructor
-        @AllArgsConstructor
-        @Schema(description = "元数据删除项")
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        public static class DeleteItem implements Serializable {
-            private static final long serialVersionUID = 1L;
-
-            @Schema(description = "需删除的元数据键名", requiredMode = Schema.RequiredMode.REQUIRED)
-            private String key;
-        }
-    }
-
-    /**
-     * 召回测试结果聚合响应
-     */
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Schema(description = "召回测试结果聚合响应")
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ResultVO implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "检索命中的切片列表")
-        private List<HitVO> chunks;
-
-        @Schema(description = "文档分布统计")
-        @JsonProperty("doc_aggs")
-        private List<DocAggVO> docAggs;
-
-        @Schema(description = "总命中记录数")
-        private Long total;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/file/FileDTO.java

@@ -1,363 +0,0 @@
-package xiaozhi.modules.knowledge.dto.file;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.*;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件管理聚合 DTO
- * <p>
- * 容器类，内含文件模块所有请求/响应对象的静态内部类定义。
- * </p>
- */
-@Schema(description = "文件管理聚合 DTO")
-public class FileDTO {
-
-    // ========== 请求类 ==========
-
-    /**
-     * 文件上传请求 (对应接口 1: upload)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "文件上传请求")
-    public static class UploadReq implements Serializable {
-
-        @NotNull(message = "文件不能为空")
-        @Schema(description = "上传的文件", requiredMode = Schema.RequiredMode.REQUIRED)
-        private MultipartFile file;
-
-        @Schema(description = "父文件夹 ID (为空则上传到根目录)", example = "folder_001")
-        @JsonProperty("parent_id")
-        private String parentId;
-    }
-
-    /**
-     * 新建文件夹请求 (对应接口 2: create)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "新建文件夹请求")
-    public static class CreateReq implements Serializable {
-
-        @NotBlank(message = "文件夹名称不能为空")
-        @Schema(description = "文件夹名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "新建文件夹")
-        private String name;
-
-        @Schema(description = "父文件夹 ID (为空则创建在根目录)", example = "folder_001")
-        @JsonProperty("parent_id")
-        private String parentId;
-
-        @NotBlank(message = "类型不能为空")
-        @Schema(description = "类型: FOLDER", requiredMode = Schema.RequiredMode.REQUIRED, example = "FOLDER")
-        @Builder.Default
-        private String type = "FOLDER";
-    }
-
-    /**
-     * 重命名请求 (对应接口 6: rename)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "重命名请求")
-    public static class RenameReq implements Serializable {
-
-        @NotBlank(message = "文件 ID 不能为空")
-        @Schema(description = "文件/文件夹 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "file_001")
-        @JsonProperty("file_id")
-        private String fileId;
-
-        @NotBlank(message = "新名称不能为空")
-        @Schema(description = "新名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "重命名后的文件")
-        private String name;
-    }
-
-    /**
-     * 移动请求 (对应接口 7: move)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "移动请求")
-    public static class MoveReq implements Serializable {
-
-        @NotEmpty(message = "源文件 ID 列表不能为空")
-        @Schema(description = "源文件/文件夹 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"file_001\", \"file_002\"]")
-        @JsonProperty("src_file_ids")
-        private List<String> srcFileIds;
-
-        @NotBlank(message = "目标文件夹 ID 不能为空")
-        @Schema(description = "目标文件夹 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "folder_002")
-        @JsonProperty("dest_file_id")
-        private String destFileId;
-    }
-
-    /**
-     * 批量删除请求 (对应接口 8: rm)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "批量删除请求")
-    public static class RemoveReq implements Serializable {
-
-        @NotEmpty(message = "文件 ID 列表不能为空")
-        @Schema(description = "文件/文件夹 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"file_001\", \"file_002\"]")
-        @JsonProperty("file_ids")
-        private List<String> fileIds;
-    }
-
-    /**
-     * 导入知识库请求 (对应接口 9: convert)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "导入知识库请求")
-    public static class ConvertReq implements Serializable {
-
-        @NotEmpty(message = "文件 ID 列表不能为空")
-        @Schema(description = "文件 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"file_001\", \"file_002\"]")
-        @JsonProperty("file_ids")
-        private List<String> fileIds;
-
-        @NotEmpty(message = "知识库 ID 列表不能为空")
-        @Schema(description = "目标知识库 ID 列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"kb_001\"]")
-        @JsonProperty("kb_ids")
-        private List<String> kbIds;
-    }
-
-    /**
-     * 列表查询请求 (对应接口 3: list_files)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "列表查询请求")
-    public static class ListReq implements Serializable {
-
-        @Schema(description = "父文件夹 ID (为空则查询根目录)", example = "folder_001")
-        @JsonProperty("parent_id")
-        private String parentId;
-
-        @Schema(description = "关键词搜索", example = "文档")
-        private String keywords;
-
-        @Schema(description = "页码 (从 1 开始)", example = "1")
-        private Integer page;
-
-        @Schema(description = "每页数量", example = "30")
-        @JsonProperty("page_size")
-        private Integer pageSize;
-
-        @Schema(description = "排序字段: create_time / update_time / name / size", example = "create_time")
-        private String orderby;
-
-        @Schema(description = "是否降序", example = "true")
-        private Boolean desc;
-    }
-
-    // ========== 响应类 ==========
-
-    /**
-     * 文件/文件夹基础信息 VO
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "文件/文件夹基础信息")
-    public static class InfoVO implements Serializable {
-
-        @Schema(description = "文件/文件夹 ID", example = "file_001")
-        private String id;
-
-        @Schema(description = "父文件夹 ID", example = "folder_001")
-        @JsonProperty("parent_id")
-        private String parentId;
-
-        @Schema(description = "租户 ID", example = "tenant_001")
-        @JsonProperty("tenant_id")
-        private String tenantId;
-
-        @Schema(description = "创建者 ID", example = "user_001")
-        @JsonProperty("created_by")
-        private String createdBy;
-
-        @Schema(description = "类型: FOLDER / FILE", example = "FOLDER")
-        private String type;
-
-        @Schema(description = "名称", example = "我的文件夹")
-        private String name;
-
-        @Schema(description = "路径位置", example = "/root/folder")
-        private String location;
-
-        @Schema(description = "文件大小 (字节)", example = "1024")
-        private Long size;
-
-        @Schema(description = "来源类型", example = "local")
-        @JsonProperty("source_type")
-        private String sourceType;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "创建日期 (格式化)", example = "2024-01-15 10:30:00")
-        @JsonProperty("create_date")
-        private String createDate;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-
-        @Schema(description = "更新日期 (格式化)", example = "2024-01-15 11:00:00")
-        @JsonProperty("update_date")
-        private String updateDate;
-
-        @Schema(description = "文件扩展名", example = "pdf")
-        private String extension;
-    }
-
-    /**
-     * 列表响应 VO (对应接口 3: list_files)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "文件列表响应")
-    public static class ListVO implements Serializable {
-
-        @Schema(description = "总记录数", example = "100")
-        private Long total;
-
-        @Schema(description = "当前父文件夹信息")
-        @JsonProperty("parent_folder")
-        private InfoVO parentFolder;
-
-        @Schema(description = "文件/文件夹列表")
-        private List<InfoVO> files;
-
-        @Schema(description = "面包屑导航路径")
-        private List<InfoVO> breadcrumb;
-    }
-
-    /**
-     * 转换结果项 VO (对应接口 9: convert)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "文件转换结果项")
-    public static class ConvertVO implements Serializable {
-
-        @Schema(description = "转换记录 ID", example = "convert_001")
-        private String id;
-
-        @Schema(description = "源文件 ID", example = "file_001")
-        @JsonProperty("file_id")
-        private String fileId;
-
-        @Schema(description = "目标文档 ID", example = "doc_001")
-        @JsonProperty("document_id")
-        private String documentId;
-
-        @Schema(description = "创建时间 (时间戳)", example = "1700000000000")
-        @JsonProperty("create_time")
-        private Long createTime;
-
-        @Schema(description = "创建日期 (格式化)", example = "2024-01-15 10:30:00")
-        @JsonProperty("create_date")
-        private String createDate;
-
-        @Schema(description = "更新时间 (时间戳)", example = "1700000001000")
-        @JsonProperty("update_time")
-        private Long updateTime;
-
-        @Schema(description = "更新日期 (格式化)", example = "2024-01-15 11:00:00")
-        @JsonProperty("update_date")
-        private String updateDate;
-    }
-
-    /**
-     * 转换状态 VO (对应接口 10: get_convert_status)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "文件转换状态")
-    public static class ConvertStatusVO implements Serializable {
-
-        @Schema(description = "转换状态: pending / processing / completed / failed", example = "completed")
-        private String status;
-
-        @Schema(description = "转换进度 (0.0 - 1.0)", example = "1.0")
-        private Float progress;
-
-        @Schema(description = "状态消息", example = "转换完成")
-        private String message;
-    }
-
-    /**
-     * 面包屑 VO (对应接口 12: all_parent_folder)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "面包屑导航 (所有父文件夹)")
-    public static class BreadcrumbVO implements Serializable {
-
-        @Schema(description = "父文件夹列表 (从根到当前的路径)")
-        @JsonProperty("parent_folders")
-        private List<InfoVO> parentFolders;
-    }
-
-    /**
-     * 根目录信息 VO (对应接口 10: get_root_folder)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "根目录信息")
-    public static class RootFolderVO implements Serializable {
-
-        @Schema(description = "根文件夹信息")
-        @JsonProperty("root_folder")
-        private InfoVO rootFolder;
-    }
-
-    /**
-     * 父目录信息 VO (对应接口 11: get_parent_folder)
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    @Schema(description = "父目录信息")
-    public static class ParentFolderVO implements Serializable {
-
-        @Schema(description = "父文件夹信息")
-        @JsonProperty("parent_folder")
-        private InfoVO parentFolder;
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/entity/DocumentEntity.java

@@ -1,97 +0,0 @@
-package xiaozhi.modules.knowledge.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 文档表 (Shadow DB for RAGFlow Documents)
- * 对应表名: ai_knowledge_document
- */
-@Data
-@TableName(value = "ai_rag_knowledge_document", autoResultMap = true)
-@Schema(description = "知识库文档表")
-public class DocumentEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.ASSIGN_UUID)
-    @Schema(description = "本地唯一ID")
-    private String id;
-
-    @Schema(description = "知识库ID (关联 ai_rag_dataset.dataset_id)")
-    private String datasetId;
-
-    @Schema(description = "RAGFlow文档ID (远程ID)")
-    private String documentId;
-
-    @Schema(description = "文档名称")
-    private String name;
-
-    @Schema(description = "文件大小(Bytes)")
-    private Long size;
-
-    @Schema(description = "文件类型(pdf/doc/txt等)")
-    private String type;
-
-    @Schema(description = "分块方法")
-    private String chunkMethod;
-
-    @Schema(description = "解析配置(JSON String)")
-    private String parserConfig;
-
-    @Schema(description = "可用状态 (1: 启用/正常, 0: 禁用/失效)")
-    private String status;
-
-    @Schema(description = "运行状态 (UNSTART/RUNNING/CANCEL/DONE/FAIL)")
-    private String run;
-
-    @Schema(description = "解析进度 (0.0 ~ 1.0)")
-    private Double progress;
-
-    @Schema(description = "缩略图 (Base64 或 URL)")
-    private String thumbnail;
-
-    @Schema(description = "解析耗时 (单位: 秒)")
-    private Double processDuration;
-
-    @Schema(description = "自定义元数据 (JSON 格式)")
-    private String metaFields;
-
-    @Schema(description = "来源类型 (local, s3, url 等)")
-    private String sourceType;
-
-    @Schema(description = "解析错误信息")
-    private String error;
-
-    @Schema(description = "分块数量")
-    private Integer chunkCount;
-
-    @Schema(description = "Token数量")
-    private Long tokenCount;
-
-    @Schema(description = "是否启用 (0:禁用 1:启用)")
-    private Integer enabled;
-
-    @Schema(description = "创建者")
-    @TableField(fill = FieldFill.INSERT)
-    private Long creator;
-
-    @Schema(description = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createdAt;
-
-    @Schema(description = "更新时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updatedAt;
-
-    @Schema(description = "最新同步时间")
-    private Date lastSyncAt;
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/entity/KnowledgeBaseEntity.java

@@ -23,43 +23,15 @@ public class KnowledgeBaseEntity {
     @Schema(description = "知识库ID")
     private String datasetId;
 
-//    @Deprecated
-    @Schema(description = "RAG模型配置ID (连接RAGFlow的凭证指针)")
+    @Schema(description = "RAG模型配置ID")
     private String ragModelId;
 
-    @Schema(description = "租户ID")
-    private String tenantId;
-
     @Schema(description = "知识库名称")
     private String name;
 
-    @Schema(description = "知识库头像(Base64)")
-    private String avatar;
-
     @Schema(description = "知识库描述")
     private String description;
 
-    @Schema(description = "嵌入模型名称")
-    private String embeddingModel;
-
-    @Schema(description = "权限设置: me/team")
-    private String permission;
-
-    @Schema(description = "分块方法")
-    private String chunkMethod;
-
-    @Schema(description = "解析器配置(JSON String)")
-    private String parserConfig;
-
-    @Schema(description = "分块总数")
-    private Long chunkCount;
-
-    @Schema(description = "文档总数")
-    private Long documentCount;
-
-    @Schema(description = "总Token数")
-    private Long tokenNum;
-
     @Schema(description = "状态(0:禁用 1:启用)")
     private Integer status;
 

main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapter.java

@@ -3,14 +3,10 @@ package xiaozhi.modules.knowledge.rag;
 import java.util.List;
 import java.util.Map;
 
-import xiaozhi.modules.knowledge.dto.dataset.DatasetDTO;
+import org.springframework.web.multipart.MultipartFile;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
-import xiaozhi.modules.knowledge.dto.document.DocumentDTO;
-import xiaozhi.modules.knowledge.dto.document.ChunkDTO;
-import xiaozhi.modules.knowledge.dto.document.RetrievalDTO;
-import java.util.function.Consumer;
 
 /**
  * 知识库API适配器抽象基类
@@ -50,24 +46,35 @@ public abstract class KnowledgeBaseAdapter {
          * @return 分页数据
          */
         public abstract PageData<KnowledgeFilesDTO> getDocumentList(String datasetId,
-                        DocumentDTO.ListReq req);
+                        Map<String, Object> queryParams,
+                        Integer page,
+                        Integer limit);
 
         /**
          * 根据文档ID获取文档详情
          * 
-         * @param datasetId  知识库ID
-         * @param documentId 文档ID
-         * @return 文档详情 (强类型 InfoVO)
+         * @param datasetId 知识库ID
+         * @return 文档详情
          */
-        public abstract DocumentDTO.InfoVO getDocumentById(String datasetId, String documentId);
+        public abstract KnowledgeFilesDTO getDocumentById(String datasetId, String documentId);
 
         /**
          * 上传文档到知识库
          * 
-         * @param req 上传请求参数
+         * @param datasetId    知识库ID
+         * @param file         上传的文件
+         * @param name         文档名称
+         * @param metaFields   元数据字段
+         * @param chunkMethod  分块方法
+         * @param parserConfig 解析器配置
          * @return 上传的文档信息
          */
-        public abstract KnowledgeFilesDTO uploadDocument(DocumentDTO.UploadReq req);
+        public abstract KnowledgeFilesDTO uploadDocument(String datasetId,
+                        MultipartFile file,
+                        String name,
+                        Map<String, Object> metaFields,
+                        String chunkMethod,
+                        Map<String, Object> parserConfig);
 
         /**
          * 根据状态分页查询文档列表
@@ -84,12 +91,12 @@ public abstract class KnowledgeBaseAdapter {
                         Integer limit);
 
         /**
-         * 删除文档 (支持批量删除)
+         * 删除文档
          * 
-         * @param datasetId 知识库ID
-         * @param req       包含文档ID列表的请求对象
+         * @param datasetId  知识库ID
+         * @param documentId 文档ID
          */
-        public abstract void deleteDocument(String datasetId, DocumentDTO.BatchIdReq req);
+        public abstract void deleteDocument(String datasetId, String documentId);
 
         /**
          * 解析文档（切块）
@@ -105,21 +112,32 @@ public abstract class KnowledgeBaseAdapter {
          * 
          * @param datasetId  知识库ID
          * @param documentId 文档ID
-         * @param req        列表请求参数 (分页、关键词等)
-         * @return 切片列表VO
+         * @param keywords   关键词过滤
+         * @param page       页码
+         * @param pageSize   每页数量
+         * @param chunkId    切片ID
+         * @return 切片列表信息
          */
-        public abstract ChunkDTO.ListVO listChunks(String datasetId,
+        public abstract Map<String, Object> listChunks(String datasetId,
                         String documentId,
-                        ChunkDTO.ListReq req);
+                        String keywords,
+                        Integer page,
+                        Integer pageSize,
+                        String chunkId);
 
         /**
          * 召回测试 - 从知识库中检索相关切片
          * 
-         * @param req 检索测试请求参数
+         * @param question        用户查询
+         * @param datasetIds      数据集ID列表
+         * @param documentIds     文档ID列表
+         * @param retrievalParams 检索参数
          * @return 召回测试结果
          */
-        public abstract RetrievalDTO.ResultVO retrievalTest(
-                        RetrievalDTO.TestReq req);
+        public abstract Map<String, Object> retrievalTest(String question,
+                        List<String> datasetIds,
+                        List<String> documentIds,
+                        Map<String, Object> retrievalParams);
 
         /**
          * 测试连接
@@ -152,73 +170,31 @@ public abstract class KnowledgeBaseAdapter {
         /**
          * 创建数据集
          * 
-         * @param req 创建参数
-         * @return 数据集详情
+         * @param createParams 创建参数
+         * @return 数据集ID
          */
-        public abstract DatasetDTO.InfoVO createDataset(DatasetDTO.CreateReq req);
+        public abstract String createDataset(Map<String, Object> createParams);
 
         /**
          * 更新数据集
          * 
-         * @param datasetId 数据集ID
-         * @param req       更新参数
-         * @return 数据集详情
+         * @param datasetId    数据集ID
+         * @param updateParams 更新参数
          */
-        public abstract DatasetDTO.InfoVO updateDataset(String datasetId, DatasetDTO.UpdateReq req);
+        public abstract void updateDataset(String datasetId, Map<String, Object> updateParams);
 
         /**
          * 删除数据集
          * 
-         * @param req 删除请求参数（包含ID列表）
-         * @return 批量操作结果
+         * @param datasetId 数据集ID
          */
-        public abstract DatasetDTO.BatchOperationVO deleteDataset(DatasetDTO.BatchIdReq req);
+        public abstract void deleteDataset(String datasetId);
 
         /**
          * 获取数据集的文档数量
-         *
+         * 
          * @param datasetId 数据集ID
          * @return 文档数量
          */
         public abstract Integer getDocumentCount(String datasetId);
-
-        /**
-         * 获取数据集完整信息（名称、简介、文档数量等）
-         * 用于检测 RAGFlow 端是否已删除、同步名称/简介变更
-         *
-         * @param datasetId 数据集ID
-         * @return 数据集详情，若 RAGFlow 端不存在则返回 null
-         */
-        public abstract DatasetDTO.InfoVO getDatasetInfo(String datasetId);
-
-        /**
-         * 发送流式请求 (SSE)
-         * 
-         * @param endpoint API端点
-         * @param body     请求体
-         * @param onData   数据回调
-         */
-        public abstract void postStream(String endpoint, Object body, Consumer<String> onData);
-
-        /**
-         * SearchBot 提问
-         *
-         * @param config RAG配置
-         * @param body   请求体
-         * @param onData 数据回调
-         * @return 响应对象
-         */
-        public abstract Object postSearchBotAsk(Map<String, Object> config, Object body,
-                        Consumer<String> onData);
-
-        /**
-         * AgentBot 对话
-         *
-         * @param config  RAG配置
-         * @param agentId Agent ID
-         * @param body    请求体
-         * @param onData  数据回调
-         */
-        public abstract void postAgentBotCompletion(Map<String, Object> config, String agentId, Object body,
-                        Consumer<String> onData);
 }

main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapterFactory.java

@@ -22,9 +22,6 @@ public class KnowledgeBaseAdapterFactory {
     // 适配器实例缓存
     private static final Map<String, KnowledgeBaseAdapter> adapterCache = new ConcurrentHashMap<>();
 
-    // 最大缓存实例数，防止内存泄露 (Issue 9)
-    private static final int MAX_CACHE_SIZE = 50;
-
     static {
         // 注册内置适配器类型
         registerAdapter("ragflow", xiaozhi.modules.knowledge.rag.impl.RAGFlowAdapter.class);
@@ -64,13 +61,7 @@ public class KnowledgeBaseAdapterFactory {
         // 创建新的适配器实例
         KnowledgeBaseAdapter adapter = createAdapter(adapterType, config);
 
-        // 缓存适配器实例 (带容量限制检查)
-        if (adapterCache.size() >= MAX_CACHE_SIZE) {
-            log.warn("适配器缓存已达上限 ({})，执行内存保护性清除", MAX_CACHE_SIZE);
-            // 简单处理：直接清空，生产环境下建议使用 LRU
-            adapterCache.clear();
-        }
-
+        // 缓存适配器实例
         adapterCache.put(cacheKey, adapter);
         log.info("创建并缓存适配器实例: {}", cacheKey);
 

main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/RAGFlowClient.java

@@ -1,278 +0,0 @@
-package xiaozhi.modules.knowledge.rag;
-
-import java.time.Duration;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Map;
-
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-import java.util.Locale;
-import java.net.URLEncoder;
-import java.io.UnsupportedEncodingException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.URI;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.function.Consumer;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import lombok.extern.slf4j.Slf4j;
-import xiaozhi.common.exception.ErrorCode;
-import xiaozhi.common.exception.RenException;
-
-/**
- * RAGFlow HTTP Client
- * 统一处理HTTP通信、鉴权、超时与错误解析
- */
-@Slf4j
-public class RAGFlowClient {
-
-    private final String baseUrl;
-    private final String apiKey;
-    private final RestTemplate restTemplate;
-    private final ObjectMapper objectMapper;
-
-    // 默认超时时间 (秒)
-    private static final int DEFAULT_TIMEOUT = 30;
-
-    public RAGFlowClient(String baseUrl, String apiKey) {
-        this(baseUrl, apiKey, DEFAULT_TIMEOUT);
-    }
-
-    public RAGFlowClient(String baseUrl, String apiKey, int timeoutSeconds) {
-        this.baseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
-        this.apiKey = apiKey;
-        this.objectMapper = new ObjectMapper();
-        // [Reinforce] 兼容 RAGFlow 返回的 RFC 1123 日期格式 (如: Tue, 10 Feb 2026 10:27:35 GMT)
-        this.objectMapper
-                .setDateFormat(new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US));
-        this.objectMapper.setTimeZone(TimeZone.getTimeZone("GMT"));
-
-        // 优先从 Spring 上下文中获取池化的 RestTemplate Bean (Issue 3: 连接池化)
-        RestTemplate pooledTemplate = null;
-        try {
-            pooledTemplate = xiaozhi.common.utils.SpringContextUtils.getBean(RestTemplate.class);
-        } catch (Exception e) {
-            log.warn("无法从 SpringContext 获取池化 RestTemplate，将退化为简单连接模式: {}", e.getMessage());
-        }
-
-        if (false) { // Force new RestTemplate for debugging
-            this.restTemplate = pooledTemplate;
-            log.debug("RAGFlowClient 已成功挂载全局池化 RestTemplate");
-        } else {
-            // 兜底方案：配置超时并创建简单 RestTemplate
-            log.info("RAGFlowClient 初始化: 使用独立 RestTemplate (Debug Mode)");
-            SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-            factory.setConnectTimeout(timeoutSeconds * 1000);
-            factory.setReadTimeout(timeoutSeconds * 1000);
-            this.restTemplate = new RestTemplate(factory);
-        }
-    }
-
-    /**
-     * 发送 GET 请求
-     */
-    public Map<String, Object> get(String endpoint, Map<String, Object> queryParams) {
-        String url = buildUrl(endpoint, queryParams);
-        log.debug("GET {}", url);
-        return execute(url, HttpMethod.GET, null);
-    }
-
-    /**
-     * 发送 POST 请求 (JSON)
-     */
-    public Map<String, Object> post(String endpoint, Object body) {
-        String url = buildUrl(endpoint, null);
-        log.info("RAGFlow Client POST Request: URL={}, BodyType={}", url,
-                body != null ? body.getClass().getName() : "null");
-        try {
-            return execute(url, HttpMethod.POST, body);
-        } catch (Exception e) {
-            log.error("RAGFlow Client POST Failed: URL={}", url, e);
-            throw e;
-        }
-    }
-
-    /**
-     * 发送 DELETE 请求
-     */
-    public Map<String, Object> delete(String endpoint, Object body) {
-        String url = buildUrl(endpoint, null);
-        log.debug("DELETE {}", url);
-        return execute(url, HttpMethod.DELETE, body);
-    }
-
-    /**
-     * 发送 PUT 请求
-     */
-    public Map<String, Object> put(String endpoint, Object body) {
-        String url = buildUrl(endpoint, null);
-        log.debug("PUT {}", url);
-        return execute(url, HttpMethod.PUT, body);
-    }
-
-    /**
-     * 发送 Multipart 请求 (文件上传)
-     */
-    public Map<String, Object> postMultipart(String endpoint, MultiValueMap<String, Object> parts) {
-        String url = buildUrl(endpoint, null);
-        log.debug("POST MULTIPART {}", url);
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-        headers.setBearerAuth(apiKey);
-        // 为了防止中文文件名乱码，某些环境可能需要设置 Charset，但在 Multipart 中通常由 Part header 控制
-
-        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(parts, headers);
-
-        return doExecute(url, HttpMethod.POST, requestEntity);
-    }
-
-    private Map<String, Object> execute(String url, HttpMethod method, Object body) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.setBearerAuth(apiKey);
-        // 强制 UTF-8
-        headers.setAcceptCharset(Collections.singletonList(StandardCharsets.UTF_8));
-
-        HttpEntity<Object> requestEntity = new HttpEntity<>(body, headers);
-        return doExecute(url, method, requestEntity);
-    }
-
-    private Map<String, Object> doExecute(String url, HttpMethod method, HttpEntity<?> requestEntity) {
-        try {
-            ResponseEntity<String> response = restTemplate.exchange(url, method, requestEntity, String.class);
-
-            if (!response.getStatusCode().is2xxSuccessful()) {
-                log.error("RAGFlow API Error Status: {}", response.getStatusCode());
-                throw new RenException(ErrorCode.RAG_API_ERROR, "HTTP " + response.getStatusCode());
-            }
-
-            String responseBody = response.getBody();
-            if (responseBody == null) {
-                throw new RenException(ErrorCode.RAG_API_ERROR, "Empty Response");
-            }
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> map = objectMapper.readValue(responseBody, Map.class);
-
-            Integer code = (Integer) map.get("code");
-            if (code != null && code != 0) {
-                String msg = (String) map.get("message");
-                log.error("RAGFlow Business Error: code={}, msg={}", code, msg);
-                throw new RenException(ErrorCode.RAG_API_ERROR, msg != null ? msg : "Unknown RAGFlow Error");
-            }
-
-            // 返回 data 字段，如果 data 不存在则返回整个 map (视具体情况，通常 RAGFlow 返回 code=0, data=...)
-            // 兼容性处理：如果 external caller 需要 check code，这里已经 check 过了。
-            // 统一返回 wrap 了 code 的 map 还是只返回 data?
-            // 根据分析报告，旧逻辑 check code==0 后取 data.
-            // 这里我们返回整个 Map，让 Adapter 决定怎么取，或者我们直接在这里剥离？
-            // 建议：为了灵活性，返回全量 Map，但在 Client 层做 code!=0 的抛错。
-            return map;
-
-        } catch (RenException re) {
-            throw re;
-        } catch (Exception e) {
-            log.error("RAGFlow Client Execute Error! URL: {}, Method: {}, Body Type: {}", url, method,
-                    requestEntity.getBody() != null ? requestEntity.getBody().getClass().getName() : "null");
-            log.error("Full exception stack trace: ", e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "Request Failed: " + e.getMessage());
-        }
-    }
-
-    private String buildUrl(String endpoint, Map<String, Object> queryParams) {
-        StringBuilder sb = new StringBuilder(baseUrl);
-        if (!endpoint.startsWith("/")) {
-            sb.append("/");
-        }
-        sb.append(endpoint);
-
-        if (queryParams != null && !queryParams.isEmpty()) {
-            sb.append("?");
-            queryParams.forEach((k, v) -> {
-                if (v != null) {
-                    try {
-                        sb.append(k).append("=")
-                                .append(URLEncoder.encode(v.toString(),
-                                        StandardCharsets.UTF_8.name()))
-                                .append("&");
-                    } catch (UnsupportedEncodingException e) {
-                        log.warn("参数编码失败: k={}, v={}", k, v);
-                        sb.append(k).append("=").append(v).append("&");
-                    }
-                }
-            });
-            // 移除最后一个 &
-            sb.setLength(sb.length() - 1);
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 发送流式 POST 请求 (SSE)
-     * 使用 Java 21 HttpClient 实现
-     *
-     * @param endpoint API端点
-     * @param body     请求体
-     * @param onData   数据回调（每收到一行数据调用一次）
-     */
-    public void postStream(String endpoint, Object body, Consumer<String> onData) {
-        try {
-            String url = buildUrl(endpoint, null);
-            log.debug("POST STREAM {}", url);
-
-            String jsonBody = objectMapper.writeValueAsString(body);
-
-            HttpClient httpClient = HttpClient.newBuilder()
-                    .connectTimeout(Duration.ofSeconds(DEFAULT_TIMEOUT))
-                    .build();
-
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(url))
-                    .header("Content-Type", "application/json")
-                    .header("Authorization", "Bearer " + apiKey)
-                    .POST(HttpRequest.BodyPublishers.ofString(jsonBody, StandardCharsets.UTF_8))
-                    .build();
-
-            // 发送请求并处理流式响应
-            httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream())
-                    .body()
-                    .transferTo(new OutputStream() {
-                        private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-                        @Override
-                        public void write(int b) throws IOException {
-                            if (b == '\n') {
-                                String line = buffer.toString(StandardCharsets.UTF_8);
-                                if (!line.trim().isEmpty()) {
-                                    onData.accept(line);
-                                }
-                                buffer.reset();
-                            } else {
-                                buffer.write(b);
-                            }
-                        }
-                    });
-
-        } catch (Exception e) {
-            log.error("RAGFlow Stream Request Error", e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "Stream Request Failed: " + e.getMessage());
-        }
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java

@@ -7,7 +7,6 @@ import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
 import xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity;
-import xiaozhi.modules.model.entity.ModelConfigEntity;
 
 /**
  * 知识库知识库服务接口
@@ -56,14 +55,6 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
      */
     KnowledgeBaseDTO getByDatasetId(String datasetId);
 
-    /**
-     * 根据知识库ID集合查询知识库
-     *
-     * @param datasetIdList 知识库ID集合
-     * @return 知识库详情
-     */
-    List<KnowledgeBaseDTO> getByDatasetIdList(List<String> datasetIdList);
-
     /**
      * 根据知识库ID删除知识库
      * 
@@ -92,15 +83,5 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
      * 
      * @return RAG模型列表
      */
-    List<ModelConfigEntity> getRAGModels();
-
-    /**
-     * 更新知识库统计信息 (用于被文件服务回调)
-     * 
-     * @param datasetId  知识库ID
-     * @param docDelta   文档数增量
-     * @param chunkDelta 分块数增量
-     * @param tokenDelta Token数增量
-     */
-    void updateStatistics(String datasetId, Integer docDelta, Long chunkDelta, Long tokenDelta);
+    List<Map<String, Object>> getRAGModels();
 }

main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeFilesService.java

@@ -7,9 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
-import xiaozhi.modules.knowledge.dto.document.ChunkDTO;
-import xiaozhi.modules.knowledge.dto.document.RetrievalDTO;
-import xiaozhi.modules.knowledge.dto.document.DocumentDTO;
 
 /**
  * 知识库文档服务接口
@@ -31,9 +28,9 @@ public interface KnowledgeFilesService {
          * 
          * @param documentId 文档ID
          * @param datasetId  知识库ID
-         * @return 文档详情 (强类型 InfoVO)
+         * @return 文档详情
          */
-        DocumentDTO.InfoVO getByDocumentId(String documentId, String datasetId);
+        KnowledgeFilesDTO getByDocumentId(String documentId, String datasetId);
 
         /**
          * 上传文档到知识库
@@ -51,12 +48,23 @@ public interface KnowledgeFilesService {
                         Map<String, Object> parserConfig);
 
         /**
-         * 批量删除文档
+         * 根据状态分页查询文档列表
          * 
          * @param datasetId 知识库ID
-         * @param req       删除请求参数 (含文档ID列表)
+         * @param status    文档解析状态（0-未开始，1-进行中，2-已取消，3-已完成，4-失败）
+         * @param page      页码
+         * @param limit     每页数量
+         * @return 分页数据
          */
-        void deleteDocuments(String datasetId, DocumentDTO.BatchIdReq req);
+        PageData<KnowledgeFilesDTO> getPageListByStatus(String datasetId, Integer status, Integer page, Integer limit);
+
+        /**
+         * 根据文档ID和知识库ID删除文档
+         * 
+         * @param documentId 文档ID
+         * @param datasetId  知识库ID
+         */
+        void deleteByDocumentId(String documentId, String datasetId);
 
         /**
          * 获取RAG配置信息
@@ -80,53 +88,36 @@ public interface KnowledgeFilesService {
          * 
          * @param datasetId  知识库ID
          * @param documentId 文档ID
-         * @param req        切片列表请求参数
+         * @param keywords   关键词过滤
+         * @param page       页码
+         * @param pageSize   每页数量
+         * @param chunkId    切片ID
          * @return 切片列表信息
          */
-        ChunkDTO.ListVO listChunks(String datasetId, String documentId, ChunkDTO.ListReq req);
+        Map<String, Object> listChunks(String datasetId, String documentId, String keywords,
+                        Integer page, Integer pageSize, String chunkId);
 
         /**
-         * 召回测试
+         * 召回测试 - 从指定数据集或文档中检索相关切片
          * 
-         * @param req 检索测试请求参数
+         * @param question               用户查询或查询关键词
+         * @param datasetIds             数据集ID列表
+         * @param documentIds            文档ID列表
+         * @param page                   页码
+         * @param pageSize               每页数量
+         * @param similarityThreshold    最小相似度阈值
+         * @param vectorSimilarityWeight 向量相似度权重
+         * @param topK                   参与向量余弦计算的切片数量
+         * @param rerankId               重排模型ID
+         * @param keyword                是否启用关键词匹配
+         * @param highlight              是否启用高亮显示
+         * @param crossLanguages         跨语言翻译列表
+         * @param metadataCondition      元数据过滤条件
          * @return 召回测试结果
          */
-        RetrievalDTO.ResultVO retrievalTest(RetrievalDTO.TestReq req);
-
-        /**
-         * 保存文档影子记录
-         */
-        boolean saveDocumentShadow(String datasetId, KnowledgeFilesDTO result, String originalName, String chunkMethod,
-                        Map<String, Object> parserConfig);
-
-        /**
-         * 批量删除文档影子记录并同步统计数据
-         * 
-         * @param documentIds 文档ID列表
-         * @param datasetId   数据集ID
-         * @param chunkDelta  待扣减的总分块数
-         * @param tokenDelta  待扣减的总Token数
-         */
-        void deleteDocumentShadows(List<String> documentIds, String datasetId, Long chunkDelta, Long tokenDelta);
-
-        /**
-         * 根据数据集ID清理所有关联文档 (级联删除专用)
-         * 
-         * @param datasetId 数据集ID
-         */
-        void deleteDocumentsByDatasetId(String datasetId);
-
-        /**
-         * 同步所有处于 RUNNING 状态的文档 (供定时任务调用)
-         */
-        void syncRunningDocuments();
-
-        /**
-         * 从RAGFlow全量同步文档到本地影子表
-         * 拉取远端所有文档，与本地影子表对比，插入缺失的记录
-         *
-         * @param datasetId 数据集ID
-         * @return 新同步的文档数量
-         */
-        int syncDocumentsFromRAG(String datasetId);
+        Map<String, Object> retrievalTest(String question, List<String> datasetIds, List<String> documentIds,
+                        Integer page, Integer pageSize, Float similarityThreshold,
+                        Float vectorSimilarityWeight, Integer topK, String rerankId,
+                        Boolean keyword, Boolean highlight, List<String> crossLanguages,
+                        Map<String, Object> metadataCondition);
 }

main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeManagerService.java

@@ -1,24 +0,0 @@
-package xiaozhi.modules.knowledge.service;
-
-import java.util.List;
-
-/**
- * 知识库模块领域编排服务
- * 用于处理跨 KnowledgeBase 和 KnowledgeFiles 的复杂业务流程，彻底解决 Service 间的循环依赖问题。
- */
-public interface KnowledgeManagerService {
-
-    /**
-     * 级联删除知识库及其下属所有文档 (包括本地 DB 和 RAGFlow 远程数据)
-     * 
-     * @param datasetId 知识库 ID
-     */
-    void deleteDatasetWithFiles(String datasetId);
-
-    /**
-     * 批量级联删除知识库
-     * 
-     * @param datasetIds 知识库 ID 列表
-     */
-    void batchDeleteDatasetsWithFiles(List<String> datasetIds);
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeManagerServiceImpl.java

@@ -1,47 +0,0 @@
-package xiaozhi.modules.knowledge.service.impl;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
-import xiaozhi.modules.knowledge.service.KnowledgeFilesService;
-import xiaozhi.modules.knowledge.service.KnowledgeManagerService;
-
-import java.util.List;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class KnowledgeManagerServiceImpl implements KnowledgeManagerService {
-
-    private final KnowledgeBaseService knowledgeBaseService;
-    private final KnowledgeFilesService knowledgeFilesService;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteDatasetWithFiles(String datasetId) {
-        log.info("=== 级联删除开始: datasetId={} ===", datasetId);
-
-        // 1. 先调用文件服务，清理该数据集下的所有文档记录 (含 RAGFlow 端)
-        log.info("Step 1: 清理关联文档...");
-        knowledgeFilesService.deleteDocumentsByDatasetId(datasetId);
-
-        // 2. 再调用知识库服务，彻底注销数据集 (含 RAGFlow 端)
-        log.info("Step 2: 删除数据集主体...");
-        knowledgeBaseService.deleteByDatasetId(datasetId);
-
-        log.info("=== 级联删除成功: datasetId={} ===", datasetId);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void batchDeleteDatasetsWithFiles(List<String> datasetIds) {
-        if (datasetIds == null || datasetIds.isEmpty())
-            return;
-        log.info("=== 批量级联删除开始: count={} ===", datasetIds.size());
-        for (String id : datasetIds) {
-            deleteDatasetWithFiles(id);
-        }
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/knowledge/task/DocumentStatusSyncTask.java

@@ -1,39 +0,0 @@
-package xiaozhi.modules.knowledge.task;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import xiaozhi.modules.knowledge.service.KnowledgeFilesService;
-
-/**
- * 知识库文档状态同步定时任务
- * 
- * 作用：
- * 1. 自动扫描处于 "RUNNING" (解析中) 状态的文档
- * 2. 调用 RAGFlow 接口获取最新状态
- * 3. 状态翻转 (RUNNING -> SUCCESS/FAIL) 时，同步更新数据库
- * 4. [关键] 解析成功时，补偿更新知识库的统计信息 (TokenCount)
- */
-@Component
-@AllArgsConstructor
-@Slf4j
-public class DocumentStatusSyncTask {
-
-    private final KnowledgeFilesService knowledgeFilesService;
-
-    /**
-     * 每 30 秒执行一次同步
-     * 采用 fixedDelay，确保上一次执行完 30 秒后才开始下一次，防止积压
-     */
-    @Scheduled(fixedDelay = 30000)
-    public void syncRunningDocuments() {
-        try {
-            // log.debug("开始执行文档状态同步任务...");
-            knowledgeFilesService.syncRunningDocuments();
-        } catch (Exception e) {
-            log.error("文档状态同步任务异常", e);
-        }
-    }
-}

main/manager-api/src/main/java/xiaozhi/modules/llm/service/LLMService.java

@@ -67,13 +67,4 @@ public interface LLMService {
      * @return 是否可用
      */
     boolean isAvailable(String modelId);
-
-    /**
-     * 生成会话标题
-     * 
-     * @param conversation 对话内容
-     * @param modelId      模型ID
-     * @return 标题（约15字）
-     */
-    String generateTitle(String conversation, String modelId);
 }

main/manager-api/src/main/java/xiaozhi/modules/llm/service/impl/OpenAIStyleLLMServiceImpl.java

@@ -37,8 +37,6 @@ public class OpenAIStyleLLMServiceImpl implements LLMService {
 
     private static final String DEFAULT_SUMMARY_PROMPT = "你是一个经验丰富的记忆总结者，擅长将对话内容进行总结摘要，遵循以下规则：\n1、总结用户的重要信息，以便在未来的对话中提供更个性化的服务\n2、不要重复总结，不要遗忘之前记忆，除非原来的记忆超过了1800字，否则不要遗忘、不要压缩用户的历史记忆\n3、用户操控的设备音量、播放音乐、天气、退出、不想对话等和用户本身无关的内容，这些信息不需要加入到总结中\n4、聊天内容中的今天的日期时间、今天的天气情况与用户事件无关的数据，这些信息如果当成记忆存储会影响后续对话，这些信息不需要加入到总结中\n5、不要把设备操控的成果结果和失败结果加入到总结中，也不要把用户的一些废话加入到总结中\n6、不要为了总结而总结，如果用户的聊天没有意义，请返回原来的历史记录也是可以的\n7、只需要返回总结摘要，严格控制在1800字内\n8、不要包含代码、xml，不需要解释、注释和说明，保存记忆时仅从对话提取信息，不要混入示例内容\n9、如果提供了历史记忆，请将新对话内容与历史记忆进行智能合并，保留有价值的历史信息，同时添加新的重要信息\n\n历史记忆：\n{history_memory}\n\n新对话内容：\n{conversation}";
 
-    private static final String DEFAULT_TITLE_PROMPT = "请根据以下对话内容，生成一个简洁的会话标题（约15字以内），只返回标题，不要包含任何解释或标点符号：\n{conversation}";
-
     @Override
     public String generateSummary(String conversation) {
         return generateSummary(conversation, null, null);
@@ -304,91 +302,4 @@ public class OpenAIStyleLLMServiceImpl implements LLMService {
             return null;
         }
     }
-
-    @Override
-    public String generateTitle(String conversation, String modelId) {
-        if (!isAvailable()) {
-            log.warn("LLM服务不可用，无法生成标题");
-            return null;
-        }
-
-        try {
-            ModelConfigEntity llmConfig;
-            if (modelId != null && !modelId.trim().isEmpty()) {
-                llmConfig = modelConfigService.getModelByIdFromCache(modelId);
-            } else {
-                llmConfig = getDefaultLLMConfig();
-            }
-
-            if (llmConfig == null || llmConfig.getConfigJson() == null) {
-                log.error("未找到可用的LLM模型配置，modelId: {}", modelId);
-                return null;
-            }
-
-            JSONObject configJson = llmConfig.getConfigJson();
-            String baseUrl = configJson.getStr("base_url");
-            String model = configJson.getStr("model_name");
-            String apiKey = configJson.getStr("api_key");
-
-            if (StringUtils.isBlank(baseUrl) || StringUtils.isBlank(apiKey)) {
-                log.error("LLM配置不完整，baseUrl或apiKey为空");
-                return null;
-            }
-
-            String prompt = DEFAULT_TITLE_PROMPT.replace("{conversation}", conversation);
-
-            Map<String, Object> requestBody = new HashMap<>();
-            requestBody.put("model", model != null ? model : "gpt-3.5-turbo");
-
-            Map<String, Object>[] messages = new Map[1];
-            Map<String, Object> message = new HashMap<>();
-            message.put("role", "user");
-            message.put("content", prompt);
-            messages[0] = message;
-
-            requestBody.put("messages", messages);
-            requestBody.put("temperature", 0.3);
-            requestBody.put("max_tokens", 50);
-
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set("Authorization", "Bearer " + apiKey);
-
-            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, headers);
-
-            String apiUrl = baseUrl;
-            if (!apiUrl.endsWith("/chat/completions")) {
-                if (!apiUrl.endsWith("/")) {
-                    apiUrl += "/";
-                }
-                apiUrl += "chat/completions";
-            }
-
-            ResponseEntity<String> response = restTemplate.exchange(
-                    apiUrl, HttpMethod.POST, entity, String.class);
-
-            if (response.getStatusCode().is2xxSuccessful()) {
-                JSONObject responseJson = JSONUtil.parseObj(response.getBody());
-                JSONArray choices = responseJson.getJSONArray("choices");
-                if (choices != null && choices.size() > 0) {
-                    JSONObject choice = choices.getJSONObject(0);
-                    JSONObject messageObj = choice.getJSONObject("message");
-                    String title = messageObj.getStr("content");
-                    if (StringUtils.isNotBlank(title)) {
-                        title = title.trim().replaceAll("[，。！？、：；''\"\"【】（）]", "");
-                        if (title.length() > 15) {
-                            title = title.substring(0, 15);
-                        }
-                        return title;
-                    }
-                }
-            } else {
-                log.error("LLM API调用失败，状态码：{}，响应：{}", response.getStatusCode(), response.getBody());
-            }
-        } catch (Exception e) {
-            log.error("调用LLM服务生成标题时发生异常，modelId: {}", modelId, e);
-        }
-
-        return null;
-    }
 }

main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java

@@ -129,10 +129,6 @@ public class ModelController {
         if (entity == null) {
             return new Result<Void>().error("模型配置不存在");
         }
-        // 不能关闭默认模型
-        if (status == 0 && entity.getIsDefault() > 0) {
-            return new Result<Void>().error("默认模型配置不允许关闭");
-        }
         // 不更新ConfigJson字段
         entity.setConfigJson(null);
         entity.setIsEnabled(status);

main/manager-api/src/main/java/xiaozhi/modules/model/dto/VoiceDTO.java

@@ -22,29 +22,12 @@ public class VoiceDTO implements Serializable {
 
     @Schema(description = "音频播放地址")
     private String voiceDemo;
-    
-    @Schema(description = "语言类型")
-    private String languages;
-    
-    @Schema(description = "是否为克隆音色")
-    private Boolean isClone;
 
     // 添加双参数构造函数，保持向后兼容
     public VoiceDTO(String id, String name) {
         this.id = id;
         this.name = name;
         this.voiceDemo = null;
-        this.languages = null;
-        this.isClone = false; // 默认不是克隆音色
-    }
-    
-    // 添加三参数构造函数，用于普通音色
-    public VoiceDTO(String id, String name, String voiceDemo) {
-        this.id = id;
-        this.name = name;
-        this.voiceDemo = voiceDemo;
-        this.languages = null;
-        this.isClone = false;
     }
 
 }

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -56,9 +56,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                 new QueryWrapper<ModelConfigEntity>()
                         .eq("model_type", modelType)
                         .eq("is_enabled", 1)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
-                        .select("id", "model_name")
-                        .orderByAsc("sort"));
+                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%")
+                        .select("id", "model_name"));
         return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
     }
 
@@ -68,14 +67,14 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                 new QueryWrapper<ModelConfigEntity>()
                         .eq("model_type", "llm")
                         .eq("is_enabled", 1)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
+                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%")
                         .select("id", "model_name", "config_json"));
 
         return entities.stream().map(item -> {
             LlmModelBasicInfoDTO dto = new LlmModelBasicInfoDTO();
             dto.setId(item.getId());
             dto.setModelName(item.getModelName());
-            String type = item.getConfigJson().getOrDefault("type", "").toString();
+            String type = item.getConfigJson().get("type").toString();
             dto.setType(type);
             return dto;
         }).toList();
@@ -92,13 +91,14 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         Page<ModelConfigEntity> pageInfo = new Page<>(curPage, pageSize);
 
         // 添加排序规则：先按is_enabled降序，再按sort升序
-        pageInfo.addOrder(OrderItem.desc("is_enabled"), OrderItem.asc("sort"));
+        pageInfo.addOrder(OrderItem.desc("is_enabled"));
+        pageInfo.addOrder(OrderItem.asc("sort"));
 
         IPage<ModelConfigEntity> modelConfigEntityIPage = modelConfigDao.selectPage(
                 pageInfo,
                 new QueryWrapper<ModelConfigEntity>()
                         .eq("model_type", modelType)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName));
+                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%"));
 
         return getPageData(modelConfigEntityIPage, ModelConfigDTO.class);
     }
@@ -346,7 +346,6 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         modelConfigEntity.setModelName(modelConfigBodyDTO.getModelName());
         modelConfigEntity.setSort(modelConfigBodyDTO.getSort());
         modelConfigEntity.setIsEnabled(modelConfigBodyDTO.getIsEnabled());
-        modelConfigEntity.setRemark(modelConfigBodyDTO.getRemark());
         // 3. 处理配置JSON，仅更新非敏感字段和明确修改的敏感字段
         if (modelConfigBodyDTO.getConfigJson() != null && originalEntity.getConfigJson() != null) {
             JSONObject originalJson = originalEntity.getConfigJson();
@@ -489,7 +488,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
             List<ModelConfigEntity> intentConfigs = modelConfigDao.selectList(
                     new QueryWrapper<ModelConfigEntity>()
                             .eq("model_type", "Intent")
-                            .like("config_json", modelId));
+                            .like("config_json", "%" + modelId + "%"));
             if (!intentConfigs.isEmpty()) {
                 throw new RenException(ErrorCode.LLM_REFERENCED_BY_INTENT);
             }

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java

@@ -95,7 +95,6 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
 
         QueryWrapper<ModelProviderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("model_type", StringUtils.isBlank(modelType) ? "" : modelType);
-        queryWrapper.orderByAsc("sort");
         List<ModelProviderEntity> providerEntities = modelProviderDao.selectList(queryWrapper);
         return ConvertUtils.sourceToTarget(providerEntities, ModelProviderDTO.class);
     }
@@ -125,6 +124,12 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
         return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class);
     }
 
+    public static void main(String[] args) {
+        String jsonString = "\"[]\"";
+        JSONArray jsonArray = new JSONArray(jsonString);
+        System.out.println("字符串转 JSONArray: " + jsonArray.toString());
+    }
+
     @Override
     public ModelProviderDTO add(ModelProviderDTO modelProviderDTO) {
         UserDetail user = SecurityUser.getUser();

main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java

@@ -90,7 +90,6 @@ public class ShiroConfig {
         filterMap.put("/agent/chat-history/report", "server");
         filterMap.put("/agent/chat-history/download/**", "anon");
         filterMap.put("/agent/chat-summary/**", "server");
-        filterMap.put("/agent/chat-title/**", "server");
         filterMap.put("/agent/play/**", "anon");
         filterMap.put("/voiceClone/play/**", "anon");
         filterMap.put("/**", "oauth2");

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import org.apache.ibatis.annotations.Param;
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 import xiaozhi.modules.sys.vo.SysDictDataItem;
@@ -24,9 +23,4 @@ public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
      * @return 字典类型编码
      */
     String getTypeByTypeId(Long dictTypeId);
-
-    /**
-     * 根据字典数据ID集合获取字典类型编码集合
-     */
-    List<String> getDictTypesByIdList(@Param("dictDataIdList") List<Long> dictDataIdList);
 }

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java

@@ -1,6 +1,9 @@
 package xiaozhi.modules.sys.service.impl;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -20,7 +23,6 @@ import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.sys.dao.SysDictDataDao;
 import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
@@ -102,19 +104,13 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
-        List<Long> idList = Arrays.asList(ids);
-        if (ToolUtil.isNotEmpty(idList)) {
-            //批量删除redis字典
-            List<String> redisKeyList = new ArrayList<>();
-            //批量获取字典类型
-            List<String> dictTypeList = Optional.ofNullable(baseDao.getDictTypesByIdList(idList)).orElseGet(ArrayList::new);
-            dictTypeList.forEach(dictType -> redisKeyList.add(RedisKeys.getDictDataByTypeKey(dictType)));
-            if (ToolUtil.isNotEmpty(redisKeyList)) {
-                //清除缓存
-                redisUtils.delete(redisKeyList);
-            }
-            //批量删除字典数据
-            deleteBatchIds(Arrays.asList(ids));
+        for (Long id : ids) {
+            SysDictDataEntity entity = baseDao.selectById(id);
+            // 删除Redis缓存
+            String dictType = baseDao.getTypeByTypeId(entity.getDictTypeId());
+            redisUtils.delete(RedisKeys.getDictDataByTypeKey(dictType));
+            // 删除
+            deleteById(id);
         }
     }
 

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java

@@ -56,7 +56,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         if (users == null || users.isEmpty()) {
             return null;
         }
-        SysUserEntity entity = users.get(0);
+        SysUserEntity entity = users.getFirst();
         return ConvertUtils.sourceToTarget(entity, SysUserDTO.class);
     }
 
@@ -197,7 +197,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
      */
     private String generatePassword() {
         StringBuilder password = new StringBuilder();
-
+        
         // 确保包含至少一个数字
         password.append("0123456789".charAt(random.nextInt(10)));
         // 确保包含至少一个小写字母
@@ -206,12 +206,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         password.append("ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(random.nextInt(26)));
         // 确保包含至少一个特殊符号
         password.append("!@#$%^&*()".charAt(random.nextInt(10)));
-
+        
         // 生成剩余的8个字符
         for (int i = 4; i < 12; i++) {
             password.append(CHARACTERS.charAt(random.nextInt(CHARACTERS.length())));
         }
-
+        
         // 打乱密码中字符的顺序
         char[] passwordChars = password.toString().toCharArray();
         for (int i = 0; i < passwordChars.length; i++) {
@@ -220,7 +220,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             passwordChars[i] = passwordChars[randomIndex];
             passwordChars[randomIndex] = temp;
         }
-
+        
         return new String(passwordChars);
     }
 

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java

@@ -1,6 +1,10 @@
 package xiaozhi.modules.timbre.service.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -124,13 +128,14 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
         if (StringUtils.isNotBlank(voiceName)) {
             queryWrapper.like("name", voiceName);
         }
-        List<TimbreEntity> timbreEntities = Optional.ofNullable(timbreDao.selectList(queryWrapper)).orElseGet(ArrayList::new);
+        List<TimbreEntity> timbreEntities = timbreDao.selectList(queryWrapper);
+        if (timbreEntities == null) {
+            timbreEntities = new ArrayList<>();
+        }
         List<VoiceDTO> voiceDTOs = timbreEntities.stream()
                 .map(entity -> {
                     VoiceDTO dto = new VoiceDTO(entity.getId(), entity.getName());
                     dto.setVoiceDemo(entity.getVoiceDemo());
-                    dto.setLanguages(entity.getLanguages()); // 设置语言类型
-                    dto.setIsClone(false); // 设置为普通音色
                     return dto;
                 })
                 .collect(Collectors.toList());
@@ -147,8 +152,6 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
                 voiceDTO.setName(MessageUtils.getMessage(ErrorCode.VOICE_CLONE_PREFIX) + entity.getName());
                 // 保留从数据库查询到的voiceDemo字段
                 voiceDTO.setVoiceDemo(entity.getVoiceDemo());
-                voiceDTO.setLanguages(entity.getLanguages());
-                voiceDTO.setIsClone(true); // 设置为克隆音色
                 redisUtils.set(RedisKeys.getTimbreNameById(voiceDTO.getId()), voiceDTO.getName(),
                         RedisUtils.NOT_EXPIRE);
                 voiceDTOs.add(0, voiceDTO);
@@ -211,7 +214,6 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
         TimbreEntity entity = list.get(0);
         VoiceDTO dto = new VoiceDTO(entity.getId(), entity.getName());
         dto.setVoiceDemo(entity.getVoiceDemo());
-        dto.setIsClone(false); // 设置为普通音色
         return dto;
     }
 }

main/manager-api/src/main/java/xiaozhi/modules/voiceclone/controller/VoiceCloneController.java

@@ -83,13 +83,6 @@ public class VoiceCloneController {
                 return new Result<String>().error(ErrorCode.VOICE_CLONE_NOT_AUDIO_FILE);
             }
 
-            // 加强验证文件扩展名
-            String originalFilename = voiceFile.getOriginalFilename();
-            String extension = originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase();
-            if (!extension.equals(".mp3") && !extension.equals(".wav")) {
-                return new Result<String>().error("只允许上传.mp3和.wav格式的文件");
-            }
-
             // 验证文件大小 (最大10MB)
             if (voiceFile.getSize() > 10 * 1024 * 1024) {
                 return new Result<String>().error(ErrorCode.VOICE_CLONE_AUDIO_TOO_LARGE);

main/manager-api/src/main/java/xiaozhi/modules/voiceclone/dto/VoiceCloneDTO.java

@@ -17,7 +17,4 @@ public class VoiceCloneDTO {
 
     @Schema(description = "用户ID")
     private Long userId;
-
-    @Schema(description = "语言")
-    private String languages;
 }

main/manager-api/src/main/java/xiaozhi/modules/voiceclone/dto/VoiceCloneResponseDTO.java

@@ -28,9 +28,6 @@ public class VoiceCloneResponseDTO {
     @Schema(description = "声音id")
     private String voiceId;
 
-    @Schema(description = "语言")
-    private String languages;
-
     @Schema(description = "用户ID（关联用户表）")
     private Long userId;
 

main/manager-api/src/main/java/xiaozhi/modules/voiceclone/entity/VoiceCloneEntity.java

@@ -31,9 +31,6 @@ public class VoiceCloneEntity {
     @Schema(description = "声音id")
     private String voiceId;
 
-    @Schema(description = "语言")
-    private String languages;
-
     @Schema(description = "用户 ID（关联用户表）")
     private Long userId;
 

main/manager-api/src/main/java/xiaozhi/modules/voiceclone/service/impl/VoiceCloneServiceImpl.java

@@ -4,8 +4,12 @@ import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -26,11 +30,8 @@ import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.DateUtils;
-import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.model.service.ModelConfigService;
-import xiaozhi.modules.sys.dao.SysUserDao;
-import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.service.SysUserService;
 import xiaozhi.modules.voiceclone.dao.VoiceCloneDao;
 import xiaozhi.modules.voiceclone.dto.VoiceCloneDTO;
@@ -46,7 +47,6 @@ public class VoiceCloneServiceImpl extends BaseServiceImpl<VoiceCloneDao, VoiceC
 
     private final ModelConfigService modelConfigService;
     private final SysUserService sysUserService;
-    private final SysUserDao sysUserDao;
     private final ObjectMapper objectMapper;
 
     @Override
@@ -104,11 +104,9 @@ public class VoiceCloneServiceImpl extends BaseServiceImpl<VoiceCloneDao, VoiceC
             }
         }
 
-        // 批量保存
-        List<VoiceCloneEntity> batchInsertList = new ArrayList<>();
         // 遍历选择的音色ID，为每个音色ID创建一条记录
         int index = 0;
-        String namePrefix = DateUtils.format(new Date(), "MMddHHmm");
+        String namePrefix = DateUtils.format(new java.util.Date(), "MMddHHmm");
         for (String voiceId : dto.getVoiceIds()) {
             index++;
             VoiceCloneEntity entity = new VoiceCloneEntity();
@@ -116,12 +114,9 @@ public class VoiceCloneServiceImpl extends BaseServiceImpl<VoiceCloneDao, VoiceC
             entity.setVoiceId(voiceId);
             entity.setName(namePrefix + "_" + index);
             entity.setUserId(dto.getUserId());
-            entity.setLanguages(dto.getLanguages());
             entity.setTrainStatus(0); // 默认训练中
-            batchInsertList.add(entity);
-        }
-        if (ToolUtil.isNotEmpty(batchInsertList)) {
-            insertBatch(batchInsertList);
+
+            baseDao.insert(entity);
         }
     }
 
@@ -192,11 +187,6 @@ public class VoiceCloneServiceImpl extends BaseServiceImpl<VoiceCloneDao, VoiceC
 
         List<VoiceCloneResponseDTO> dtoList = new ArrayList<>(entityList.size());
 
-        // 获取用户名称ID集合
-        Set<Long> userIdList = entityList.stream().map(VoiceCloneEntity::getUserId).collect(Collectors.toSet());
-        List<SysUserEntity> userList = sysUserDao.selectList(new QueryWrapper<SysUserEntity>().in("id", userIdList));
-        Map<Long, String> userMap = userList.stream().collect(Collectors.toMap(SysUserEntity::getId, SysUserEntity::getUsername));
-
         // 转换每个实体为DTO
         for (VoiceCloneEntity entity : entityList) {
             VoiceCloneResponseDTO dto = ConvertUtils.sourceToTarget(entity, VoiceCloneResponseDTO.class);
@@ -208,7 +198,7 @@ public class VoiceCloneServiceImpl extends BaseServiceImpl<VoiceCloneDao, VoiceC
 
             // 设置用户名称
             if (entity.getUserId() != null) {
-                dto.setUserName(userMap.get(entity.getUserId()));
+                dto.setUserName(sysUserService.getByUserId(entity.getUserId()).getUsername());
             }
             
             // 确保trainStatus字段被正确设置，前端需要这个字段来判断是否为克隆音频

main/manager-api/src/main/resources/db/changelog/202512301430.sql

@@ -1,94 +0,0 @@
--- 添加阿里百炼Paraformer实时语音识别服务配置
-delete from `ai_model_provider` where id = 'SYSTEM_ASR_AliyunBLStream';
-INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
-('SYSTEM_ASR_AliyunBLStream', 'ASR', 'aliyunbl_stream', '阿里百炼Paraformer实时语音识别', '[{"key":"api_key","label":"API密钥","type":"password"},{"key":"model","label":"模型名称","type":"string"},{"key":"format","label":"音频格式","type":"string"},{"key":"sample_rate","label":"采样率","type":"number"},{"key":"output_dir","label":"输出目录","type":"string"}]', 18, 1, NOW(), 1, NOW());
-
-delete from `ai_model_config` where id = 'ASR_AliyunBLStream';
-INSERT INTO `ai_model_config` VALUES ('ASR_AliyunBLStream', 'ASR', 'AliyunBLStream', '阿里百炼Paraformer实时语音识别', 0, 1, '{"type": "aliyunbl_stream", "api_key": "", "model": "paraformer-realtime-v2", "format": "pcm", "sample_rate": 16000, "disfluency_removal_enabled": false, "semantic_punctuation_enabled": false, "max_sentence_silence": 200, "multi_threshold_mode_enabled": false, "punctuation_prediction_enabled": true, "inverse_text_normalization_enabled": true, "output_dir": "tmp/"}', 'https://help.aliyun.com/zh/model-studio/websocket-for-paraformer-real-time-service', '支持多语言、热词定制、语义断句等高级功能', 21, NULL, NULL, NULL, NULL);
-
--- 更新阿里百炼Paraformer模型配置的说明文档
-UPDATE `ai_model_config` SET
-`doc_link` = 'https://help.aliyun.com/zh/model-studio/websocket-for-paraformer-real-time-service',
-`remark` = '阿里百炼Paraformer实时语音识别配置说明：
-1. 登录阿里云百炼平台 https://bailian.console.aliyun.com/
-2. 创建API-KEY https://bailian.console.aliyun.com/#/api-key
-3. 支持模型：paraformer-realtime-v2(推荐)、paraformer-realtime-8k-v2、paraformer-realtime-v1、paraformer-realtime-8k-v1
-4. 功能特性：
-   - 多语言支持(中文含方言、英文、日语、韩语、德语、法语、俄语)
-   - 热词定制(vocabulary_id参数)，详细说明请参考：https://help.aliyun.com/zh/model-studio/custom-hot-words?
-   - 语义断句/VAD断句(semantic_punctuation_enabled参数)
-   - 自动标点符号、ITN、过滤语气词等
-5. 参数说明：
-   - model: 模型名称，推荐paraformer-realtime-v2
-   - sample_rate: 采样率(Hz)，v2支持任意采样率，v1仅支持16000，8k版本仅支持8000
-   - semantic_punctuation_enabled: false为VAD断句(低延迟)，true为语义断句(高准确)
-   - max_sentence_silence: VAD断句静音时长阈值(200-6000ms)
-' WHERE `id` = 'ASR_AliyunBLStream';
-
-
--- 更新豆包流式ASR供应器，增加配置
-delete from `ai_model_provider` where id = 'SYSTEM_ASR_DoubaoStreamASR';
-INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
-('SYSTEM_ASR_DoubaoStreamASR', 'ASR', 'doubao_stream', '火山引擎语音识别(流式)', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"cluster","label":"集群","type":"string"},{"key":"boosting_table_name","label":"热词文件名称","type":"string"},{"key":"correct_table_name","label":"替换词文件名称","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"end_window_size","label":"静音判定时长(ms)","type":"number"},{"key":"enable_multilingual","label":"是否开启多语种识别模式","type":"boolean"},{"key":"language","label":"指定语言编码","type":"string"}]', 3, 1, NOW(), 1, NOW());
-UPDATE `ai_model_config` SET 
-`remark` = '豆包ASR配置说明：
-1. 豆包ASR和豆包(流式)ASR的区别是：豆包ASR是按次收费，豆包(流式)ASR是按时收费
-2. 一般来说按次收费的更便宜，但是豆包(流式)ASR使用了大模型技术，效果更好
-3. 需要在火山引擎控制台创建应用并获取appid和access_token
-4. 支持中文语音识别
-5. 需要网络连接
-6. 输出文件保存在tmp/目录
-申请步骤：
-1. 访问 https://console.volcengine.com/speech/app
-2. 创建新应用
-3. 获取appid和access_token
-4. 填入配置文件中
-如需设置热词，请参考：https://www.volcengine.com/docs/6561/155738
-如开启多语种识别模式，请设置language当该键为空时，该模型支持中英文、上海话、闽南语，四川、陕西、粤语识别。其他语种请参考：https://www.volcengine.com/docs/6561/1354869
-' WHERE `id` = 'ASR_DoubaoStreamASR';
-
--- 更新豆包流式ASR模型配置，增加enable_multilingual默认值
-UPDATE `ai_model_config` SET
-`config_json` = JSON_SET(
-    `config_json`, 
-    '$.enable_multilingual', false,
-    '$.language', 'zh-CN'
-)
-WHERE `id` = 'ASR_DoubaoStreamASR' 
-AND JSON_EXTRACT(`config_json`, '$.enable_multilingual') IS NULL 
-AND JSON_EXTRACT(`config_json`, '$.language') IS NULL;
-
-
--- 更新HuoshanDoubleStreamTTS供应器配置，增加多情感音色参数
-UPDATE `ai_model_provider`
-SET `fields` = '[{"key": "ws_url", "type": "string", "label": "WebSocket地址"}, {"key": "appid", "type": "string", "label": "应用ID"}, {"key": "access_token", "type": "string", "label": "访问令牌"}, {"key": "resource_id", "type": "string", "label": "资源ID"}, {"key": "speaker", "type": "string", "label": "默认音色"}, {"key": "enable_ws_reuse", "type": "boolean", "label": "是否开启链接复用", "default": true}, {"key": "speech_rate", "type": "number", "label": "语速(-50~100)"}, {"key": "loudness_rate", "type": "number", "label": "音量(-50~100)"}, {"key": "pitch", "type": "number", "label": "音高(-12~12)"}, {"key": "emotion_scale", "type": "number", "label": "情感强度(1-5)"}, {"key": "emotion", "type": "string", "label": "情感类型"}]'
-WHERE `id` = 'SYSTEM_TTS_HSDSTTS';
-
--- 更新默认值
-UPDATE `ai_model_config` SET
-`config_json` = JSON_SET(
-    `config_json`,
-    '$.emotion', 'neutral',
-    '$.emotion_scale', 4
-)
-WHERE `id` = 'TTS_HuoshanDoubleStreamTTS'
-AND JSON_EXTRACT(`config_json`, '$.emotion') IS NULL 
-AND JSON_EXTRACT(`config_json`, '$.emotion_scale') IS NULL;
-
--- 增加文档链接和备注
-UPDATE `ai_model_config` SET 
-`doc_link` = 'https://console.volcengine.com/speech/service/10007',
-`remark` = '火山引擎语音合成服务配置说明：
-1. 访问 https://www.volcengine.com/ 注册并开通火山引擎账号
-2. 访问 https://console.volcengine.com/speech/service/10007 开通语音合成大模型，购买音色
-3. 在页面底部获取appid和access_token
-5. 资源ID固定为：volc.service_type.10029（大模型语音合成及混音）
-6. 链接复用：开启WebSocket连接复用，默认true减少链接损耗（注意：复用后设备处于聆听状态时空闲链接会占并发数）
-7. 语速：-50~100，可不填，正常默认值0，可填-50~100
-8. 音量：-50~100，可不填，正常默认值0，可填-50~100
-9. 音高：-12~12，可不填，正常默认值0，可填-12~12
-10. 多情感参数（当前仅部分音色支持设置情感）：
-   相关音色列表：https://www.volcengine.com/docs/6561/1257544
-    - emotion_scale：情感强度，可选值为：1~5，默认值为4
-    - emotion：情感类型，可选值为：neutral、happy、sad、angry、fearful、disgusted、surprised
-' WHERE `id` = 'TTS_HuoshanDoubleStreamTTS';