@@ -145,23 +140,23 @@ Spearheaded by Professor Siyuan Liu's Team (South China University of Technology
-
+
-
-
+
-
-
+
-
@@ -188,8 +183,8 @@ Spearheaded by Professor Siyuan Liu's Team (South China University of Technology
#### 🚀 部署方式选择
| 部署方式 | 特点 | 适用场景 | 部署文档 | 配置要求 | 视频教程 |
|---------|------|---------|---------|---------|---------|
-| **最简化安装** | 智能对话、IOT、MCP、视觉感知 | 低配置环境，数据存储在配置文件，无需数据库 | [①Docker版](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②源码部署](./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)| 如果使用`FunASR`要2核4G，如果全API，要2核2G | - |
-| **全模块安装** | 智能对话、IOT、MCP接入点、声纹识别、视觉感知、OTA、智控台 | 完整功能体验，数据存储在数据库 |[①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) / [②源码部署](./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) / [③源码部署自动更新教程](./docs/dev-ops-integration.md) | 如果使用`FunASR`要4核8G，如果全API，要2核4G| [本地源码启动视频教程](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
+| **最简化安装** | 智能对话、单智能体管理 | 低配置环境，数据存储在配置文件，无需数据库 | [①Docker版](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②源码部署](./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)| 如果使用`FunASR`要2核4G，如果全API，要2核2G | - |
+| **全模块安装** | 智能对话、多用户管理、多智能体管理、智控台界面操作 | 完整功能体验，数据存储在数据库 |[①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) / [②源码部署](./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) / [③源码部署自动更新教程](./docs/dev-ops-integration.md) | 如果使用`FunASR`要4核8G，如果全API，要2核4G| [本地源码启动视频教程](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
常见问题及相关教程，可参考[这个链接](./docs/FAQ.md)
@@ -216,10 +211,10 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
| 模块名称 | 入门全免费设置 | 流式配置 |
|:---:|:---:|:---:|
-| ASR(语音识别) | FunASR(本地) | 👍FunASR(本地GPU模式) |
-| LLM(大模型) | ChatGLMLLM(智谱glm-4-flash) | 👍AliLLM(qwen3-235b-a22b-instruct-2507) 或 👍DoubaoLLM(doubao-1-5-pro-32k-250115) |
-| VLLM(视觉大模型) | ChatGLMVLLM(智谱glm-4v-flash) | 👍QwenVLVLLM(千问qwen2.5-vl-3b-instructh) |
-| TTS(语音合成) | ✅LinkeraiTTS(灵犀流式) | 👍HuoshanDoubleStreamTTS(火山双流式语音合成) 或 👍AliyunStreamTTS(阿里云流式语音合成) |
+| ASR(语音识别) | FunASR(本地) | 👍XunfeiStreamASR(讯飞流式) |
+| LLM(大模型) | glm-4-flash(智谱) | 👍qwen-flash(阿里百炼) |
+| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen2.5-vl-3b-instructh(阿里百炼) |
+| TTS(语音合成) | ✅LinkeraiTTS(灵犀流式) | 👍HuoshanDoubleStreamTTS(火山流式) |
| Intent(意图识别) | function_call(函数调用) | function_call(函数调用) |
| Memory(记忆功能) | mem_local_short(本地短期记忆） | mem_local_short（本地短期记忆） |
@@ -241,15 +236,17 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
| 功能模块 | 描述 |
|:---:|:---|
-| 核心架构 | 基于WebSocket和HTTP服务器，提供完整的控制台管理和认证系统 |
+| 核心架构 | 基于[MQTT+UDP网关](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md)、WebSocket、HTTP服务器，提供完整的控制台管理和认证系统 |
| 语音交互 | 支持流式ASR(语音识别)、流式TTS(语音合成)、VAD(语音活动检测)，支持多语言识别和语音处理 |
| 声纹识别 | 支持多用户声纹注册、管理和识别，与ASR并行处理，实时识别说话人身份并传递给LLM进行个性化回应 |
| 智能对话 | 支持多种LLM(大语言模型)，实现智能对话 |
| 视觉感知 | 支持多种VLLM(视觉大模型)，实现多模态交互 |
-| 意图识别 | 支持LLM意图识别、Function Call函数调用，提供插件化意图处理机制 |
+| 意图识别 | 支持外挂的大模型意图识别、大模型自主函数调用，提供插件化意图处理机制 |
| 记忆系统 | 支持本地短期记忆、mem0ai接口记忆，具备记忆总结功能 |
+| 知识库 | 支持RAGFlow知识库，让大模型判断需要调度知识库后再回答 |
| 工具调用 | 支持客户端IOT协议、客户MCP协议、服务端MCP协议、MCP接入点协议、自定义工具函数 |
-| 管理后台 | 提供Web管理界面，支持用户管理、系统配置和设备管理 |
+| 指令下发 | 依托MQTT协议，支持从智控台将MCP指令下发到ESP32设备 |
+| 管理后台 | 提供Web管理界面，支持用户管理、系统配置和设备管理；界面支持中文简体、中文繁体、英文显示 |
| 测试工具 | 提供性能测试工具、视觉模型测试工具和音频交互测试工具 |
| 部署支持 | 支持Docker部署和本地部署，提供完整的配置文件管理 |
| 插件系统 | 支持功能插件扩展、自定义插件开发和插件热加载 |
@@ -263,13 +260,7 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
---
## 产品生态 👬
-小智是一个生态，当你使用这个产品时，也可以看看其他在这个生态圈的优秀项目
-
-| 项目名称 | 项目地址 | 项目描述 |
-|:---------------------|:--------|:--------|
-| 小智安卓客户端 | [xiaozhi-android-client](https://github.com/TOM88812/xiaozhi-android-client) | 一个基于xiaozhi-server的Android、IOS语音对话应用,支持实时语音交互和文字对话。Xiaozhi Backend-Service xiaozhi-esp32-server
+
+
+Dieses Projekt basiert auf der Theorie und Technologie der Mensch-Maschine-symbiotischen Intelligenz zur Entwicklung intelligenter Terminal-Hardware- und Software-Systemexiaozhi-esp32 Xiaozhi-Kommunikationsprotokoll
+
+
+Häufige Fragen
+· Probleme melden
+· Deployment-Dokumentation
+· Release-Hinweise
+
+
+
+
+
+
+
+
+
+
+
+
+Geleitet vom Team von Professor Siyuan Liu (South China University of Technology)
+
+刘思源教授团队主导研发(华南理工大学)
+
+
+
+---
+
+## Zielgruppe 👥
+
+Dieses Projekt erfordert ESP32-Hardware-Geräte zum Betrieb. Wenn Sie ESP32-bezogene Hardware erworben haben, erfolgreich eine Verbindung zu Brother Xias bereitgestelltem Backend-Service hergestellt haben und Ihren eigenen `xiaozhi-esp32`-Backend-Service unabhängig aufbauen möchten, dann ist dieses Projekt perfekt für Sie.
+
+Möchten Sie die Nutzungseffekte sehen? Klicken Sie auf die Videos unten 🎥
+
+
+
+---
+
+## Warnungen ⚠️
+
+1. Dieses Projekt ist Open-Source-Software. Diese Software hat keine kommerzielle Partnerschaft mit Drittanbieter-API-Dienstleistern (einschließlich, aber nicht beschränkt auf Spracherkennung, große Modelle, Sprachsynthese und andere Plattformen), mit denen sie sich verbindet, und bietet keine Garantie für deren Servicequalität oder finanzielle Sicherheit. Es wird empfohlen, dass Benutzer Dienstleister mit entsprechenden Geschäftslizenzen bevorzugen und deren Servicevereinbarungen und Datenschutzrichtlinien sorgfältig lesen. Diese Software hostet keine Kontoschlüssel, nimmt nicht an Geldströmen teil und trägt nicht das Risiko von Verlusten bei Guthaben-Aufladungen.
+
+2. Die Funktionalität dieses Projekts ist nicht vollständig und hat keine Netzwerksicherheitsbewertung bestanden. Bitte verwenden Sie es nicht in Produktionsumgebungen. Wenn Sie dieses Projekt zu Lernzwecken in einer öffentlichen Netzwerkumgebung bereitstellen, stellen Sie bitte sicher, dass notwendige Schutzmaßnahmen vorhanden sind.
+
+---
+
+## Deployment-Dokumentation
+
+
+
+Dieses Projekt bietet zwei Bereitstellungsmethoden. Bitte wählen Sie basierend auf Ihren spezifischen Anforderungen:
+
+#### 🚀 Auswahl der Bereitstellungsmethode
+| Bereitstellungsmethode | Funktionen | Anwendungsszenarien | Deployment-Dokumente | Konfigurationsanforderungen | Video-Tutorials |
+|---------|------|---------|---------|---------|---------|
+| **Vereinfachte Installation** | Intelligenter Dialog, Einzel-Agenten-Verwaltung | Umgebungen mit geringer Konfiguration, Daten in Konfigurationsdateien gespeichert, keine Datenbank erforderlich | [①Docker-Version](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②Quellcode-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 Kerne 4GB bei Verwendung von `FunASR`, 2 Kerne 2GB bei allen APIs | - |
+| **Vollständige Modulinstallation** | Intelligenter Dialog, Mehrbenutzerverwaltung, Mehr-Agenten-Verwaltung, Intelligente Steuerkonsole-Bedienung | Vollständige Funktionserfahrung, Daten in Datenbank gespeichert |[①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) / [②Quellcode-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) / [③Quellcode-Deployment Auto-Update-Tutorial](./docs/dev-ops-integration.md) | 4 Kerne 8GB bei Verwendung von `FunASR`, 2 Kerne 4GB bei allen APIs| [Video-Tutorial für lokalen Quellcode-Start](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
+
+Häufige Fragen und entsprechende Tutorials finden Sie unter [diesem Link](./docs/FAQ.md)
+
+> 💡 Hinweis: Unten ist eine Testplattform, die mit dem neuesten Code bereitgestellt wurde. Sie können bei Bedarf brennen und testen. Gleichzeitige Benutzer: 6, Daten werden täglich gelöscht.
+
+```
+Adresse der intelligenten Steuerkonsole: https://2662r3426b.vicp.fun
+Adresse der intelligenten Steuerkonsole (H5): https://2662r3426b.vicp.fun/h5/index.html
+
+Service-Testtool: https://2662r3426b.vicp.fun/test/
+OTA-Schnittstellenadresse: https://2662r3426b.vicp.fun/xiaozhi/ota/
+Websocket-Schnittstellenadresse: wss://2662r3426b.vicp.fun/xiaozhi/v1/
+```
+
+#### 🚩 Konfigurationsbeschreibung und Empfehlungen
+> [!Note]
+> Dieses Projekt bietet zwei Konfigurationsschemata:
+>
+> 1. `Einstiegslevel Kostenlose Einstellungen`: Geeignet für den persönlichen und privaten Gebrauch, alle Komponenten verwenden kostenlose Lösungen, keine zusätzliche Zahlung erforderlich.
+>
+> 2. `Streaming-Konfiguration`: Geeignet für Demonstrationen, Schulungen, Szenarien mit mehr als 2 gleichzeitigen Benutzern usw. Verwendet Streaming-Verarbeitungstechnologie für schnellere Reaktionsgeschwindigkeit und bessere Erfahrung.
+>
+> Ab Version `0.5.2` unterstützt das Projekt Streaming-Konfiguration. Im Vergleich zu früheren Versionen ist die Reaktionsgeschwindigkeit um ca. `2,5 Sekunden` verbessert, was die Benutzererfahrung erheblich verbessert.
+
+| Modulname | Einstiegslevel Kostenlose Einstellungen | Streaming-Konfiguration |
+|:---:|:---:|:---:|
+| 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) | 👍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) |
+
+Wenn Sie sich um die Latenz jeder Komponente kümmern, lesen Sie bitte den [Xiaozhi-Komponenten-Leistungstestbericht](https://github.com/xinnan-tech/xiaozhi-performance-research). Sie können gemäß den Testmethoden im Bericht in Ihrer Umgebung tatsächlich testen.
+
+#### 🔧 Testwerkzeuge
+Dieses Projekt bietet die folgenden Testwerkzeuge, um Ihnen bei der Überprüfung des Systems und der Auswahl geeigneter Modelle zu helfen:
+
+| Werkzeugname | Standort | Verwendungsmethode | Funktionsbeschreibung |
+|:---:|:---|:---:|:---:|
+| Audio-Interaktionstesttool | main》xiaozhi-server》test》test_page.html | Direkt mit Google Chrome öffnen | Testet Audio-Wiedergabe- und Empfangsfunktionen, überprüft, ob die Python-seitige Audioverarbeitung normal ist |
+| Modell-Reaktionstesttool | main》xiaozhi-server》performance_tester.py | Ausführen `python performance_tester.py` | Testet die Reaktionsgeschwindigkeit von ASR (Spracherkennung), LLM (großes Modell), VLLM (Vision-Modell), TTS (Sprachsynthese) drei Kernmodulen |
+
+> 💡 Hinweis: Beim Testen der Modellgeschwindigkeit werden nur Modelle mit konfigurierten Schlüsseln getestet.
+
+---
+## Funktionsliste ✨
+### Implementiert ✅
+
+| Funktionsmodul | Beschreibung |
+|:---:|:---|
+| Kernarchitektur | Basierend auf [MQTT+UDP-Gateway](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md), WebSocket und HTTP-Servern, bietet vollständiges Konsolenverwaltungs- und Authentifizierungssystem |
+| Sprachinteraktion | Unterstützt Streaming-ASR (Spracherkennung), Streaming-TTS (Sprachsynthese), VAD (Sprachaktivitätserkennung), unterstützt mehrsprachige Erkennung und Sprachverarbeitung |
+| Stimmabdruckerkennung | Unterstützt Mehrbenutzer-Stimmabdruckregistrierung, -verwaltung und -erkennung, verarbeitet parallel mit ASR, Echtzeit-Sprecheridentitätserkennung und Weitergabe an LLM für personalisierte Antworten |
+| 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, 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 |
+| Verwaltungs-Backend | Bietet Web-Verwaltungsoberfläche, unterstützt Benutzerverwaltung, Systemkonfiguration und Geräteverwaltung; Oberfläche unterstützt vereinfachtes Chinesisch, traditionelles Chinesisch und englische Anzeige |
+| Testwerkzeuge | Bietet Leistungstestwerkzeuge, Vision-Modell-Testwerkzeuge und Audio-Interaktionstestwerkzeuge |
+| Deployment-Unterstützung | Unterstützt Docker-Deployment und lokales Deployment, bietet vollständige Konfigurationsdateiverwaltung |
+| Plugin-System | Unterstützt funktionale Plugin-Erweiterungen, benutzerdefinierte Plugin-Entwicklung und Plugin-Hot-Loading |
+
+### In Entwicklung 🚧
+
+Um über spezifische Entwicklungsplanfortschritte zu erfahren, [klicken Sie hier](https://github.com/users/xinnan-tech/projects/3). Häufige Fragen und entsprechende Tutorials finden Sie unter [diesem Link](./docs/FAQ.md)
+
+Wenn Sie ein Softwareentwickler sind, finden Sie hier einen [Offenen Brief an Entwickler](docs/contributor_open_letter.md). Willkommen beim Beitritt!
+
+---
+
+## 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?tab=readme-ov-file#related-open-source-projects) in diesem Ökosystem ansehen
+
+---
+
+## Liste der von diesem Projekt unterstützten Plattformen/Komponenten 📋
+### LLM-Sprachmodelle
+
+| Verwendungsmethode | Unterstützte Plattformen | Kostenlose Plattformen |
+|:---:|:---:|:---:|
+| OpenAI-Schnittstellenaufrufe | Alibaba Bailian, Volcano Engine Doubao, DeepSeek, Zhipu ChatGLM, Gemini | Zhipu ChatGLM, Gemini |
+| Ollama-Schnittstellenaufrufe | Ollama | - |
+| Dify-Schnittstellenaufrufe | Dify | - |
+| FastGPT-Schnittstellenaufrufe | FastGPT | - |
+| Coze-Schnittstellenaufrufe | Coze | - |
+| Xinference-Schnittstellenaufrufe | Xinference | - |
+| HomeAssistant-Schnittstellenaufrufe | HomeAssistant | - |
+
+Tatsächlich kann jedes LLM, das OpenAI-Schnittstellenaufrufe unterstützt, integriert und verwendet werden.
+
+---
+
+### VLLM-Vision-Modelle
+
+| Verwendungsmethode | Unterstützte Plattformen | Kostenlose Plattformen |
+|:---:|:---:|:---:|
+| OpenAI-Schnittstellenaufrufe | Alibaba Bailian, Zhipu ChatGLMVLLM | Zhipu ChatGLMVLLM |
+
+Tatsächlich kann jedes VLLM, das OpenAI-Schnittstellenaufrufe unterstützt, integriert und verwendet werden.
+
+---
+
+### TTS-Sprachsynthese
+
+| Verwendungsmethode | Unterstützte Plattformen | Kostenlose Plattformen |
+|:---:|:---:|:---:|
+| Schnittstellenaufrufe | EdgeTTS, Volcano Engine Doubao TTS, Tencent Cloud, Alibaba Cloud TTS, AliYun Stream TTS, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS, Lingxi Streaming TTS, MinimaxTTS, Volcano Dual-Stream TTS | Lingxi Streaming TTS, EdgeTTS, CosyVoiceSiliconflow (teilweise) |
+| Lokale Dienste | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, Index-TTS, PaddleSpeech | Index-TTS, PaddleSpeech, FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3 |
+
+---
+
+### VAD-Sprachaktivitätserkennung
+
+| Typ | Plattformname | Verwendungsmethode | Preismodell | Hinweise |
+|:---:|:---------:|:----:|:----:|:--:|
+| VAD | SileroVAD | Lokale Verwendung | Kostenlos | |
+
+---
+
+### ASR-Spracherkennung
+
+| Verwendungsmethode | Unterstützte Plattformen | Kostenlose Plattformen |
+|:---:|:---:|:---:|
+| Lokale Verwendung | FunASR, SherpaASR | FunASR, SherpaASR |
+| Schnittstellenaufrufe | DoubaoASR, Doubao Streaming ASR, FunASRServer, TencentASR, AliyunASR, Aliyun Streaming ASR, Baidu ASR, OpenAI ASR | FunASRServer |
+
+---
+
+### Voiceprint-Stimmabdruckerkennung
+
+| Verwendungsmethode | Unterstützte Plattformen | Kostenlose Plattformen |
+|:---:|:---:|:---:|
+| Lokale Verwendung | 3D-Speaker | 3D-Speaker |
+
+---
+
+### Memory-Gedächtnisspeicher
+
+| Typ | Plattformname | Verwendungsmethode | Preismodell | Hinweise |
+|:------:|:---------------:|:----:|:---------:|:--:|
+| Memory | mem0ai | Schnittstellenaufrufe | 1000 Mal/Monat Kontingent | |
+| Memory | mem_local_short | Lokale Zusammenfassung | Kostenlos | |
+| Memory | nomem | Kein Gedächtnismodus | Kostenlos | |
+
+---
+
+### Intent-Absichtserkennung
+
+| Typ | Plattformname | Verwendungsmethode | Preismodell | Hinweise |
+|:------:|:-------------:|:----:|:-------:|:---------------------:|
+| Intent | intent_llm | Schnittstellenaufrufe | Basierend auf LLM-Preisen | Erkennt Absicht durch große Modelle, starke Allgemeingültigkeit |
+| Intent | function_call | Schnittstellenaufrufe | Basierend auf LLM-Preisen | Vervollständigt Absicht durch Funktionsaufruf großer Modelle, schnelle Geschwindigkeit, guter Effekt |
+| Intent | nointent | Kein Absichtsmodus | Kostenlos | Führt keine Absichtserkennung durch, gibt direkt Dialogergebnis zurück |
+
+---
+
+### Rag Retrieval Augmented Generation
+
+| Typ | Plattformname | Verwendungsmethode | Preismodell | Hinweise |
+|:------:|:-------------:|:----:|:-------:|:---------------------:|
+| Rag | ragflow | Schnittstellenaufrufe | Gebühren basierend auf Token-Verbrauch für Segmentierung und Tokenisierung | Nutzt RAGFlow's Retrieval-Augmented-Generation-Funktion für präzisere Dialogantworten |
+
+---
+
+## Danksagungen 🙏
+
+| Logo | Projekt/Unternehmen | Beschreibung |
+|:---:|:---:|:---|
+|
+
+
+
+
diff --git a/README_en.md b/README_en.md
index 5432eae8..196cf16f 100644
--- a/README_en.md
+++ b/README_en.md
@@ -6,29 +6,24 @@
This project is based on human-machine symbiotic intelligence theory and technology to develop intelligent terminal hardware and software systemsxiaozhi-esp32 Xiaozhi Communication Protocol
-中文
-· FAQ
+FAQ
· Report Issues
· Deployment Docs
· Release Notes
+
+
-
-
-
-
-
-
@@ -58,72 +53,72 @@ Want to see the usage effects? Click the videos below 🎥
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -132,35 +127,35 @@ Want to see the usage effects? Click the videos below 🎥
-
-
-
+
-
-
+
-
-
+
-
@@ -186,8 +181,8 @@ This project provides two deployment methods. Please choose based on your specif
#### 🚀 Deployment Method Selection
| Deployment Method | Features | Applicable Scenarios | Deployment Docs | Configuration Requirements | Video Tutorials |
|---------|------|---------|---------|---------|---------|
-| **Simplified Installation** | Intelligent dialogue, IOT, MCP, visual perception | 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, IOT, MCP endpoints, voiceprint recognition, visual perception, OTA, intelligent control console | 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) |
+| **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) |
> 💡 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.
@@ -213,10 +208,10 @@ Websocket Interface Address: wss://2662r3426b.vicp.fun/xiaozhi/v1/
| Module Name | Entry Level Free Settings | Streaming Configuration |
|:---:|:---:|:---:|
-| ASR(Speech Recognition) | FunASR(Local) | 👍FunASRServer or 👍DoubaoStreamASR |
-| LLM(Large Model) | ChatGLMLLM(Zhipu glm-4-flash) | 👍DoubaoLLM(Volcano doubao-1-5-pro-32k-250115) |
-| VLLM(Vision Large Model) | ChatGLMVLLM(Zhipu glm-4v-flash) | 👍QwenVLVLLM(Qwen qwen2.5-vl-3b-instructh) |
-| TTS(Speech Synthesis) | ✅LinkeraiTTS(Lingxi streaming) | 👍HuoshanDoubleStreamTTS(Volcano dual-stream speech synthesis) |
+| 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) | 👍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) |
@@ -237,15 +232,17 @@ This project provides the following testing tools to help you verify the system
| Feature Module | Description |
|:---:|:---|
-| Core Architecture | Based on WebSocket and HTTP servers, provides complete console management and authentication system |
+| Core Architecture | Based on [MQTT+UDP gateway](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md), WebSocket and HTTP servers, provides complete console management and authentication system |
| Voice Interaction | Supports streaming ASR(speech recognition), streaming TTS(speech synthesis), VAD(voice activity detection), supports multi-language recognition and voice processing |
| Voiceprint Recognition | Supports multi-user voiceprint registration, management, and recognition, processes in parallel with ASR, real-time speaker identity recognition and passes to LLM for personalized responses |
| 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, 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 |
+| 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 |
+| 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 |
| Plugin System | Supports functional plugin extensions, custom plugin development, and plugin hot-loading |
@@ -259,7 +256,7 @@ If you are a software developer, here is an [Open Letter to Developers](docs/con
---
## Product Ecosystem 👬
-Xiaozhi is an ecosystem. When using this product, you can also check out other excellent projects 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 |
|:---------------------|:--------|:--------|
@@ -274,13 +271,13 @@ Xiaozhi is an ecosystem. When using this product, you can also check out other e
| Usage Method | Supported Platforms | Free Platforms |
|:---:|:---:|:---:|
-| OpenAI interface calls | Alibaba Bailian, Volcano Engine Doubao, DeepSeek, Zhipu ChatGLM, Gemini | Zhipu ChatGLM, Gemini |
+| OpenAI interface calls | Alibaba Bailian, Volcano Engine, DeepSeek, Zhipu, Gemini, iFLYTEK | Zhipu, Gemini |
| Ollama interface calls | Ollama | - |
| Dify interface calls | Dify | - |
| FastGPT interface calls | FastGPT | - |
| Coze interface calls | Coze | - |
-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.
---
@@ -298,7 +295,7 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
| Usage Method | Supported Platforms | Free Platforms |
|:---:|:---:|:---:|
-| Interface calls | EdgeTTS, Volcano Engine Doubao TTS, Tencent Cloud, Alibaba Cloud TTS, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS, Lingxi Streaming TTS | Lingxi Streaming TTS, EdgeTTS, CosyVoiceSiliconflow(partial) |
+| 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, MinimaxTTS | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, MinimaxTTS |
---
@@ -316,7 +313,7 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
| Usage Method | Supported Platforms | Free Platforms |
|:---:|:---:|:---:|
| Local use | FunASR, SherpaASR | FunASR, SherpaASR |
-| Interface calls | DoubaoASR, FunASRServer, TencentASR, AliyunASR | FunASRServer |
+| Interface calls | FunASRServer, Volcano Engine, iFLYTEK, Tencent Cloud, Alibaba Cloud, Baidu Cloud, OpenAI ASR | FunASRServer |
---
@@ -346,6 +343,14 @@ In fact, any VLLM that supports OpenAI interface calls can be integrated and use
---
+### Rag Retrieval-Augmented Generation
+
+| Type | Platform Name | Usage Method | Pricing Model | Notes |
+|:------:|:-------------:|:----:|:-------:|:---------------------:|
+| Rag | ragflow | Interface calls | Charged based on tokens consumed for slicing and word segmentation | Utilizes RagFlow's retrieval-augmented generation feature to provide more accurate dialog responses |
+
+---
+
## Acknowledgments 🙏
| Logo | Project/Company | Description |
diff --git a/README_vi.md b/README_vi.md
new file mode 100644
index 00000000..e6d5f489
--- /dev/null
+++ b/README_vi.md
@@ -0,0 +1,375 @@
+[](https://github.com/xinnan-tech/xiaozhi-esp32-server)
+
+Dịch vụ Backend Xiaozhi xiaozhi-esp32-server
+
+
+Dự án này dựa trên lý thuyết và công nghệ trí tuệ cộng sinh người-máy để phát triển hệ thống phần mềm và phần cứng thiết bị đầu cuối thông minhxiaozhi-esp32 giao thức truyền thông Xiaozhi
+
+
+Câu hỏi thường gặp
+· Báo cáo vấn đề
+· Tài liệu triển khai
+· Nhật ký cập nhật
+
+
+
+
+
+
+
+
+
+
+
+
+Spearheaded by Professor Siyuan Liu's Team (South China University of Technology)
+
+Được dẫn dắt bởi nhóm Giáo sư Lưu Tư Nguyên (Đại học Bách khoa Nam Trung Quốc)
+
+
+
+---
+
+## Người dùng phù hợp 👥
+
+Dự án này cần được sử dụng cùng với thiết bị phần cứng ESP32. Nếu bạn đã mua phần cứng liên quan đến ESP32, đã thành công kết nối với dịch vụ backend do anh Xia triển khai, và muốn xây dựng dịch vụ backend `xiaozhi-esp32` riêng của mình, thì dự án này rất phù hợp với bạn.
+
+Muốn xem hiệu quả sử dụng? Hãy xem video 🎥
+
+
+
+---
+
+## Cảnh báo ⚠️
+
+1. Dự án này là phần mềm mã nguồn mở, phần mềm này không có quan hệ hợp tác thương mại với bất kỳ nhà cung cấp dịch vụ API bên thứ ba nào (bao gồm nhưng không giới hạn ở các nền tảng nhận dạng giọng nói, mô hình lớn, tổng hợp giọng nói, v.v.), và không đảm bảo chất lượng dịch vụ cũng như an toàn tài chính của họ.
+Khuyến nghị người dùng ưu tiên lựa chọn nhà cung cấp dịch vụ có giấy phép kinh doanh liên quan và đọc kỹ thỏa thuận dịch vụ và chính sách bảo mật của họ. Phần mềm này không lưu trữ bất kỳ khóa tài khoản nào, không tham gia vào luồng tiền và không chịu rủi ro mất tiền nạp.
+
+2. Chức năng của dự án này chưa hoàn thiện và chưa qua đánh giá bảo mật mạng, vui lòng không sử dụng trong môi trường sản xuất. Nếu bạn triển khai dự án này trong môi trường mạng công cộng để học tập, vui lòng thực hiện các biện pháp bảo vệ cần thiết.
+
+---
+
+## Tài liệu triển khai
+
+
+
+Dự án này cung cấp hai phương pháp triển khai, vui lòng chọn theo nhu cầu cụ thể của bạn:
+
+#### 🚀 Lựa chọn phương pháp triển khai
+| Phương pháp triển khai | Đặc điểm | Tình huống áp dụng | Tài liệu triển khai | Yêu cầu cấu hình | Video hướng dẫn |
+|---------|------|---------|---------|---------|---------|
+| **Cài đặt tối giản** | Đối thoại thông minh, quản lý đơn tác nhân | Môi trường cấu hình thấp, dữ liệu lưu trong tệp cấu hình, không cần cơ sở dữ liệu | [①Phiên bản Docker](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②Triển khai mã nguồn](./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 nhân 4GB nếu dùng `FunASR`, 2 nhân 2GB nếu toàn API | - |
+| **Cài đặt toàn bộ module** | Đối thoại thông minh, quản lý đa người dùng, quản lý đa tác nhân, bảng điều khiển thông minh | Trải nghiệm đầy đủ tính năng, dữ liệu lưu trong cơ sở dữ liệu |[①Phiên bản 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) / [②Triển khai mã nguồn](./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) / [③Hướng dẫn tự động cập nhật triển khai mã nguồn](./docs/dev-ops-integration.md) | 4 nhân 8GB nếu dùng `FunASR`, 2 nhân 4GB nếu toàn API| [Video hướng dẫn khởi động mã nguồn cục bộ](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
+
+Câu hỏi thường gặp và hướng dẫn liên quan, vui lòng tham khảo [liên kết này](./docs/FAQ.md)
+
+> 💡 Gợi ý: Dưới đây là nền tảng thử nghiệm được triển khai theo mã mới nhất, có thể flash để thử nghiệm nếu cần, đồng thời là 6, dữ liệu sẽ được xóa mỗi ngày,
+
+```
+Địa chỉ bảng điều khiển thông minh: https://2662r3426b.vicp.fun
+Bảng điều khiển thông minh (phiên bản h5): https://2662r3426b.vicp.fun/h5/index.html
+
+Công cụ kiểm tra dịch vụ: https://2662r3426b.vicp.fun/test/
+Địa chỉ giao diện OTA: https://2662r3426b.vicp.fun/xiaozhi/ota/
+Địa chỉ giao diện Websocket: wss://2662r3426b.vicp.fun/xiaozhi/v1/
+```
+
+#### 🚩 Mô tả và khuyến nghị cấu hình
+> [!Note]
+> Dự án này cung cấp hai phương án cấu hình:
+>
+> 1. Cấu hình `Miễn phí hoàn toàn cho người mới`: Phù hợp với sử dụng gia đình cá nhân, tất cả các thành phần đều sử dụng phương án miễn phí, không cần thanh toán thêm.
+>
+> 2. `Cấu hình streaming`: Phù hợp với demo, đào tạo, hơn 2 đồng thời, v.v., sử dụng công nghệ xử lý streaming, tốc độ phản hồi nhanh hơn, trải nghiệm tốt hơn.
+>
+> Từ phiên bản `0.5.2`, dự án hỗ trợ cấu hình streaming, so với phiên bản đầu, tốc độ phản hồi cải thiện khoảng `2.5 giây`, cải thiện đáng kể trải nghiệm người dùng.
+
+| Tên module | Cài đặt miễn phí cho người mới | Cấu hình streaming |
+|:---:|:---:|:---:|
+| 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) | 👍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ộ) |
+
+Nếu bạn quan tâm đến thời gian của từng thành phần, vui lòng xem [Báo cáo kiểm tra hiệu suất các thành phần Xiaozhi](https://github.com/xinnan-tech/xiaozhi-performance-research), có thể kiểm tra thực tế trong môi trường của bạn theo phương pháp kiểm tra trong báo cáo.
+
+#### 🔧 Công cụ kiểm tra
+Dự án này cung cấp các công cụ kiểm tra sau để giúp bạn xác minh hệ thống và chọn mô hình phù hợp:
+
+| Tên công cụ | Vị trí | Phương pháp sử dụng | Mô tả chức năng |
+|:---:|:---|:---:|:---:|
+| Công cụ kiểm tra tương tác âm thanh | main》xiaozhi-server》test》test_page.html | Mở trực tiếp bằng trình duyệt Google Chrome | Kiểm tra chức năng phát và nhận âm thanh, xác minh xử lý âm thanh phía Python có bình thường không |
+| Công cụ kiểm tra phản hồi mô hình | main》xiaozhi-server》performance_tester.py | Thực hiện `python performance_tester.py` | Kiểm tra tốc độ phản hồi của ba module cốt lõi ASR(Nhận dạng giọng nói), LLM(Mô hình lớn), VLLM(Mô hình thị giác), TTS(Tổng hợp giọng nói) |
+
+> 💡 Gợi ý: Khi kiểm tra tốc độ mô hình, chỉ kiểm tra các mô hình đã cấu hình khóa.
+
+---
+## Danh sách tính năng ✨
+### Đã thực hiện ✅
+
+| Module chức năng | Mô tả |
+|:---:|:---|
+| Kiến trúc cốt lõi | Dựa trên [cổng MQTT+UDP](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md), WebSocket, máy chủ HTTP, cung cấp hệ thống quản lý bảng điều khiển và xác thực hoàn chỉnh |
+| Tương tác giọng nói | Hỗ trợ ASR streaming(Nhận dạng giọng nói), TTS streaming(Tổng hợp giọng nói), VAD(Phát hiện hoạt động giọng nói), hỗ trợ nhận dạng đa ngôn ngữ và xử lý giọng nói |
+| Nhận dạng vân giọng | Hỗ trợ đăng ký, quản lý và nhận dạng vân giọng đa người dùng, xử lý song song với ASR, nhận dạng danh tính người nói theo thời gian thực và truyền cho LLM để phản hồi cá nhân hóa |
+| Đố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, 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 |
+| Backend quản lý | Cung cấp giao diện quản lý Web, hỗ trợ quản lý người dùng, cấu hình hệ thống và quản lý thiết bị; giao diện hỗ trợ hiển thị tiếng Trung giản thể, tiếng Trung phồn thể, tiếng Anh |
+| Công cụ kiểm tra | Cung cấp công cụ kiểm tra hiệu suất, công cụ kiểm tra mô hình thị giác và công cụ kiểm tra tương tác âm thanh |
+| Hỗ trợ triển khai | Hỗ trợ triển khai Docker và triển khai cục bộ, cung cấp quản lý tệp cấu hình hoàn chỉnh |
+| Hệ thống plugin | Hỗ trợ mở rộng plugin chức năng, phát triển plugin tùy chỉnh và hot loading plugin |
+
+### Đang phát triển 🚧
+
+Muốn hiểu tiến độ kế hoạch phát triển cụ thể, [vui lòng nhấp vào đây](https://github.com/users/xinnan-tech/projects/3). Câu hỏi thường gặp và hướng dẫn liên quan, vui lòng tham khảo [liên kết này](./docs/FAQ.md)
+
+Nếu bạn là một nhà phát triển phần mềm, đây có một [Lá thư mở gửi các nhà phát triển](docs/contributor_open_letter.md), chào mừng tham gia!
+
+---
+
+## 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?tab=readme-ov-file#related-open-source-projects) khác trong hệ sinh thái này
+
+---
+
+## Danh sách nền tảng/thành phần được dự án này hỗ trợ 📋
+### LLM Mô hình ngôn ngữ
+
+| Phương pháp sử dụng | Nền tảng hỗ trợ | Nền tảng miễn phí |
+|:---:|:---:|:---:|
+| Gọi giao diện openai | Alibaba Bailian, Volcano Engine, DeepSeek, Zhipu, Gemini, iFlytek | Zhipu, Gemini |
+| Gọi giao diện ollama | Ollama | - |
+| Gọi giao diện dify | Dify | - |
+| Gọi giao diện fastgpt | Fastgpt | - |
+| Gọi giao diện coze | Coze | - |
+| Gọi giao diện xinference | Xinference | - |
+| Gọi giao diện homeassistant | HomeAssistant | - |
+
+Trên thực tế, bất kỳ LLM nào hỗ trợ gọi giao diện openai đều có thể truy cập sử dụng.
+
+---
+
+### VLLM Mô hình thị giác
+
+| Phương pháp sử dụng | Nền tảng hỗ trợ | Nền tảng miễn phí |
+|:---:|:---:|:---:|
+| Gọi giao diện openai | Alibaba Bailian, Zhipu ChatGLMVLLM | Zhipu ChatGLMVLLM |
+
+Trên thực tế, bất kỳ VLLM nào hỗ trợ gọi giao diện openai đều có thể truy cập sử dụng.
+
+---
+
+### TTS Tổng hợp giọng nói
+
+| Phương pháp sử dụng | Nền tảng hỗ trợ | Nền tảng miễn phí |
+|:---:|:---:|:---:|
+| Gọi giao diện | EdgeTTS, iFlytek, Volcano Engine, Tencent Cloud, Alibaba Cloud và Bailian, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS, Lingxi streaming TTS, MinimaxTTS | Lingxi streaming TTS, EdgeTTS, CosyVoiceSiliconflow(một phần) |
+| Dịch vụ cục bộ | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, Index-TTS, PaddleSpeech | Index-TTS, PaddleSpeech, FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3 |
+
+---
+
+### VAD Phát hiện hoạt động giọng nói
+
+| Loại | Tên nền tảng | Phương pháp sử dụng | Mô hình thu phí | Ghi chú |
+|:---:|:---------:|:----:|:----:|:--:|
+| VAD | SileroVAD | Sử dụng cục bộ | Miễn phí | |
+
+---
+
+### ASR Nhận dạng giọng nói
+
+| Phương pháp sử dụng | Nền tảng hỗ trợ | Nền tảng miễn phí |
+|:---:|:---:|:---:|
+| Sử dụng cục bộ | FunASR, SherpaASR | FunASR, SherpaASR |
+| Gọi giao diện | FunASRServer, Volcano Engine, iFlytek, Tencent Cloud, Alibaba Cloud, Baidu Cloud, OpenAI ASR | FunASRServer |
+
+---
+
+### Voiceprint Nhận dạng vân giọng
+
+| Phương pháp sử dụng | Nền tảng hỗ trợ | Nền tảng miễn phí |
+|:---:|:---:|:---:|
+| Sử dụng cục bộ | 3D-Speaker | 3D-Speaker |
+
+---
+
+### Memory Lưu trữ bộ nhớ
+
+| 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 | mem_local_short | Tóm tắt cục bộ | Miễn phí | |
+| Memory | nomem | Chế độ không có bộ nhớ | Miễn phí | |
+
+---
+
+### Intent Nhận dạng ý định
+
+| Loại | Tên nền tảng | Phương pháp sử dụng | Mô hình thu phí | Ghi chú |
+|:------:|:-------------:|:----:|:-------:|:---------------------:|
+| Intent | intent_llm | Gọi giao diện | Thu phí theo LLM | Nhận dạng ý định qua mô hình lớn, tính tổng quát mạnh |
+| Intent | function_call | Gọi giao diện | Thu phí theo LLM | Hoàn thành ý định qua gọi hàm mô hình lớn, tốc độ nhanh, hiệu quả tốt |
+| Intent | nointent | Chế độ không có ý định | Miễn phí | Không thực hiện nhận dạng ý định, trả về trực tiếp kết quả đối thoại |
+
+---
+
+### Rag Tăng cường truy xuất thông tin
+
+| Loại | Tên nền tảng | Phương pháp sử dụng | Mô hình thu phí | Ghi chú |
+|:------:|:-------------:|:----:|:-------:|:---------------------:|
+| Rag | ragflow | Gọi giao diện | Thu phí theo token tiêu tốn của phân đoạn, phân từ | Sử dụng chức năng tăng cường truy xuất của RagFlow, cung cấp phản hồi đối thoại chính xác hơn |
+
+---
+
+## Lời cảm ơn 🙏
+
+| Logo | Dự án/Công ty | Mô tả |
+|:---:|:---:|:---|
+|
+
+
+
+
diff --git a/docs/Deployment.md b/docs/Deployment.md
index 90935272..aff1287e 100644
--- a/docs/Deployment.md
+++ b/docs/Deployment.md
@@ -2,7 +2,7 @@
# 方式一：Docker只运行Server
-docker镜像已支持x86架构、arm64架构的CPU，支持在国产操作系统上运行。
+`0.8.2`版本开始，本项目发行的docker镜像只支持`x86架构`，如果需要在`arm64架构`的CPU上部署，可按照[这个教程](docker-build.md)在本机编译`arm64的镜像`。
## 1. 安装docker
@@ -80,7 +80,7 @@ xiaozhi-server
打开命令行工具，使用`终端`或`命令行`工具 进入到你的`xiaozhi-server`，执行以下命令
```
-docker-compose up -d
+docker compose up -d
```
执行完后，再执行以下命令，查看日志信息。
@@ -139,6 +139,9 @@ conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/
conda install libopus -y
conda install ffmpeg -y
+
+# 在 Linux 环境下进行部署时,如出现类似缺失 libiconv.so.2 动态库的报错 请通过以下命令进行安装
+conda install libiconv -y
```
请注意，以上命令，不是一股脑执行就成功的，你需要一步步执行，每一步执行完后，都检查一下输出的日志，查看是否成功。
@@ -267,7 +270,8 @@ LLM:
6、[我说话很慢，停顿时小智老是抢话](./FAQ.md)
+- **客厅温度：** 26℃
+- **客厅湿度：** 45%
+- **大门状态：** 已关闭
+
+```
+
+**情况 2：返回列表**
+```json
+{
+ "code": 0,
+ "data": [
+ "您有10个待办事项",
+ "当前汽车的行驶速度是100km每小时"
+ ]
+}
+```
+*注入效果：*
+```markdown
+
+- 您有10个待办事项
+- 当前汽车的行驶速度是100km每小时
+
+```
+
+## 配置指南
+
+### 方式 1：智控台配置（全模块部署）
+
+1. 登录智控台，进入**角色配置**页面。
+2. 找到**上下文源**配置项（点击“编辑源”按钮）。
+3. 点击**添加**，输入您的 API 地址。
+4. 如果 API 需要鉴权，可以在**请求头**部分添加 `Authorization` 或其他 Header。
+5. 保存配置。
+
+### 方式 2：配置文件配置（单模块部署）
+
+编辑 `xiaozhi-server/data/.config.yaml` 文件，添加 `context_providers` 配置段：
+
+```yaml
+# 上下文源配置
+context_providers:
+ - url: "http://api.example.com/data"
+ headers:
+ Authorization: "Bearer your-token"
+ - url: "http://another-api.com/data"
+```
+
+## 启用功能
+
+默认情况下，系统的提示词模板文件（`data/.agent-base-prompt.txt`）中已经预置了 `{{ dynamic_context }}` 占位符，您无需手动添加。
+
+**示例：**
+
+```markdown
+
+【重要！以下信息已实时提供，无需调用工具查询，请直接使用：】
+- **设备ID：** {{device_id}}
+- **当前时间：** {{current_time}}
+...
+{{ dynamic_context }}
+
+```
+
+**注意**：如果您不需要使用此功能，可以选择**不配置任何上下文源**，也可以从提示词模板文件中**删除** `{{ dynamic_context }}` 占位符。
+
+## 附录：Mock 测试服务示例
+
+为了方便您测试和开发，我们提供了一个简单的 Python Mock Server 脚本。您可以运行此脚本在本地模拟 API 接口。
+
+**mock_api_server.py**
+
+```python
+import http.server
+import socketserver
+import json
+from urllib.parse import urlparse, parse_qs
+
+# 设置端口号
+PORT = 8081
+
+class MockRequestHandler(http.server.SimpleHTTPRequestHandler):
+ def do_GET(self):
+ # 解析路径和参数
+ parsed_path = urlparse(self.path)
+ path = parsed_path.path
+ query = parse_qs(parsed_path.query)
+
+ response_data = {}
+ status_code = 200
+
+ print(f"收到请求: {path}, 参数: {query}")
+
+ # Case 1: 模拟健康数据 (返回字典 Dict)
+ # 路径参数风格: /health
+ # device_id 从 Header 获取
+ if path == "/health":
+ device_id = self.headers.get("device-id", "unknown_device")
+ print(f"device_id: {device_id}")
+ response_data = {
+ "code": 0,
+ "msg": "success",
+ "data": {
+ "测试设备ID": device_id,
+ "心率": "80 bpm",
+ "血压": "120/80 mmHg",
+ "状态": "良好"
+ }
+ }
+
+ # Case 2: 模拟新闻列表 (返回列表 List)
+ # 无参数: /news/list
+ elif path == "/news/list":
+ response_data = {
+ "code": 0,
+ "msg": "success",
+ "data": [
+ "今日头条：Python 3.14 发布",
+ "科技新闻：AI 助手改变生活",
+ "本地新闻：明日有大雨，记得带伞"
+ ]
+ }
+
+ # Case 3: 模拟天气简报 (返回字符串 String)
+ # 无参数: /weather/simple
+ elif path == "/weather/simple":
+ response_data = {
+ "code": 0,
+ "msg": "success",
+ "data": "今日晴转多云，气温 20-25 度，空气质量优，适合出行。"
+ }
+
+ # Case 4: 模拟设备详情 (Query参数风格)
+ # 参数风格: /device/info
+ # device_id 从 Header 获取
+ elif path == "/device/info":
+ device_id = self.headers.get("device-id", "unknown_device")
+ response_data = {
+ "code": 0,
+ "msg": "success",
+ "data": {
+ "查询方式": "Header参数",
+ "设备ID": device_id,
+ "电量": "85%",
+ "固件": "v2.0.1"
+ }
+ }
+
+ # Case 5: 404 Not Found
+ else:
+ status_code = 404
+ response_data = {"error": "接口不存在"}
+
+ # 发送响应
+ self.send_response(status_code)
+ self.send_header('Content-type', 'application/json; charset=utf-8')
+ self.end_headers()
+ self.wfile.write(json.dumps(response_data, ensure_ascii=False).encode('utf-8'))
+
+# 启动服务
+# 允许地址重用，防止快速重启报错
+socketserver.TCPServer.allow_reuse_address = True
+with socketserver.TCPServer(("", PORT), MockRequestHandler) as httpd:
+ print(f"==================================================")
+ print(f"Mock API Server 已启动: http://localhost:{PORT}")
+ print(f"可用接口列表:")
+ print(f"1. [字典] http://localhost:{PORT}/health")
+ print(f"2. [列表] http://localhost:{PORT}/news/list")
+ print(f"3. [文本] http://localhost:{PORT}/weather/simple")
+ print(f"4. [参数] http://localhost:{PORT}/device/info")
+ print(f"==================================================")
+ try:
+ httpd.serve_forever()
+ except KeyboardInterrupt:
+ print("\n服务已停止")
+```
diff --git a/docs/docker-build.md b/docs/docker-build.md
index 45102a7d..118ed1c9 100644
--- a/docs/docker-build.md
+++ b/docs/docker-build.md
@@ -17,5 +17,5 @@ docker build -t xiaozhi-esp32-server:web_latest -f ./Dockerfile-web .
# 编译完成后，可以使用docker-compose启动项目
# docker-compose.yml你需要修改成自己编译的镜像版本
cd main/xiaozhi-server
-docker-compose up -d
+docker compose up -d
```
diff --git a/docs/homeassistant-integration.md b/docs/homeassistant-integration.md
index 7e69c229..c6e26ba6 100644
--- a/docs/homeassistant-integration.md
+++ b/docs/homeassistant-integration.md
@@ -97,7 +97,7 @@ http://homeassistant.local:8123
使用管理员账号，登录`智控台`。在`智能体管理`，找到你的智能体，再点击`配置角色`。
-将意图识别设置成`函数调用`或`LLM意图识别`。这时你会看到右侧有一个`编辑功能`。点击`编辑功能`按钮，会弹出`功能管理`的框。
+将意图识别设置成`外挂的大模型意图识别`或`大模型自主函数调用`。这时你会看到右侧有一个`编辑功能`。点击`编辑功能`按钮，会弹出`功能管理`的框。
在`功能管理`的框里，你需要勾选`HomeAssistant设备状态查询`和`HomeAssistant设备状态修改`。
diff --git a/docs/huoshan-streamTTS-voice-cloning.md b/docs/huoshan-streamTTS-voice-cloning.md
new file mode 100644
index 00000000..304a8c90
--- /dev/null
+++ b/docs/huoshan-streamTTS-voice-cloning.md
@@ -0,0 +1,58 @@
+# 智控台 火山双流式语音合成+音色克隆配置教程
+
+本教程分为4个阶段：准备阶段、配置阶段、克隆阶段、使用阶段。主要是介绍通过智控台配置火山双流式语音合成+音色克隆的过程。
+
+## 第一阶段：准备阶段
+超级管理员先预先把火山引擎服务开通好，获取到App Id，Access Token。默认火上引擎会赠送一个音色资源。这个音色资源需要把它复制到本项目里。
+
+如果你想克隆多个音色，需要购买开通多个音色资源。只要把每个音色资源的声音ID(S_xxxxx)复制到本项目。然后分配给系统的账号使用即可。以下是详细步骤：
+
+### 1.开通火山引擎服务
+访问 https://console.volcengine.com/speech/app 在应用管理创建应用，勾选语音合成大模型和声音复刻大模型。
+
+### 2.获取音色资源ID
+访问 https://console.volcengine.com/speech/service/9999 复制三项内容，分别是App Id，Access Token以及声音ID(S_xxxxx)。如图
+
+
+
+## 第二阶段：配置火山引擎服务
+
+### 1.填写火山引擎配置
+
+使用超级管理员账号登录智控台，点击顶部【模型配置】，再点击模型配置页面左侧的【语音合成】，搜索找到“火山双流式语音合成”，点击修改，将你火山引擎的`App Id`填入到【应用ID】字段里，将`Access Token`填入到【访问令牌】字段里。然后保存。
+
+### 2.将音色资源ID分配给系统账号
+
+使用超级管理员账号登录智控台，点击顶部`参数字典`，在下拉菜单中，点击`系统功能配置`页面。在页面上勾选`音色克隆`，点击保存配置。即可在顶部菜单看到`音色克隆`按钮。
+
+使用超级管理员账号登录智控台，点击顶部【音色克隆】、【音色资源】。
+
+点击新增按钮，在【平台名称】选择“火山双流式语音合成”；
+
+在【音色资源ID】填入你火山引擎的声音资源ID(S_xxxxx)，填入后按回车；
+
+在【归属账号】选择你要分配给的系统账号，你可以分配给你自己。然后点击保存
+
+## 第三阶段：克隆阶段
+
+如果登录后，点击顶部【音色克隆】》【音色克隆】，显示【您的账号暂无音色资源请联系管理员分配音色资源】，说明你在第二阶段还没有把音色资源ID分配给这个账号。那就是回到第二阶段，分配音色资源给对应的账号。
+
+如果登录后，点击顶部【音色克隆】》【音色克隆】，能看到对应的音色列表。请继续。
+
+在列表里会看到对应的音色列表。选择其中一个音色资源，点击【上传音频】按钮。上传后，可以试听一下声音或者截取某段声音。确认后点击【上传音频】按钮。
+
+
+上传音频后，在列表里会看到对应的音色会变成“待复刻”状态。点击【立即复刻】按钮。等1~2秒会返回结果。
+
+如果复刻失败，请将鼠标放到“错误信息”图标上，会显示失败的原因。
+
+如果复刻成功，在列表里会看到对应的音色会变成“训练成功”状态。此时你可以点击【声音名称】栏的修改按钮，修改音色资源的名称，方便后期选择使用。
+
+## 第四阶段：使用阶段
+
+点击顶部【智能体管理】，选择任意一个智能体，点击【配置角色】按钮。
+
+语音合成(TTS)选择“火山双流式语音合成”。在列表里，找到名字带有“克隆音色”的音色资源（如图），选择它，点击保存。
+
+
+接下来，可以唤醒小智和它对话。
diff --git a/docs/images/demo1.png b/docs/images/demo1.png
index 6459a06f..1ab7c224 100644
Binary files a/docs/images/demo1.png and b/docs/images/demo1.png differ
diff --git a/docs/images/demo4.png b/docs/images/demo4.png
index 7b57ab25..e0b5ba76 100644
Binary files a/docs/images/demo4.png and b/docs/images/demo4.png differ
diff --git a/docs/images/demo6.png b/docs/images/demo6.png
index dc4edbeb..51f1f5e6 100644
Binary files a/docs/images/demo6.png and b/docs/images/demo6.png differ
diff --git a/docs/images/demo9.png b/docs/images/demo9.png
index ce74a02d..ff422fe9 100644
Binary files a/docs/images/demo9.png and b/docs/images/demo9.png differ
diff --git a/docs/images/deploy2.png b/docs/images/deploy2.png
index 882af706..78441534 100644
Binary files a/docs/images/deploy2.png and b/docs/images/deploy2.png differ
diff --git a/docs/images/image-clone-integration-01.png b/docs/images/image-clone-integration-01.png
new file mode 100644
index 00000000..7132ee7a
Binary files /dev/null and b/docs/images/image-clone-integration-01.png differ
diff --git a/docs/images/image-clone-integration-02.png b/docs/images/image-clone-integration-02.png
new file mode 100644
index 00000000..80972df9
Binary files /dev/null and b/docs/images/image-clone-integration-02.png differ
diff --git a/docs/images/image-clone-integration-03.png b/docs/images/image-clone-integration-03.png
new file mode 100644
index 00000000..7f35e393
Binary files /dev/null and b/docs/images/image-clone-integration-03.png differ
diff --git a/docs/index-stream-integration.md b/docs/index-stream-integration.md
index 875dbdd8..752fa898 100644
--- a/docs/index-stream-integration.md
+++ b/docs/index-stream-integration.md
@@ -1,11 +1,18 @@
# IndexStreamTTS 使用指南
## 环境准备
-### 1. 克隆项目 （这里使用的为VLLM的版本）
+### 1. 克隆项目
```bash
git clone https://github.com/Ksuriuri/index-tts-vllm.git
+```
+进入解压后的目录
+```bash
cd index-tts-vllm
```
+切换到指定版本 (使用VLLM-0.10.2的历史版本)
+```bash
+git checkout 224e8d5e5c8f66801845c66b30fa765328fd0be3
+```
### 2. 创建并激活 conda 环境
```bash
@@ -13,7 +20,7 @@ conda create -n index-tts-vllm python=3.12
conda activate index-tts-vllm
```
-### 3. 安装PyTorch
+### 3. 安装PyTorch 需要版本为2.8.0（最新版）
#### 查看显卡最高支持的版本和实际安装的版本
```bash
nvidia-smi
@@ -27,12 +34,11 @@ CUDA Version: 12.8
```bash
Cuda compilation tools, release 12.8, V12.8.89
```
-#### 那么对应的安装命令 (请注意不要横跨大版本！！！)
+#### 那么对应的安装命令（pytorch默认给的是12.8的驱动版本）
```bash
-pip install torch==2.7.0 torchvision==0.22.0 torchaudio==2.7.0 --index-url https://download.pytorch.org/whl/cu128
+pip install torch torchvision
```
-优先建议安装 pytorch 2.7.0（对应 vllm 0.9.0），具体安装指令请参考：[pytorch 官网](https://pytorch.org/get-started/locally/]\)
-若显卡不支持，请安装 pytorch 2.5.1（对应 vllm 0.7.3），并将 requirements.txt 中 vllm==0.9.0 修改为 vllm==0.7.3
+需要 pytorch 版本 2.8.0（对应 vllm 0.10.2），具体安装指令请参考：[pytorch 官网](https://pytorch.org/get-started/locally/)
### 4. 安装依赖
```bash
@@ -40,6 +46,7 @@ pip install -r requirements.txt
```
### 5. 下载模型权重
+### 方案一：下载官方权重文件后转换
此为官方权重文件，下载到本地任意路径即可，支持 IndexTTS-1.5 的权重
| HuggingFace | ModelScope |
|---------------------------------------------------------------|---------------------------------------------------------------------|
@@ -47,19 +54,19 @@ pip install -r requirements.txt
| [IndexTTS-1.5](https://huggingface.co/IndexTeam/IndexTTS-1.5) | [IndexTTS-1.5](https://modelscope.cn/models/IndexTeam/IndexTTS-1.5) |
下面以ModelScope的安装方法为例
-### 请注意：git需要安装并初始化启用lfs（如已安装可以跳过）
+#### 请注意：git需要安装并初始化启用lfs（如已安装可以跳过）
```bash
sudo apt-get install git-lfs
git lfs install
```
创建模型目录，并拉取模型
```bash
-mkkdir model_dir
+mkdir model_dir
cd model_dir
git clone https://www.modelscope.cn/IndexTeam/IndexTTS-1.5.git
```
-### 5. 模型权重转换
+#### 模型权重转换
```bash
bash convert_hf_format.sh /path/to/your/model_dir
```
@@ -71,6 +78,9 @@ bash convert_hf_format.sh model_dir/IndexTTS-1.5
### 6. 更改接口适配一下项目
接口返回数据与项目不适配需要调整一下，使其直接返回音频数据
+```bash
+vi api_server.py
+```
```bash
@app.post("/tts", responses={
200: {"content": {"application/octet-stream": {}}},
@@ -104,7 +114,7 @@ async def tts_api(request: Request):
vi start_api.sh
```
### 将下面内容粘贴进去并按:输入wq保存
-#### 脚本中的/home/system/indexTTS/index-tts-vllm/model_dir/IndexTTS-1.5 请自行修改为实际路径
+#### 脚本中的/home/system/index-tts-vllm/model_dir/IndexTTS-1.5 请自行修改为实际路径
```bash
# 激活conda环境
conda activate index-tts-vllm
@@ -129,26 +139,46 @@ else
echo "已终止进程 $PID_VLLM"
fi
+# 查找占用VLLM::EngineCore进程
+GPU_PIDS=$(ps aux | grep -E "VLLM|EngineCore" | grep -v grep | awk '{print $2}')
+
+# 检查是否找到进程号
+if [ -z "$GPU_PIDS" ]; then
+ echo "没有找到VLLM相关进程"
+else
+ echo "找到VLLM相关进程，进程号为: $GPU_PIDS"
+ # 先尝试普通kill，等待2秒
+ kill $GPU_PIDS
+ sleep 2
+ # 检查进程是否还在
+ if ps -p $GPU_PIDS > /dev/null; then
+ echo "进程仍在运行，强制终止..."
+ kill -9 $GPU_PIDS
+ fi
+ echo "已终止进程 $GPU_PIDS"
+fi
+
# 创建tmp目录（如果不存在）
mkdir -p tmp
# 后台运行api_server.py，日志重定向到tmp/server.log
-export VLLM_USE_V1=0
-nohup python api_server.py --model_dir /home/system/indexTTS/index-tts-vllm/model_dir/IndexTTS-1.5 --port 11996 > tmp/server.log 2>&1 &
+nohup python api_server.py --model_dir /home/system/index-tts-vllm/model_dir/IndexTTS-1.5 --port 11996 > tmp/server.log 2>&1 &
echo "api_server.py 已在后台运行，日志请查看 tmp/server.log"
```
给脚本执行权限并运行脚本
```bash
-chmod +x tmp
+chmod +x start_api.sh
./start_api.sh
```
日志会在tmp/server.log中输出，可以通过以下命令查看日志情况
```bash
tail -f tmp/server.log
```
+如果显卡内存足够，可在脚本中添加启动参数 ----gpu_memory_utilization 来调整显存占用比例，默认值为 0.25
+
## 音色配置
index-tts-vllm支持通过配置文件注册自定义音色，支持单音色和混合音色配置。
-在项目根目录下的assets/speaker.json文件中配置自定义音色
+在项目根目录下的assets/speaker.json文件中配置自定义音色
### 配置格式说明
```bash
{
@@ -161,5 +191,5 @@ index-tts-vllm支持通过配置文件注册自定义音色，支持单音色和
]
}
```
-### 注意
+### 注意 （配置角色后需重启服务进行音色注册）
添加后需在智控台中添加相应的说话人（单模块则更换相应的voice）
\ No newline at end of file
diff --git a/docs/mcp-endpoint-enable.md b/docs/mcp-endpoint-enable.md
index 6b64ccac..2d86f802 100644
--- a/docs/mcp-endpoint-enable.md
+++ b/docs/mcp-endpoint-enable.md
@@ -71,6 +71,7 @@ docker logs -f mcp-endpoint-server
请你保留好上面两个`接口地址`，下一步要用到。
# 2、全模块部署时，怎么配置MCP接入点
+首先，你要开启MCP接入点功能。在智控台，点击顶部`参数字典`，在下拉菜单中，点击`系统功能配置`页面。在页面上勾选`MCP接入点`，点击`保存配置`。在`角色配置`页面，点击`编辑功能`按钮，即可看到`mcp接入点`功能。
如果你是全模块部署，使用管理员账号，登录智控台，点击顶部`参数字典`，选择`参数管理`功能。
diff --git a/docs/mcp-get-device-info.md b/docs/mcp-get-device-info.md
new file mode 100644
index 00000000..bf479958
--- /dev/null
+++ b/docs/mcp-get-device-info.md
@@ -0,0 +1,40 @@
+# MCP 方法如何获取设备信息
+
+本教程将指导你如何使用MCP方法获取设备信息。
+
+第一步：自定义你的`agent-base-prompt.txt`文件
+
+把xiaozhi-server目录的`agent-base-prompt.txt`文件内容复制到你的`data`目录下，并重命名为`.agent-base-prompt.txt`。
+
+第二步：修改`data/.agent-base-prompt.txt`文件，找到``标签，在标签内容中添加以下代码内容：
+```
+- **设备ID：** {{device_id}}
+```
+
+添加完成后，你的`data/.agent-base-prompt.txt`文件的``标签内容大致如下：
+```
+
+【重要！以下信息已实时提供，无需调用工具查询，请直接使用：】
+- **设备ID：** {{device_id}}
+- **当前时间：** {{current_time}}
+- **今天日期：** {{today_date}} ({{today_weekday}})
+- **今天农历：** {{lunar_date}}
+- **用户所在城市：** {{local_address}}
+- **当地未来7天天气：** {{weather_info}}
+
+```
+
+第三步：修改`data/.config.yaml`文件，找到`agent-base-prompt`配置，修改前内容如下：
+```
+prompt_template: agent-base-prompt.txt
+```
+修改成
+```
+prompt_template: data/.agent-base-prompt.txt
+```
+
+第四步：重启你的xiaozhi-server服务。
+
+第五步：在你的mcp方法增加名称为`device_id`,类型为`string`,描述为`设备ID`的参数。
+
+第六步：重新唤醒小智，让他调用mcp方法，查看你的mcp方法是否可以获取`设备ID`。
diff --git a/docs/mqtt-gateway-integration.md b/docs/mqtt-gateway-integration.md
new file mode 100644
index 00000000..2b96255f
--- /dev/null
+++ b/docs/mqtt-gateway-integration.md
@@ -0,0 +1,187 @@
+# MQTT 网关部署教程
+
+`xiaozhi-esp32-server`项目，可结合虾哥开源的[xiaozhi-mqtt-gateway](https://github.com/78/xiaozhi-mqtt-gateway) 项目进行简单改造，即可实现小智硬件MQTT+UDP连接。
+本教程分为三部分，你可以根据你是全模块部署还是单模块部署，选择对应的部分接入MQTT网关：
+- 第一部分：部署MQTT网关
+- 第二部分：全模块运行实现小智硬件MQTT+UDP连接
+- 第三部分：单模块运行xiaozhi-server实现小智硬件MQTT+UDP连接
+
+## 准备阶段
+准备好你的`xiaozhi-server`的`mqtt-websocket`连接地址。在你原来的`websocket地址`基础上，添加`?from=mqtt_gateway`字符，就可以得到`mqtt-websocket`连接地址
+
+1、如果你是源码部署，你的`mqtt-websocket`地址是：
+```
+ws://127.0.0.1:8000/xiaozhi/v1/?from=mqtt_gateway
+```
+
+2、如果你是docker部署，你的`mqtt-websocket`地址是
+```
+ws://你宿主机局域网IP:8000/xiaozhi/v1/?from=mqtt_gateway
+```
+
+## 重要提示
+
+如果你是服务器部署，需要确保服务器`1883`、`8884`、`8007`端口都对外开放。`8884`选择的协议类型是`UDP`，其他是`TCP`。
+
+如果你是服务器部署，需要确保服务器`1883`、`8884`、`8007`端口都对外开放。`8884`选择的协议类型是`UDP`，其他是`TCP`。
+
+如果你是服务器部署，需要确保服务器`1883`、`8884`、`8007`端口都对外开放。`8884`选择的协议类型是`UDP`，其他是`TCP`。
+
+
+## 第一部分：部署MQTT网关
+
+1. 克隆[改造后的xiaozhi-mqtt-gateway项目](https://github.com/xinnan-tech/xiaozhi-mqtt-gateway.git)：
+```bash
+git clone https://ghfast.top/https://github.com/xinnan-tech/xiaozhi-mqtt-gateway.git
+cd xiaozhi-mqtt-gateway
+```
+
+2. 安装依赖：
+```bash
+npm install
+npm install -g pm2
+```
+
+3. 配置 `config.json`：
+```bash
+cp config/mqtt.json.example config/mqtt.json
+```
+
+4. 编辑配置文件 config/mqtt.json，把你在`本文准备阶段`的`mqtt-websocket`地址替换到`chat_servers`里。例如源码部署的`xiaozhi-server`就是如下配置：
+
+```
+{
+ "production": {
+ "chat_servers": [
+ "ws://127.0.0.1:8000/xiaozhi/v1/?from=mqtt_gateway"
+ ]
+ },
+ "debug": false,
+ "max_mqtt_payload_size": 8192,
+ "mcp_client": {
+ "capabilities": {
+ },
+ "client_info": {
+ "name": "xiaozhi-mqtt-client",
+ "version": "1.0.0"
+ },
+ "max_tools_count": 128
+ }
+}
+```
+5. 在项目根目录创建下`.env`文件，并设置以下环境变量:
+```
+PUBLIC_IP=your-ip # 服务器公网IP
+MQTT_PORT=1883 # MQTT服务器端口
+UDP_PORT=8884 # UDP服务器端口
+API_PORT=8007 # 管理API端口
+MQTT_SIGNATURE_KEY=test # MQTT签名密钥
+SERVER_SECRET=Te1st12134 # 服务器密钥，请保持和智控台（server.secret）一致或者和xiaozhi-server里（server.auth_key）保持一致
+```
+请注意`PUBLIC_IP`配置，确保其与实际公网IP一致，如果有域名就填域名。
+
+`MQTT_SIGNATURE_KEY` 是用于MQTT连接认证的密钥，最好设置成复杂一点的，最好是设置成8个字符以上且同时包含大小写字母，这个密钥稍后还会用到。
+
+- 注意不要用简单的密码，比如`123456`、`test`等。
+- 注意不要用简单的密码，比如`123456`、`test`等。
+- 注意不要用简单的密码，比如`123456`、`test`等。
+
+`SERVER_SECRET` 是用生成websocket连接的认证信息。
+
+1、如果你是全模块部署，且你的智控台的参数管理里`server.auth.enabled`设置成了`true`，那么，`SERVER_SECRET`需要和智控台（`server.secret`）保持一致。
+
+2、如果你是单模块部署，且你在配置文件里把`server.auth.enabled`设置成了`true`，那么，`SERVER_SECRET`需要和配置文件里（`server.auth_key`）保持一致。
+
+
+6. 启动MQTT网关
+```
+# 启动服务
+pm2 start ecosystem.config.js
+
+# 查看日志
+pm2 logs xz-mqtt
+```
+
+当你看到如下日志，说明MQTT网关启动成功：
+```
+0|xz-mqtt | 2025-09-11T12:14:48: MQTT 服务器正在监听端口 1883
+0|xz-mqtt | 2025-09-11T12:14:48: UDP 服务器正在监听 x.x.x.x:8884
+```
+
+如果需要重启MQTT网关，执行如下命令：
+```
+pm2 restart xz-mqtt
+```
+
+## 第二部分：全模块运行实现小智硬件MQTT+UDP连接
+
+查看你智控台首页底部的版本号，确认你的智控台版本是否是`0.7.7`及以上版本。如果不是，需要升级智控台。
+
+1. 在智控台顶部，点击`参数管理`，搜索`server.mqtt_gateway`，点击编辑，填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`MQTT_PORT`。类似这样
+```
+192.168.0.7:1883
+```
+2. 在智控台顶部，点击`参数管理`，搜索`server.mqtt_signature_key`，点击编辑，填入你在`.env`文件中设置的`MQTT_SIGNATURE_KEY`。
+
+3. 在智控台顶部，点击`参数管理`，搜索`server.udp_gateway`，点击编辑，填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`UDP_PORT`。类似这样
+```
+192.168.0.7:8884
+```
+4. 在智控台顶部，点击`参数管理`，搜索`server.mqtt_manager_api`，点击编辑，填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`UDP_PORT`。类似这样
+```
+192.168.0.7:8007
+```
+
+上面的配置完成后，你可以使用curl命令，验证你的ota地址是否会下发mqtt配置，把下面的`http://localhost:8002/xiaozhi/ota/`改成你的ota地址
+```
+curl 'http://localhost:8002/xiaozhi/ota/' \
+ -H 'Content-Type: application/json' \
+ -H 'Client-Id: 7b94d69a-9808-4c59-9c9b-704333b38aff' \
+ -H 'Device-Id: 11:22:33:44:55:66' \
+ --data-raw $'{\n "application": {\n "version": "1.0.1",\n "elf_sha256": "1"\n },\n "board": {\n "mac": "11:22:33:44:55:66"\n }\n}'
+```
+
+如果返回的内容包含`mqtt`相关的配置，说明配置成功。类似这样
+
+```
+{"server_time":{"timestamp":1757567894012,"timeZone":"Asia/Shanghai","timezone_offset":480},"activation":{"code":"460609","message":"http://xiaozhi.server.com\n460609","challenge":"11:22:33:44:55:66"},"firmware":{"version":"1.0.1","url":"http://xiaozhi.server.com:8002/xiaozhi/otaMag/download/NOT_ACTIVATED_FIRMWARE_THIS_IS_A_INVALID_URL"},"websocket":{"url":"ws://192.168.4.23:8000/xiaozhi/v1/"},"mqtt":{"endpoint":"192.168.0.7:1883","client_id":"GID_default@@@11_22_33_44_55_66@@@7b94d69a-9808-4c59-9c9b-704333b38aff","username":"eyJpcCI6IjA6MDowOjA6MDowOjA6MSJ9","password":"Y8XP9xcUhVIN9OmbCHT9ETBiYNE3l3Z07Wk46wV9PE8=","publish_topic":"device-server","subscribe_topic":"devices/p2p/11_22_33_44_55_66"}}
+```
+
+由于MQTT信息是需要靠OTA地址下发的，因此只有你保证能正常连接服务器的OTA地址，重启唤醒即可。
+
+唤醒后留意mqtt-gateway的日志，确认是否有连接成功的日志。
+```
+pm2 logs xz-mqtt
+```
+
+## 第三部分：全模块运行实现小智硬件MQTT+UDP连接
+
+打开你的`data/.config.yaml`文件，在`server`下找到`mqtt_gateway`填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`MQTT_PORT`。类似这样
+```
+192.168.0.7:1883
+```
+在`server`下找到`mqtt_signature_key`填入你在`.env`文件中设置的`MQTT_SIGNATURE_KEY`。
+
+在`server`下找到`udp_gateway`填入你在`.env`文件中设置的`PUBLIC_IP`+`:`+`UDP_PORT`。类似这样
+```
+192.168.0.7:8884
+```
+
+上面的配置完成后，你可以使用curl命令，验证你的ota地址是否会下发mqtt配置，把下面的`http://localhost:8002/xiaozhi/ota/`改成你的ota地址
+```
+curl 'http://localhost:8002/xiaozhi/ota/' \
+ -H 'Device-Id: 11:22:33:44:55:66' \
+ --data-raw $'{\n "application": {\n "version": "1.0.1",\n "elf_sha256": "1"\n },\n "board": {\n "mac": "11:22:33:44:55:66"\n }\n}'
+```
+
+如果返回的内容包含`mqtt`相关的配置，说明配置成功。类似这样
+```
+{"server_time":{"timestamp":1758781561083,"timeZone":"GMT+08:00","timezone_offset":480},"activation":{"code":"527111","message":"http://xiaozhi.server.com\n527111","challenge":"11:22:33:44:55:66"},"firmware":{"version":"1.0.1","url":"http://xiaozhi.server.com:8002/xiaozhi/otaMag/download/NOT_ACTIVATED_FIRMWARE_THIS_IS_A_INVALID_URL"},"websocket":{"url":"ws://192.168.1.15:8000/xiaozhi/v1/"},"mqtt":{"endpoint":"192.168.1.15:1883","client_id":"GID_default@@@11_22_33_44_55_66@@@11_22_33_44_55_66","username":"eyJpcCI6IjE5Mi4xNjguMS4xNSJ9","password":"fjAYs49zTJecWqJ3jBt+kqxVn/x7vkXRAc85ak/va7Y=","publish_topic":"device-server","subscribe_topic":"devices/p2p/11_22_33_44_55_66"}}
+```
+
+由于MQTT信息是需要靠OTA地址下发的，因此只有你保证能正常连接服务器的OTA地址，重启唤醒即可。
+
+唤醒后留意mqtt-gateway的日志，确认是否有连接成功的日志。
+```
+pm2 logs xz-mqtt
+```
\ No newline at end of file
diff --git a/docs/ota-upgrade-guide.md b/docs/ota-upgrade-guide.md
new file mode 100644
index 00000000..0df4a2ff
--- /dev/null
+++ b/docs/ota-upgrade-guide.md
@@ -0,0 +1,142 @@
+# 单模块部署固件OTA自动升级配置指南
+
+本教程将指导你如何在**单模块部署**场景下配置固件OTA自动升级功能，实现设备固件的自动更新。
+
+如果你已经使用**全模块部署**，请忽略本教程。
+
+## 功能介绍
+
+在单模块部署中，xiaozhi-server内置了OTA固件管理功能，可以自动检测设备版本并下发升级固件。系统会根据设备型号和当前版本，自动匹配并推送最新的固件版本。
+
+## 前提条件
+
+- 你已经成功进行**单模块部署**并运行xiaozhi-server
+- 设备能够正常连接到服务器
+
+## 第一步 准备固件文件
+
+### 1. 创建固件存放目录
+
+固件文件需要放在`data/bin/`目录下。如果该目录不存在，请手动创建：
+
+```bash
+mkdir -p data/bin
+```
+
+### 2. 固件文件命名规则
+
+固件文件必须遵循以下命名格式：
+
+```
+{设备型号}_{版本号}.bin
+```
+
+**命名规则说明：**
+- `设备型号`：设备的型号名称，例如 `lichuang-dev`、`bread-compact-wifi` 等
+- `版本号`：固件版本号，必须以数字开头，支持数字、字母、点号、下划线和短横线，例如 `1.6.6`、`2.0.0` 等
+- 文件扩展名必须是 `.bin`
+
+**命名示例：**
+```
+bread-compact-wifi_1.6.6.bin
+lichuang-dev_2.0.0.bin
+```
+
+### 3. 放置固件文件
+
+将准备好的固件文件（.bin文件）复制到`data/bin/`目录下：
+
+重要的事情说三遍：升级的bin文件是`xiaozhi.bin`，不是全量固件文件`merged-binary.bin`!
+
+重要的事情说三遍：升级的bin文件是`xiaozhi.bin`，不是全量固件文件`merged-binary.bin`!
+
+重要的事情说三遍：升级的bin文件是`xiaozhi.bin`，不是全量固件文件`merged-binary.bin`!
+
+```bash
+cp xiaozhi.bin data/bin/设备型号_版本号.bin
+```
+
+例如：
+```bash
+cp xiaozhi.bin data/bin/bread-compact-wifi_1.6.6.bin
+```
+
+## 第二步 配置公网访问地址（仅公网部署需要）
+
+**注意：此步骤仅适用于单模块公网部署的场景。**
+
+如果你的xiaozhi-server是公网部署（使用公网IP或域名），**必须**配置`server.vision_explain`参数，因为OTA固件下载地址会使用该配置的域名和端口。
+
+如果你是局域网部署，可以跳过此步骤。
+
+### 为什么要配置这个参数？
+
+在单模块部署中，系统生成固件下载地址时，会使用`vision_explain`配置的域名和端口作为基础地址。如果不配置或配置错误，设备将无法访问固件下载地址。
+
+### 配置方法
+
+打开`data/.config.yaml`文件，找到`server`配置段，设置`vision_explain`参数：
+
+```yaml
+server:
+ vision_explain: http://你的域名或IP:端口号/mcp/vision/explain
+```
+
+**配置示例：**
+
+局域网部署（默认）：
+```yaml
+server:
+ vision_explain: http://192.168.1.100:8003/mcp/vision/explain
+```
+
+公网域名部署：
+```yaml
+server:
+ vision_explain: http://yourdomain.com:8003/mcp/vision/explain
+```
+
+### 注意事项
+
+- 域名或IP必须是设备能够访问的地址
+- 如果使用Docker部署，不能使用Docker内部地址（如127.0.0.1或localhost）
+- 如果你使用了nginx反向代理，请填写对外的地址和端口号，不是本项目运行的端口号
+
+
+## 常见问题
+
+### 1. 设备收不到固件更新
+
+**可能原因和解决方法：**
+
+- 检查固件文件命名是否符合规则：`{型号}_{版本号}.bin`
+- 检查固件文件是否正确放置在`data/bin/`目录
+- 检查设备型号是否与固件文件名中的型号匹配
+- 检查固件版本号是否高于设备当前版本
+- 查看服务器日志，确认OTA请求是否正常处理
+
+### 2. 设备报告下载地址无法访问
+
+**可能原因和解决方法：**
+
+- 检查`server.vision_explain`配置的域名或IP是否正确
+- 确认端口号配置正确（默认8003）
+- 如果是公网部署，确保设备能够访问该公网地址
+- 如果是Docker部署，确保不是使用了内部地址（127.0.0.1）
+- 检查防火墙是否开放了对应端口
+- 如果你使用了nginx反向代理，请填写对外的地址和端口号，不是本项目运行的端口号
+
+### 3. 如何确认设备当前版本
+
+查看OTA请求日志，日志中会显示设备上报的版本号：
+
+```
+[ota_handler] - 设备 AA:BB:CC:DD:EE:FF 固件已是最新: 1.6.6
+```
+
+### 4. 固件文件放置后没有生效
+
+系统有30秒的缓存时间（默认），可以：
+- 等待30秒后再让设备发起OTA请求
+- 重启xiaozhi-server服务
+- 调整`firmware_cache_ttl`配置为更短的时间
diff --git a/docs/paddlespeech-deploy.md b/docs/paddlespeech-deploy.md
index 17030fab..94621eb5 100644
--- a/docs/paddlespeech-deploy.md
+++ b/docs/paddlespeech-deploy.md
@@ -1,5 +1,9 @@
# PaddleSpeechTTS集成xiaozhi服务
+## 重点说明
+- 优点：本地离线部署、速度快
+- 缺点：截止2025年9月25日，默认的模型是中文模型，不支持英文转语音。如果含英文会发不出声音，如需同时支持中英文需要自己训练。
+
## 一、基础环境要求
操作系统：Windows / Linux / WSL 2
@@ -16,15 +20,21 @@ git clone https://github.com/PaddlePaddle/PaddleSpeech.git
```
### 2.建立虚拟环境
```bash
-#请根据Paddle官方支持的python版本建立环境 ```https://www.paddlepaddle.org.cn/install```
+
conda create -n paddle_env python=3.10 -y
conda activate paddle_env
```
-### 3.进入paddlespeech目录
+### 3.安装paddle
+因CPU架构、GPU架构不同，请根据Paddle官方支持的python版本建立环境
+```
+https://www.paddlepaddle.org.cn/install
+```
+
+### 4.进入paddlespeech目录
```bash
cd PaddleSpeech
```
-### 4.安装paddlespeech
+### 5.安装paddlespeech
```bash
pip install pytest-runner -i https://pypi.tuna.tsinghua.edu.cn/simple
@@ -32,17 +42,17 @@ pip install pytest-runner -i https://pypi.tuna.tsinghua.edu.cn/simple
pip install paddlepaddle -i https://mirror.baidu.com/pypi/simple
pip install paddlespeech -i https://pypi.tuna.tsinghua.edu.cn/simple
```
-### 5.使用命令自动下载语音模型
+### 6.使用命令自动下载语音模型
```bash
paddlespeech tts --input "你好，这是一次测试"
```
此步骤会自动下载模型缓存至本地 .paddlespeech/models 目录
-### 6.修改tts_online_application.yaml配置
+### 7.修改tts_online_application.yaml配置
参考目录 ```"PaddleSpeech\demos\streaming_tts_server\conf\tts_online_application.yaml"```
选择```tts_online_application.yaml```文件用编辑器打开，设置```protocol```为```websocket```
-### 7.启动服务
+### 8.启动服务
```yaml
paddlespeech_server start --config_file ./demos/streaming_tts_server/conf/tts_online_application.yaml
#官方默认启动命令：
diff --git a/docs/ragflow-integration.md b/docs/ragflow-integration.md
new file mode 100644
index 00000000..7d2b4eab
--- /dev/null
+++ b/docs/ragflow-integration.md
@@ -0,0 +1,269 @@
+# ragflow 集成指南
+
+本教程主要是是两部分
+
+- 一、如何部署ragflow
+- 二、如何在智控台配置ragflow接口
+
+如果您对ragflow很熟悉，且已经部署了ragflow，可直接跳过第一部分，直接进入第二部分。但是如果你希望有人指导你部署ragflow，让它能够和`xiaozhi-esp32-server`共同使用`mysql`、`redis`基础服务，以减少资源成本，你需要从第一部分开始。
+
+# 第一部分 如何部署ragflow
+## 第一步， 确认mysql、redis是否可用
+
+ragflow需要依赖`mysql`数据库。如果你之前已经部署`智控台`，说明你已经安装了`mysql`。你可以共用它。
+
+你可以你试一下在宿主机使用`telnet`命令，看看能不能正常访问`mysql`的`3306`端口。
+``` shell
+telnet 127.0.0.1 3306
+
+telnet 127.0.0.1 6379
+```
+如果能访问到`3306`端口和`6379`端口，请忽略以下的内容，直接进入第二步。
+
+如果不能访问，你需要回忆一下，你的`mysql`是怎么安装的。
+
+如果你的mysql是通过自己使用安装包安装的，说明你的`mysql`做了网络隔离。你可能先解决访问`mysql`的`3306`端口这个问题。
+
+如果你`mysql`是通过本项目的`docker-compose_all.yml`安装的。你需要找一下你当时创建数据库的`docker-compose_all.yml`文件，修改以下的内容
+
+修改前
+``` yaml
+ xiaozhi-esp32-server-db:
+ ...
+ networks:
+ - default
+ expose:
+ - "3306:3306"
+ xiaozhi-esp32-server-redis:
+ ...
+ expose:
+ - 6379
+```
+
+修改后
+``` yaml
+ xiaozhi-esp32-server-db:
+ ...
+ networks:
+ - default
+ ports:
+ - "3306:3306"
+ xiaozhi-esp32-server-redis:
+ ...
+ ports:
+ - "6379:6379"
+```
+
+注意是将`xiaozhi-esp32-server-db`和`xiaozhi-esp32-server-redis`下面的`expose`改成`ports`。改完后，需要重新启动。以下是重启mysql的命令：
+
+``` shell
+# 进入你docker-compose_all.yml所在的文件夹，例如我的是xiaozhi-server
+cd xiaozhi-server
+docker compose -f docker-compose_all.yml down
+docker compose -f docker-compose.yml up -d
+```
+
+启动完后，在宿主机再使用`telnet`命令，看看能不能正常访问`mysql`的`3306`端口。
+``` shell
+telnet 127.0.0.1 3306
+
+telnet 127.0.0.1 6379
+```
+正常来说这样就可以访问的了。
+
+## 第二步， 创建数据库和表
+如果你的宿主机，能正常访问mysql数据库，那就在mysql上创建一个名字为`rag_flow`的数据库和`rag_flow`用户，密码为`infini_rag_flow`。
+
+``` sql
+-- 创建数据库
+CREATE DATABASE IF NOT EXISTS rag_flow CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- 创建用户并授权
+CREATE USER IF NOT EXISTS 'rag_flow'@'%' IDENTIFIED BY 'infini_rag_flow';
+GRANT ALL PRIVILEGES ON rag_flow.* TO 'rag_flow'@'%';
+
+-- 刷新权限
+FLUSH PRIVILEGES;
+```
+
+## 第三步， 下载ragflow项目
+
+你需要在你电脑找一个文件夹，用来存放ragflow项目。例如我在`/home/system/xiaozhi`文件夹。
+
+你可以使用`git`命令，将ragflow项目下载到这个文件夹，本教程使用的是`v0.22.0`版本进行安装部署。
+```
+git clone https://ghfast.top/https://github.com/infiniflow/ragflow.git
+cd ragflow
+git checkout v0.22.0
+```
+下载完后，进入`docker`文件夹。
+``` shell
+cd docker
+```
+修改`ragflow/docker`文件夹下的`docker-compose.yml`文件，将`ragflow-cpu`和`ragflow-gpu`服务的`depends_on`配置去掉，用于解除`ragflow-cpu`服务对`mysql`的依赖。
+
+这是修改前：
+``` yaml
+ ragflow-cpu:
+ depends_on:
+ mysql:
+ condition: service_healthy
+ profiles:
+ - cpu
+ ...
+ ragflow-gpu:
+ depends_on:
+ mysql:
+ condition: service_healthy
+ profiles:
+ - gpu
+```
+这是修改后：
+``` yaml
+ ragflow-cpu:
+ profiles:
+ - cpu
+ ...
+ ragflow-gpu:
+ profiles:
+ - gpu
+```
+
+接着，修改`ragflow/docker`文件夹下的`docker-compose-base.yml`文件，去掉`mysql`和`redis`的配置。
+
+例如，删除前：
+``` yaml
+services:
+ minio:
+ image: quay.io/minio/minio:RELEASE.2025-06-13T11-33-47Z
+ ...
+ mysql:
+ image: mysql:8.0
+ ...
+ redis:
+ image: redis:6.2-alpine
+ ...
+```
+
+删除后
+``` yaml
+services:
+ minio:
+ image: quay.io/minio/minio:RELEASE.2025-06-13T11-33-47Z
+ ...
+```
+## 第四步，修改环境变量配置
+
+编辑`ragflow/docker`文件夹下的`.env`文件,找到以下配置，逐个搜索，逐个修改！逐个搜索，逐个修改！
+
+下面对于`.env`文件的修改，60%的人会忽略`MYSQL_USER`配置导致ragflow启动不成功，因此，需要强调三次：
+
+强调第一次：如果你的`.env`文件如果没有`MYSQL_USER`配置，请在配置文件增加这项！
+
+强调第二次：如果你的`.env`文件如果没有`MYSQL_USER`配置，请在配置文件增加这项！
+
+强调第三次：如果你的`.env`文件如果没有`MYSQL_USER`配置，请在配置文件增加这项！
+
+``` env
+# 端口设置
+SVR_WEB_HTTP_PORT=8008 # HTTP端口
+SVR_WEB_HTTPS_PORT=8009 # HTTPS端口
+# MySQL配置 - 修改为您本地MySQL的信息
+MYSQL_HOST=host.docker.internal # 使用host.docker.internal让容器访问主机服务
+MYSQL_PORT=3306 # 本地MySQL端口
+MYSQL_USER=rag_flow # 上面创建的用户名，如果没有这项就增加这一项
+MYSQL_PASSWORD=infini_rag_flow # 上面设置的密码
+MYSQL_DBNAME=rag_flow # 数据库名称
+
+# Redis配置 - 修改为您本地Redis的信息
+REDIS_HOST=host.docker.internal # 使用host.docker.internal让容器访问主机服务
+REDIS_PORT=6379 # 本地Redis端口
+REDIS_PASSWORD= # 如果你的Redis没有设置密码，就按这样子填写，否则填写密码
+```
+
+注意，如果你的Redis没有设置密码，还要修改`ragflow/docker`文件夹下`service_conf.yaml.template`，将`infini_rag_flow`替换成空字符串。
+
+修改前
+``` shell
+redis:
+ db: 1
+ password: '${REDIS_PASSWORD:-infini_rag_flow}'
+ host: '${REDIS_HOST:-redis}:6379'
+```
+修改后
+``` shell
+redis:
+ db: 1
+ password: '${REDIS_PASSWORD:-}'
+ host: '${REDIS_HOST:-redis}:6379'
+```
+
+## 第五步，启动ragflow服务
+执行命令：
+``` shell
+docker-compose -f docker-compose.yml up -d
+```
+执行成功后，你可以使用`docker logs -n 20 -f docker-ragflow-cpu-1`命令，查看`docker-ragflow-cpu-1`服务的日志。
+
+如果日志中没有报错，说明ragflow服务启动成功。
+
+# 第五步，注册账号
+你可以在浏览器中访问`http://127.0.0.1:8008`，点击`Sign Up`，注册一个账号。
+
+注册成功后，你可以点击`Sign In`，登录到ragflow服务。如果你想关闭ragflow服务的注册服务，不想让其他人注册账号，你可以在`ragflow/docker`文件夹下的`.env`文件中，将`REGISTER_ENABLED`配置项设置为`0`。
+
+``` dotenv
+REGISTER_ENABLED=0
+```
+修改后，重启启动ragflow服务。
+``` shell
+docker-compose -f docker-compose.yml down
+docker-compose -f docker-compose.yml up -d
+```
+
+# 第六步，配置ragflow服务的模型
+你可以在浏览器中访问`http://127.0.0.1:8008`，点击`Sign In`，登录到ragflow服务。点击页面右上角的`头像`，进入设置页面。
+首先，在左侧导航栏中，点击`模型供应商`，进入到模型配置页面。在右侧的`可选模型`搜索框下，选择`LLM`，在列表选择你使用的模型供应商，点击`添加`，输入你的密钥；
+然后，选择`TEXT EMBEDDING`，在列表选择你使用的模型供应商，点击`添加`，输入你的密钥。
+最后，刷新一下页面，分别点击`设置默认模型`列表的LLM和Embedding，选择你使用的模型即可。请确认你的密钥开通了相应的服务，比如我是用的Embedding模型是xxx供应商的，需要去这个供应商官网查看这个模型是否需要购买资源包才能使用。
+
+
+# 第二部分 配置ragflow服务
+
+# 第一步 登录ragflow服务
+你可以在浏览器中访问`http://127.0.0.1:8008`，点击`Sign In`，登录到ragflow服务。
+
+然后点击右上角的`头像`，进入设置页面。在左侧导航栏中，点击`API`功能，然后点击"API Key"按钮。出现一个弹框，
+
+在弹框中，点击"Create new Key"按钮，生成一个API Key。复制这个`API Key`，你稍后会用到。
+
+# 第二步 配置到智控台
+确保你的智控台版本是`0.8.7`或以上。使用超级管理员账号登录到智控台。
+
+首先，你要先开启知识库功能。在顶部导航栏中，点击`参数字典`，在下拉菜单中，点击`系统功能配置`页面。在页面上勾选`知识库`，点击`保存配置`。即可在导航栏看到`知识库`功能。
+
+在顶部导航栏中，点击`模型配置`，在左侧导航栏中，点击`知识库`。在列表中找到`RAG_RAGFlow`，点击`编辑`按钮。
+
+在`服务地址`中，填写`http://你的ragflow服务的局域网IP:8008`，例如我的ragflow服务的局域网IP是`192.168.1.100`，那么我就填写`http://192.168.1.100:8008`。
+
+在`API密钥`中，填写之前复制的`API Key`。
+
+最后点击保存按钮。
+
+# 第二步 创建一个知识库
+使用超级管理员账号登录到智控台。在顶部导航栏中，点击`知识库`，在列表左下脚，点击`新增`按钮。填写一个知识库的名字和描述。点击保存。
+
+为了提高大模型对知识库的理解和召回能力，建议在创建知识库时，填写一个有意义的名字和描述。例如，如果你要创建一个关于`公司介绍`的知识库，那么知识库的名字可以是`公司介绍`，描述可以是`关于公司的相关信息例如公司基本信息、服务项目、联系电话、地址等。`。
+
+保存后，你可以在知识库列表中看到这个知识库。点击刚才创建的知识库的`查看`按钮，进入知识库详情页面。
+
+在知识库详情页面中，左下角点击`新增`按钮，可以上传文档到知识库。
+
+上传后，你可以在知识库详情页面中，看到上传的文档。此时可以点击文档的`解析`按钮，解析文档。
+
+解析完成后，你可以查看解析后的切片信息。你可以在知识库详情页面中，点击`召回测试`按钮，可以测试知识库的召回/检索功能。
+
+# 第三步 让小智使用ragflow知识库
+登录到智控台。在顶部导航栏中，点击`智能体`，找到你要配置的智能体，点击`配置角色`按钮。
+
+在意图识别左侧，点击`编辑功能`按钮，弹出一个弹框。在弹框中选择你要添加的知识库。保存即可。
diff --git a/docs/voiceprint-integration.md b/docs/voiceprint-integration.md
index 9db1af0c..bd0731e8 100644
--- a/docs/voiceprint-integration.md
+++ b/docs/voiceprint-integration.md
@@ -28,7 +28,7 @@ telnet 127.0.0.1 3306
如果不能访问，你需要回忆一下，你的`mysql`是怎么安装的。
-如果你的mysql是通过自己使用安装包安装的，说明你的`mysql`做了网络隔离。你可能先解访问`mysql`的`3306`端口这个问题。
+如果你的mysql是通过自己使用安装包安装的，说明你的`mysql`做了网络隔离。你可能先解决访问`mysql`的`3306`端口这个问题。
如果你`mysql`是通过本项目的`docker-compose_all.yml`安装的。你需要找一下你当时创建数据库的`docker-compose_all.yml`文件，修改以下的内容
@@ -164,6 +164,8 @@ http://192.168.1.25:8005/voiceprint/health?key=abcd
# 2、全模块部署时，怎么配置声纹识别
## 第一步 配置接口
+首先，你要开启声纹识别功能。在智控台，点击顶部`参数字典`，在下拉菜单中，点击`系统功能配置`页面。在页面上勾选`声纹识别`，点击`保存配置`。即可在新建智能体的卡片上看到`声纹识别`按钮。
+
如果你是全模块部署，使用管理员账号，登录智控台，点击顶部`参数字典`，选择`参数管理`功能。
然后搜索参数`server.voice_print`，此时，它的值应该是`null`值。
diff --git a/main/manager-api/pom.xml b/main/manager-api/pom.xml
index 874a743a..b3798571 100644
--- a/main/manager-api/pom.xml
+++ b/main/manager-api/pom.xml
@@ -199,6 +199,12 @@
knife4j-openapi3-jakarta-spring-boot-starter
${knife4j.version}
+
+
+ org.bouncycastle
+ bcprov-jdk18on
+ 1.78
+
org.springdoc
diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
index afd7addf..c3f498d4 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
@@ -86,11 +86,26 @@ public interface Constant {
*/
String SERVER_SECRET = "server.secret";
+ /**
+ * SM2公钥
+ */
+ String SM2_PUBLIC_KEY = "server.public_key";
+
+ /**
+ * SM2私钥
+ */
+ String SM2_PRIVATE_KEY = "server.private_key";
+
/**
* websocket地址
*/
String SERVER_WEBSOCKET = "server.websocket";
+ /**
+ * mqtt gateway 配置
+ */
+ String SERVER_MQTT_GATEWAY = "server.mqtt_gateway";
+
/**
* ota地址
*/
@@ -121,11 +136,31 @@ public interface Constant {
*/
String SERVER_VOICE_PRINT = "server.voice_print";
+ /**
+ * mqtt密钥
+ */
+ String SERVER_MQTT_SECRET = "server.mqtt_signature_key";
+
+ /**
+ * WebSocket认证开关
+ */
+ String SERVER_AUTH_ENABLED = "server.auth.enabled";
+
/**
* 无记忆
*/
String MEMORY_NO_MEM = "Memory_nomem";
+ /**
+ * 火山引擎双声道语音克隆
+ */
+ String VOICE_CLONE_HUOSHAN_DOUBLE_STREAM = "huoshan_double_stream";
+
+ /**
+ * RAG配置类型
+ */
+ String RAG_CONFIG_TYPE = "RAG";
+
enum SysBaseParam {
/**
* ICP备案号
@@ -151,6 +186,38 @@ public interface Constant {
}
}
+ /**
+ * 训练状态
+ */
+ enum TrainStatus {
+ /**
+ * 未训练
+ */
+ NOT_TRAINED(0),
+ /**
+ * 训练中
+ */
+ TRAINING(1),
+ /**
+ * 已训练
+ */
+ TRAINED(2),
+ /**
+ * 训练失败
+ */
+ TRAIN_FAILED(3);
+
+ private final int code;
+
+ TrainStatus(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+ }
+
/**
* 系统短信
*/
@@ -237,7 +304,7 @@ public interface Constant {
/**
* 版本号
*/
- public static final String VERSION = "0.7.7";
+ public static final String VERSION = "0.8.10";
/**
* 无效固件URL
diff --git a/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java b/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java
index 6a9af011..c0f49754 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java
@@ -55,4 +55,189 @@ public interface ErrorCode {
int OTA_DEVICE_NOT_FOUND = 10041;
int OTA_DEVICE_NEED_BIND = 10042;
+
+ // 新增错误编码
+ int DELETE_DATA_FAILED = 10043;
+ int USER_NOT_LOGIN = 10044;
+ int WEB_SOCKET_CONNECT_FAILED = 10045;
+ int VOICE_PRINT_SAVE_ERROR = 10046;
+ int TODAY_SMS_LIMIT_REACHED = 10047;
+ int OLD_PASSWORD_ERROR = 10048;
+ int INVALID_LLM_TYPE = 10049;
+ int TOKEN_GENERATE_ERROR = 10050;
+ int RESOURCE_NOT_FOUND = 10051;
+
+ // 新增错误编码
+ int DEFAULT_AGENT_NOT_FOUND = 10052;
+ int AGENT_NOT_FOUND = 10053;
+ int VOICEPRINT_API_NOT_CONFIGURED = 10054;
+ int SMS_SEND_FAILED = 10055;
+ int SMS_CONNECTION_FAILED = 10056;
+ int AGENT_VOICEPRINT_CREATE_FAILED = 10057;
+ int AGENT_VOICEPRINT_UPDATE_FAILED = 10058;
+ int AGENT_VOICEPRINT_DELETE_FAILED = 10059;
+ int SMS_SEND_TOO_FREQUENTLY = 10060;
+ int ACTIVATION_CODE_EMPTY = 10061;
+ int ACTIVATION_CODE_ERROR = 10062;
+ int DEVICE_ALREADY_ACTIVATED = 10063;
+ // 默认模型删除错误
+ int DEFAULT_MODEL_DELETE_ERROR = 10064;
+ // 登录相关错误码
+ int ADD_DATA_FAILED = 10065; // 新增数据失败
+ int UPDATE_DATA_FAILED = 10066; // 修改数据失败
+ int SMS_CAPTCHA_ERROR = 10067; // 短信验证码错误
+ int MOBILE_REGISTER_DISABLED = 10068; // 未开启手机注册
+ int USERNAME_NOT_PHONE = 10069; // 用户名不是手机号码
+ int PHONE_ALREADY_REGISTERED = 10070; // 手机号码已注册
+ int PHONE_NOT_REGISTERED = 10071; // 手机号码未注册
+ int USER_REGISTER_DISABLED = 10072; // 不允许用户注册
+ int RETRIEVE_PASSWORD_DISABLED = 10073; // 未开启找回密码功能
+ int PHONE_FORMAT_ERROR = 10074; // 手机号码格式不正确
+ int SMS_CODE_ERROR = 10075; // 手机验证码错误
+
+ // 字典类型相关错误码
+ int DICT_TYPE_NOT_EXIST = 10076; // 字典类型不存在
+ int DICT_TYPE_DUPLICATE = 10077; // 字典类型编码重复
+
+ // 资源处理相关错误码
+ int RESOURCE_READ_ERROR = 10078; // 读取资源失败
+
+ // 智能体相关错误码
+ int LLM_INTENT_PARAMS_MISMATCH = 10079; // LLM大模型和Intent意图识别，选择参数不匹配
+
+ // 声纹相关错误码
+ int VOICEPRINT_ALREADY_REGISTERED = 10080; // 此声音声纹已经注册
+ int VOICEPRINT_DELETE_ERROR = 10081; // 删除声纹出现错误
+ int VOICEPRINT_UPDATE_NOT_ALLOWED = 10082; // 声纹修改不允许，声音已注册
+ int VOICEPRINT_UPDATE_ADMIN_ERROR = 10083; // 修改声纹错误，请联系管理员
+ int VOICEPRINT_API_URI_ERROR = 10084; // 声纹接口地址错误
+ int VOICEPRINT_AUDIO_NOT_BELONG_AGENT = 10085; // 音频数据不属于智能体
+ int VOICEPRINT_AUDIO_EMPTY = 10086; // 音频数据为空
+ int VOICEPRINT_REGISTER_REQUEST_ERROR = 10087; // 声纹保存请求失败
+ int VOICEPRINT_REGISTER_PROCESS_ERROR = 10088; // 声纹保存处理失败
+ int VOICEPRINT_UNREGISTER_REQUEST_ERROR = 10089; // 声纹注销请求失败
+ int VOICEPRINT_UNREGISTER_PROCESS_ERROR = 10090; // 声纹注销处理失败
+ int VOICEPRINT_IDENTIFY_REQUEST_ERROR = 10091; // 声纹识别请求失败
+
+ int LLM_NOT_EXIST = 10092; // 设置的LLM不存在
+ int MODEL_REFERENCED_BY_AGENT = 10093; // 该模型配置已被智能体引用，无法删除
+ int LLM_REFERENCED_BY_INTENT = 10094; // 该LLM模型已被意图识别配置引用，无法删除
+
+ // 服务端管理相关错误码
+ int INVALID_SERVER_ACTION = 10095; // 无效服务端操作
+ int SERVER_WEBSOCKET_NOT_CONFIGURED = 10096; // 未配置服务端WebSocket地址
+ int TARGET_WEBSOCKET_NOT_EXIST = 10097; // 目标WebSocket地址不存在
+
+ // 参数验证相关错误码
+ int WEBSOCKET_URLS_EMPTY = 10098; // WebSocket地址列表不能为空
+ int WEBSOCKET_URL_LOCALHOST = 10099; // WebSocket地址不能使用localhost或127.0.0.1
+ int WEBSOCKET_URL_FORMAT_ERROR = 10100; // WebSocket地址格式不正确
+ int WEBSOCKET_CONNECTION_FAILED = 10101; // WebSocket连接测试失败
+ int OTA_URL_EMPTY = 10102; // OTA地址不能为空
+ int OTA_URL_LOCALHOST = 10103; // OTA地址不能使用localhost或127.0.0.1
+ int OTA_URL_PROTOCOL_ERROR = 10104; // OTA地址必须以http或https开头
+ int OTA_URL_FORMAT_ERROR = 10105; // OTA地址必须以/ota/结尾
+ int OTA_INTERFACE_ACCESS_FAILED = 10106; // OTA接口访问失败
+ int OTA_INTERFACE_FORMAT_ERROR = 10107; // OTA接口返回内容格式不正确
+ int OTA_INTERFACE_VALIDATION_FAILED = 10108; // OTA接口验证失败
+ int MCP_URL_EMPTY = 10109; // MCP地址不能为空
+ int MCP_URL_LOCALHOST = 10110; // MCP地址不能使用localhost或127.0.0.1
+ int MCP_URL_INVALID = 10111; // 不是正确的MCP地址
+ int MCP_INTERFACE_ACCESS_FAILED = 10112; // MCP接口访问失败
+ int MCP_INTERFACE_FORMAT_ERROR = 10113; // MCP接口返回内容格式不正确
+ int MCP_INTERFACE_VALIDATION_FAILED = 10114; // MCP接口验证失败
+ int VOICEPRINT_URL_EMPTY = 10115; // 声纹接口地址不能为空
+ int VOICEPRINT_URL_LOCALHOST = 10116; // 声纹接口地址不能使用localhost或127.0.0.1
+ int VOICEPRINT_URL_INVALID = 10117; // 不是正确的声纹接口地址
+ int VOICEPRINT_URL_PROTOCOL_ERROR = 10118; // 声纹接口地址必须以http或https开头
+ int VOICEPRINT_INTERFACE_ACCESS_FAILED = 10119; // 声纹接口访问失败
+ int VOICEPRINT_INTERFACE_FORMAT_ERROR = 10120; // 声纹接口返回内容格式不正确
+ int VOICEPRINT_INTERFACE_VALIDATION_FAILED = 10121; // 声纹接口验证失败
+ int MQTT_SECRET_EMPTY = 10122; // mqtt密钥不能为空
+ int MQTT_SECRET_LENGTH_INSECURE = 10123; // mqtt密钥长度不安全
+ int MQTT_SECRET_CHARACTER_INSECURE = 10124; // mqtt密钥必须同时包含大小写字母
+ int MQTT_SECRET_WEAK_PASSWORD = 10125; // mqtt密钥包含弱密码
+ int DICT_LABEL_DUPLICATE = 10128; // 字典标签重复
+ int SM2_KEY_NOT_CONFIGURED = 10129; // SM2密钥未配置
+ int SM2_DECRYPT_ERROR = 10130; // SM2解密失败
+ int MODEL_TYPE_PROVIDE_CODE_NOT_NULL = 10131; // modelType和provideCode不能为空
+
+ // 聊天记录相关错误码
+ int CHAT_HISTORY_NO_PERMISSION = 10132; // 没有权限查看该智能体的聊天记录
+ int CHAT_HISTORY_SESSION_ID_NOT_NULL = 10133; // 会话ID不能为空
+ int CHAT_HISTORY_AGENT_ID_NOT_NULL = 10134; // 智能体ID不能为空
+ int CHAT_HISTORY_DOWNLOAD_FAILED = 10135; // 聊天记录下载失败
+ int DOWNLOAD_LINK_EXPIRED = 10136; // 下载链接已过期或无效
+ int DOWNLOAD_LINK_INVALID = 10137; // 下载链接无效
+ int CHAT_ROLE_USER = 10138; // 用户角色
+ int CHAT_ROLE_AGENT = 10139; // 智能体角色
+
+ // 声音克隆相关错误码
+ int VOICE_CLONE_AUDIO_EMPTY = 10140; // 音频文件不能为空
+ int VOICE_CLONE_NOT_AUDIO_FILE = 10141; // 只支持音频文件
+ int VOICE_CLONE_AUDIO_TOO_LARGE = 10142; // 音频文件大小不能超过10MB
+ int VOICE_CLONE_UPLOAD_FAILED = 10143; // 上传失败
+ int VOICE_CLONE_RECORD_NOT_EXIST = 10144; // 声音克隆记录不存在
+ int VOICE_RESOURCE_INFO_EMPTY = 10145; // 音色资源信息不能为空
+ int VOICE_RESOURCE_PLATFORM_NAME_EMPTY = 10146; // 平台名称不能为空
+ int VOICE_RESOURCE_ID_EMPTY = 10147; // 音色ID不能为空
+ int VOICE_RESOURCE_ACCOUNT_EMPTY = 10148; // 归属账号不能为空
+ int VOICE_RESOURCE_DELETE_ID_EMPTY = 10149; // 删除的音色资源ID不能为空
+ int VOICE_RESOURCE_NO_PERMISSION = 10150; // 您没有权限操作该记录
+ int VOICE_CLONE_AUDIO_NOT_UPLOADED = 10151; // 请先上传音频文件
+ int VOICE_CLONE_MODEL_CONFIG_NOT_FOUND = 10152; // 模型配置未找到
+ int VOICE_CLONE_MODEL_TYPE_NOT_FOUND = 10153; // 模型类型未找到
+ int VOICE_CLONE_TRAINING_FAILED = 10154; // 训练失败
+ int VOICE_CLONE_HUOSHAN_CONFIG_MISSING = 10155; // 火山引擎缺少配置
+ int VOICE_CLONE_RESPONSE_FORMAT_ERROR = 10156; // 响应格式错误
+ int VOICE_CLONE_REQUEST_FAILED = 10157; // 请求失败
+ int VOICE_CLONE_PREFIX = 10158; // 复刻音色前缀
+ int VOICE_ID_ALREADY_EXISTS = 10159; // 音色ID已存在
+ int VOICE_CLONE_HUOSHAN_VOICE_ID_ERROR = 10160; // 火山引擎音色ID格式错误
+
+ // 设备相关错误码
+ int MAC_ADDRESS_ALREADY_EXISTS = 10161; // Mac地址已存在
+ // 模型相关错误码
+ int MODEL_PROVIDER_NOT_EXIST = 10162; // 供应器不存在
+
+ // 知识库相关错误码
+ int Knowledge_Base_RECORD_NOT_EXISTS = 10163; // 知识库记录不存在
+ int RAG_CONFIG_NOT_FOUND = 10164; // RAG配置未找到
+ int RAG_CONFIG_TYPE_ERROR = 10165; // RAG配置类型错误
+ int RAG_DEFAULT_CONFIG_NOT_FOUND = 10166; // 默认RAG配置未找到
+ int RAG_API_ERROR = 10167; // RAG调用失败
+ int UPLOAD_FILE_ERROR = 10168; // 上传文件失败
+ int NO_PERMISSION = 10169; // 没有权限
+ int KNOWLEDGE_BASE_NAME_EXISTS = 10170; // 同名知识库已存在
+ int RAG_API_ERROR_URL_NULL = 10171; // RAG配置中base_url为空，请完善配置
+ int RAG_API_ERROR_API_KEY_NULL = 10172; // RAG配置中api_key为空，请完善配置
+ int RAG_API_ERROR_API_KEY_INVALID = 10173; // RAG配置中api_key包含占位符，请替换为实际的API密钥
+ int RAG_API_ERROR_URL_INVALID = 10174; // RAG配置中base_url格式不正确，请检查协议是否正确
+ int RAG_DATASET_ID_NOT_NULL = 10176; // RAG配置中dataset_id不能为空
+ int RAG_MODEL_ID_NOT_NULL = 10177; // RAG配置中model_id不能为空
+ int RAG_DATASET_ID_AND_MODEL_ID_NOT_NULL = 10178; // RAG配置中dataset_id和model_id不能为空
+ int RAG_FILE_NAME_NOT_NULL = 10179; // 文件名称不能为空
+ int RAG_FILE_CONTENT_EMPTY = 10180; // 文件内容不能为空
+
+ // 设备相关错误码（补充）
+ int MCA_NOT_NULL = 10175; // mac地址不能为空
+
+ // 音色克隆（补充）
+ int VOICE_CLONE_NAME_NOT_NULL = 10181; // 音色克隆名称不能为空
+ int VOICE_CLONE_AUDIO_NOT_FOUND = 10182; // 音色克隆音频不存在
+
+ // 智能体模板相关错误码(补充)
+ int AGENT_TEMPLATE_NOT_FOUND = 10183; // 默认智能体未找到
+
+ // 知识库适配器相关错误码
+ int RAG_ADAPTER_TYPE_NOT_SUPPORTED = 10184; // 不支持的适配器类型
+ int RAG_CONFIG_VALIDATION_FAILED = 10185; // RAG配置验证失败
+ int RAG_ADAPTER_CREATION_FAILED = 10186; // 适配器创建失败
+ int RAG_ADAPTER_INIT_FAILED = 10187; // 适配器初始化失败
+ int RAG_ADAPTER_CONNECTION_FAILED = 10188; // 适配器连接测试失败
+ int RAG_ADAPTER_OPERATION_FAILED = 10189; // 适配器操作失败
+ int RAG_ADAPTER_NOT_FOUND = 10190; // 适配器未找到
+ int RAG_ADAPTER_CACHE_ERROR = 10191; // 适配器缓存错误
+ int RAG_ADAPTER_TYPE_NOT_FOUND = 10192; // 适配器类型未找到
+
}
diff --git a/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java b/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java
index 01f1ccf2..e016bc09 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java
@@ -13,6 +13,7 @@ import org.springframework.web.servlet.resource.NoResourceFoundException;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.utils.MessageUtils;
import xiaozhi.common.utils.Result;
/**
@@ -62,7 +63,7 @@ public class RenExceptionHandler {
@ExceptionHandler(NoResourceFoundException.class)
public Result handleNoResourceFoundException(NoResourceFoundException ex) {
log.warn("Resource not found: {}", ex.getMessage());
- return new Result().error(404, "资源不存在");
+ return new Result().error(404, MessageUtils.getMessage(ErrorCode.RESOURCE_NOT_FOUND));
}
@ExceptionHandler(MethodArgumentNotValidException.class)
@@ -76,7 +77,7 @@ public class RenExceptionHandler {
})
.filter(Objects::nonNull)
.findFirst()
- .orElse("请求参数错误！");
+ .orElse(MessageUtils.getMessage(ErrorCode.PARAM_VALUE_NULL));
return new Result().error(ErrorCode.PARAM_VALUE_NULL, errorMsg);
}
diff --git a/main/manager-api/src/main/java/xiaozhi/common/handler/FieldMetaObjectHandler.java b/main/manager-api/src/main/java/xiaozhi/common/handler/FieldMetaObjectHandler.java
index a6b33b62..95add2f0 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/handler/FieldMetaObjectHandler.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/handler/FieldMetaObjectHandler.java
@@ -32,13 +32,23 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
// 创建者
strictInsertFill(metaObject, CREATOR, Long.class, user.getId());
- // 创建时间
- strictInsertFill(metaObject, CREATE_DATE, Date.class, date);
+ // 创建时间 - 支持createDate和createdAt两种字段名
+ if (metaObject.hasSetter(CREATE_DATE)) {
+ strictInsertFill(metaObject, CREATE_DATE, Date.class, date);
+ }
+ if (metaObject.hasSetter("createdAt")) {
+ strictInsertFill(metaObject, "createdAt", Date.class, date);
+ }
// 更新者
strictInsertFill(metaObject, UPDATER, Long.class, user.getId());
- // 更新时间
- strictInsertFill(metaObject, UPDATE_DATE, Date.class, date);
+ // 更新时间 - 支持updateDate和updatedAt两种字段名
+ if (metaObject.hasSetter(UPDATE_DATE)) {
+ strictInsertFill(metaObject, UPDATE_DATE, Date.class, date);
+ }
+ if (metaObject.hasSetter("updatedAt")) {
+ strictInsertFill(metaObject, "updatedAt", Date.class, date);
+ }
// 数据标识
strictInsertFill(metaObject, DATA_OPERATION, String.class, Constant.DataOperation.INSERT.getValue());
@@ -46,10 +56,17 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
@Override
public void updateFill(MetaObject metaObject) {
+ Date date = new Date();
+
// 更新者
strictUpdateFill(metaObject, UPDATER, Long.class, SecurityUser.getUserId());
- // 更新时间
- strictUpdateFill(metaObject, UPDATE_DATE, Date.class, new Date());
+ // 更新时间 - 支持updateDate和updatedAt两种字段名
+ if (metaObject.hasSetter(UPDATE_DATE)) {
+ strictUpdateFill(metaObject, UPDATE_DATE, Date.class, date);
+ }
+ if (metaObject.hasSetter("updatedAt")) {
+ strictUpdateFill(metaObject, "updatedAt", Date.class, date);
+ }
// 数据标识
strictInsertFill(metaObject, DATA_OPERATION, String.class, Constant.DataOperation.UPDATE.getValue());
diff --git a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
index 6daa3b2d..281472e0 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
@@ -139,4 +139,31 @@ public class RedisKeys {
return "sms:Validate:Code:" + phone + ":today_count";
}
+ /**
+ * 聊天记录UUID映射的Key
+ */
+ public static String getChatHistoryKey(String uuid) {
+ return "agent:chat:history:" + uuid;
+ }
+
+ /**
+ * 获取音色克隆音频ID的缓存key
+ */
+ public static String getVoiceCloneAudioIdKey(String uuid) {
+ return "voiceClone:audio:id:" + uuid;
+ }
+
+ /**
+ * 获取知识库缓存key
+ */
+ public static String getKnowledgeBaseCacheKey(String datasetId) {
+ return "knowledge:base:" + datasetId;
+ }
+
+ /**
+ * 获取临时注册设备标记key
+ */
+ public static String getTmpRegisterMacKey(String deviceId) {
+ return "tmp_register_mac:" + deviceId;
+ }
}
diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/MessageUtils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/MessageUtils.java
index c346bf3d..abcc2cb3 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/utils/MessageUtils.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/MessageUtils.java
@@ -11,15 +11,15 @@ import org.springframework.context.i18n.LocaleContextHolder;
public class MessageUtils {
private static MessageSource messageSource;
- static {
- messageSource = (MessageSource) SpringContextUtils.getBean("messageSource");
- }
-
public static String getMessage(int code) {
return getMessage(code, new String[0]);
}
public static String getMessage(int code, String... params) {
+ if (messageSource == null) {
+ // 延迟初始化，确保Spring上下文已完全初始化
+ messageSource = (MessageSource) SpringContextUtils.getBean("messageSource");
+ }
return messageSource.getMessage(code + "", params, LocaleContextHolder.getLocale());
}
}
diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/ResourcesUtils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/ResourcesUtils.java
index 49d9a727..cf2d0bcc 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/utils/ResourcesUtils.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/ResourcesUtils.java
@@ -6,6 +6,7 @@ import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;
import xiaozhi.common.exception.RenException;
+import xiaozhi.common.exception.ErrorCode;
import java.io.BufferedReader;
@@ -37,7 +38,7 @@ public class ResourcesUtils {
}
} catch (IOException e){
log.error("方法：loadString()读取资源失败--{}",e.getMessage());
- throw new RenException("读取资源失败");
+ throw new RenException(ErrorCode.RESOURCE_READ_ERROR);
}
return luaScriptBuilder.toString();
}
diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/SM2Utils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/SM2Utils.java
new file mode 100644
index 00000000..cf0ed9c5
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/SM2Utils.java
@@ -0,0 +1,130 @@
+package xiaozhi.common.utils;
+
+import org.bouncycastle.asn1.gm.GMNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.engines.SM2Engine;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.crypto.params.ParametersWithRandom;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.util.encoders.Hex;
+
+import java.math.BigInteger;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * SM2加密工具类（采用十六进制格式，与chancheng-archive-service项目保持一致）
+ */
+public class SM2Utils {
+
+ /**
+ * 公钥常量
+ */
+ public static final String KEY_PUBLIC_KEY = "publicKey";
+ /**
+ * 私钥返回值常量
+ */
+ public static final String KEY_PRIVATE_KEY = "privateKey";
+
+ static {
+ Security.addProvider(new BouncyCastleProvider());
+ }
+
+ /**
+ * SM2加密算法
+ *
+ * @param publicKey 十六进制公钥
+ * @param data 明文数据
+ * @return 十六进制密文
+ */
+ public static String encrypt(String publicKey, String data) {
+ try {
+ // 获取一条SM2曲线参数
+ X9ECParameters sm2ECParameters = GMNamedCurves.getByName("sm2p256v1");
+ // 构造ECC算法参数，曲线方程、椭圆曲线G点、大整数N
+ ECDomainParameters domainParameters = new ECDomainParameters(sm2ECParameters.getCurve(), sm2ECParameters.getG(), sm2ECParameters.getN());
+ //提取公钥点
+ ECPoint pukPoint = sm2ECParameters.getCurve().decodePoint(Hex.decode(publicKey));
+ // 公钥前面的02或者03表示是压缩公钥，04表示未压缩公钥, 04的时候，可以去掉前面的04
+ ECPublicKeyParameters publicKeyParameters = new ECPublicKeyParameters(pukPoint, domainParameters);
+
+ SM2Engine sm2Engine = new SM2Engine(SM2Engine.Mode.C1C3C2);
+ // 设置sm2为加密模式
+ sm2Engine.init(true, new ParametersWithRandom(publicKeyParameters, new SecureRandom()));
+
+ byte[] in = data.getBytes(StandardCharsets.UTF_8);
+ byte[] arrayOfBytes = sm2Engine.processBlock(in, 0, in.length);
+ return Hex.toHexString(arrayOfBytes);
+ } catch (Exception e) {
+ throw new RuntimeException("SM2加密失败", e);
+ }
+ }
+
+ /**
+ * SM2解密算法
+ *
+ * @param privateKey 十六进制私钥
+ * @param cipherData 十六进制密文数据
+ * @return 明文
+ */
+ public static String decrypt(String privateKey, String cipherData) {
+ try {
+ // 使用BC库加解密时密文以04开头，传入的密文前面没有04则补上
+ if (!cipherData.startsWith("04")) {
+ cipherData = "04" + cipherData;
+ }
+ byte[] cipherDataByte = Hex.decode(cipherData);
+ BigInteger privateKeyD = new BigInteger(privateKey, 16);
+ //获取一条SM2曲线参数
+ X9ECParameters sm2ECParameters = GMNamedCurves.getByName("sm2p256v1");
+ //构造domain参数
+ ECDomainParameters domainParameters = new ECDomainParameters(sm2ECParameters.getCurve(), sm2ECParameters.getG(), sm2ECParameters.getN());
+ ECPrivateKeyParameters privateKeyParameters = new ECPrivateKeyParameters(privateKeyD, domainParameters);
+
+ SM2Engine sm2Engine = new SM2Engine(SM2Engine.Mode.C1C3C2);
+ // 设置sm2为解密模式
+ sm2Engine.init(false, privateKeyParameters);
+
+ byte[] arrayOfBytes = sm2Engine.processBlock(cipherDataByte, 0, cipherDataByte.length);
+ return new String(arrayOfBytes, StandardCharsets.UTF_8);
+ } catch (Exception e) {
+ throw new RuntimeException("SM2解密失败", e);
+ }
+ }
+
+ /**
+ * 生成密钥对
+ */
+ public static Map createKey() {
+ try {
+ ECGenParameterSpec sm2Spec = new ECGenParameterSpec("sm2p256v1");
+ // 获取一个椭圆曲线类型的密钥对生成器
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", new BouncyCastleProvider());
+ // 使用SM2参数初始化生成器
+ kpg.initialize(sm2Spec);
+ // 获取密钥对
+ KeyPair keyPair = kpg.generateKeyPair();
+ PublicKey publicKey = keyPair.getPublic();
+ BCECPublicKey p = (BCECPublicKey) publicKey;
+ PrivateKey privateKey = keyPair.getPrivate();
+ BCECPrivateKey s = (BCECPrivateKey) privateKey;
+
+ Map result = new HashMap<>();
+ result.put(KEY_PUBLIC_KEY, Hex.toHexString(p.getQ().getEncoded(false)));
+ result.put(KEY_PRIVATE_KEY, Hex.toHexString(s.getD().toByteArray()));
+ return result;
+ } catch (Exception e) {
+ throw new RuntimeException("生成SM2密钥对失败", e);
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java
new file mode 100644
index 00000000..4d5715cc
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java
@@ -0,0 +1,165 @@
+package xiaozhi.common.utils;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+
+import cn.hutool.json.JSONObject;
+
+/**
+ * 敏感数据处理工具类
+ */
+public class SensitiveDataUtils {
+
+ // 敏感字段列表
+ private static final Set SENSITIVE_FIELDS = new HashSet<>(Arrays.asList(
+ "api_key", "personal_access_token", "access_token", "token",
+ "secret", "access_key_secret", "secret_key"));
+
+ /**
+ * 检查字段是否为敏感字段
+ */
+ public static boolean isSensitiveField(String fieldName) {
+ return StringUtils.isNotBlank(fieldName) && SENSITIVE_FIELDS.contains(fieldName.toLowerCase());
+ }
+
+ /**
+ * 隐藏字符串中间部分
+ */
+ public static String maskMiddle(String value) {
+ if (StringUtils.isBlank(value) || value.length() == 1) {
+ return value;
+ }
+
+ int length = value.length();
+ if (length <= 8) {
+ // 短字符串保留前2后2
+ return value.substring(0, 2) + "****" + value.substring(length - 2);
+ } else {
+ // 长字符串保留前4后4
+ int maskLength = length - 8;
+ StringBuilder maskBuilder = new StringBuilder();
+ for (int i = 0; i < maskLength; i++) {
+ maskBuilder.append('*');
+ }
+ return value.substring(0, 4) + maskBuilder.toString() + value.substring(length - 4);
+ }
+ }
+
+ /**
+ * 判断字符串是否是被掩码处理过的值
+ */
+ public static boolean isMaskedValue(String value) {
+ if (StringUtils.isBlank(value)) {
+ return false;
+ }
+ // 掩码值至少包含4个连续的*
+ return value.contains("****");
+ }
+
+ /**
+ * 处理JSONObject中的敏感字段
+ */
+ public static JSONObject maskSensitiveFields(JSONObject jsonObject) {
+ if (jsonObject == null) {
+ return null;
+ }
+
+ JSONObject result = new JSONObject();
+
+ for (String key : jsonObject.keySet()) {
+ Object value = jsonObject.get(key);
+
+ if (SENSITIVE_FIELDS.contains(key.toLowerCase()) && value instanceof String) {
+ result.put(key, maskMiddle((String) value));
+ } else if (value instanceof JSONObject) {
+ result.put(key, maskSensitiveFields((JSONObject) value));
+ } else {
+ result.put(key, value);
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 比较两个JSONObject的敏感字段是否相同
+ * 特别针对api_key等敏感字段进行单独比较
+ */
+ public static boolean isSensitiveDataEqual(JSONObject original, JSONObject updated) {
+ if (original == null && updated == null) {
+ return true;
+ }
+ if (original == null || updated == null) {
+ return false;
+ }
+
+ // 提取并比较特定敏感字段
+ return compareSpecificSensitiveFields(original, updated, "api_key") &&
+ compareSpecificSensitiveFields(original, updated, "personal_access_token") &&
+ compareSpecificSensitiveFields(original, updated, "access_token") &&
+ compareSpecificSensitiveFields(original, updated, "token") &&
+ compareSpecificSensitiveFields(original, updated, "secret") &&
+ compareSpecificSensitiveFields(original, updated, "access_key_secret") &&
+ compareSpecificSensitiveFields(original, updated, "secret_key");
+ }
+
+ /**
+ * 比较两个JSON对象中特定敏感字段是否相同
+ * 遍历整个JSON对象树，查找并比较指定敏感字段
+ */
+ private static boolean compareSpecificSensitiveFields(JSONObject original, JSONObject updated, String fieldName) {
+ // 提取原始对象中的指定敏感字段
+ Map originalFields = new HashMap<>();
+ extractSpecificSensitiveField(original, originalFields, fieldName, "");
+
+ // 提取更新对象中的指定敏感字段
+ Map updatedFields = new HashMap<>();
+ extractSpecificSensitiveField(updated, updatedFields, fieldName, "");
+
+ // 如果字段数量不同，说明有增删
+ if (originalFields.size() != updatedFields.size()) {
+ return false;
+ }
+
+ // 比较每个字段的值
+ for (Map.Entry entry : originalFields.entrySet()) {
+ String key = entry.getKey();
+ String originalValue = entry.getValue();
+ String updatedValue = updatedFields.get(key);
+
+ if (updatedValue == null || !updatedValue.equals(originalValue)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * 递归提取JSON对象中指定名称的敏感字段
+ */
+ private static void extractSpecificSensitiveField(JSONObject jsonObject, Map fieldsMap,
+ String targetFieldName, String parentPath) {
+ if (jsonObject == null) {
+ return;
+ }
+
+ for (String key : jsonObject.keySet()) {
+ String fullPath = parentPath.isEmpty() ? key : parentPath + "." + key;
+ Object value = jsonObject.get(key);
+
+ if (value instanceof JSONObject) {
+ // 递归处理嵌套JSON对象
+ extractSpecificSensitiveField((JSONObject) value, fieldsMap, targetFieldName, fullPath);
+ } else if (value instanceof String && key.equalsIgnoreCase(targetFieldName)) {
+ // 找到目标敏感字段，保存其路径和值
+ fieldsMap.put(fullPath, (String) value);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/Sm2DecryptUtil.java b/main/manager-api/src/main/java/xiaozhi/common/utils/Sm2DecryptUtil.java
new file mode 100644
index 00000000..5dd1a312
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/Sm2DecryptUtil.java
@@ -0,0 +1,61 @@
+package xiaozhi.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.modules.security.service.CaptchaService;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+/**
+ * SM2解密和验证码验证工具类
+ * 封装了重复的SM2解密、验证码提取和验证逻辑
+ */
+public class Sm2DecryptUtil {
+
+ /**
+ * 验证码长度
+ */
+ private static final int CAPTCHA_LENGTH = 5;
+
+ /**
+ * 解密SM2加密内容，提取验证码并验证
+ * @param encryptedPassword SM2加密的密码字符串
+ * @param captchaId 验证码ID
+ * @param captchaService 验证码服务
+ * @param sysParamsService 系统参数服务
+ * @return 解密后的实际密码
+ */
+ 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 {
+ decryptedContent = SM2Utils.decrypt(privateKeyStr, encryptedPassword);
+ } 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 {
+ throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
index 9d6542cc..49096d43 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
@@ -1,5 +1,19 @@
package xiaozhi.modules.agent.controller;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -7,11 +21,26 @@ import org.springframework.web.bind.annotation.RestController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
+import xiaozhi.common.user.UserDetail;
+import xiaozhi.common.utils.DateUtils;
+import xiaozhi.common.utils.MessageUtils;
import xiaozhi.common.utils.Result;
+import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
+import xiaozhi.modules.agent.dto.AgentChatSessionDTO;
+import xiaozhi.modules.agent.service.AgentChatHistoryService;
+import xiaozhi.modules.agent.service.AgentService;
import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
+import xiaozhi.modules.security.user.SecurityUser;
@Tag(name = "智能体聊天历史管理")
@RequiredArgsConstructor
@@ -19,6 +48,9 @@ import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
@RequestMapping("/agent/chat-history")
public class AgentChatHistoryController {
private final AgentChatHistoryBizService agentChatHistoryBizService;
+ private final AgentChatHistoryService agentChatHistoryService;
+ private final AgentService agentService;
+ private final RedisUtils redisUtils;
/**
* 小智服务聊天上报请求
@@ -33,4 +65,182 @@ public class AgentChatHistoryController {
Boolean result = agentChatHistoryBizService.report(request);
return new Result().ok(result);
}
+
+ /**
+ * 获取聊天记录下载链接
+ *
+ * @param agentId 智能体ID
+ * @param sessionId 会话ID
+ * @return UUID作为下载标识
+ */
+ @Operation(summary = "获取聊天记录下载链接")
+ @RequiresPermissions("sys:role:normal")
+ @PostMapping("/getDownloadUrl/{agentId}/{sessionId}")
+ public Result getDownloadUrl(@PathVariable("agentId") String agentId,
+ @PathVariable("sessionId") String sessionId) {
+ // 获取当前用户
+ UserDetail user = SecurityUser.getUser();
+ // 检查权限
+ if (!agentService.checkAgentPermission(agentId, user.getId())) {
+ throw new RenException(ErrorCode.CHAT_HISTORY_NO_PERMISSION);
+ }
+
+ // 生成UUID
+ String uuid = UUID.randomUUID().toString();
+ // 存储agentId和sessionId到Redis，格式为agentId:sessionId
+ redisUtils.set(RedisKeys.getChatHistoryKey(uuid), agentId + ":" + sessionId);
+
+ return new Result().ok(uuid);
+ }
+
+ /**
+ * 下载本会话聊天记录
+ *
+ * @param uuid 下载标识
+ * @param response HTTP响应
+ */
+ @Operation(summary = "下载本会话聊天记录")
+ @GetMapping("/download/{uuid}/current")
+ public void downloadCurrentSession(@PathVariable("uuid") String uuid,
+ HttpServletResponse response) {
+ // 从Redis获取agentId和sessionId
+ String agentSessionInfo = (String) redisUtils.get(RedisKeys.getChatHistoryKey(uuid));
+ if (StringUtils.isBlank(agentSessionInfo)) {
+ throw new RenException(ErrorCode.DOWNLOAD_LINK_EXPIRED);
+ }
+
+ try {
+ // 解析agentId和sessionId
+ String[] parts = agentSessionInfo.split(":");
+ if (parts.length != 2) {
+ throw new RenException(ErrorCode.DOWNLOAD_LINK_INVALID);
+ }
+ String agentId = parts[0];
+ String sessionId = parts[1];
+
+ // 执行下载
+ downloadChatHistory(agentId, List.of(sessionId), response);
+ } finally {
+ // 下载完成后删除UUID，防止盗刷
+ redisUtils.delete(RedisKeys.getChatHistoryKey(uuid));
+ }
+ }
+
+ /**
+ * 下载本会话及前20条会话聊天记录
+ *
+ * @param uuid 下载标识
+ * @param response HTTP响应
+ */
+ @Operation(summary = "下载本会话及前20条会话聊天记录")
+ @GetMapping("/download/{uuid}/previous")
+ public void downloadCurrentSessionWithPrevious(@PathVariable("uuid") String uuid,
+ HttpServletResponse response) {
+ // 从Redis获取agentId和sessionId
+ String agentSessionInfo = (String) redisUtils.get(RedisKeys.getChatHistoryKey(uuid));
+ if (StringUtils.isBlank(agentSessionInfo)) {
+ throw new RenException(ErrorCode.DOWNLOAD_LINK_EXPIRED);
+ }
+
+ try {
+ // 解析agentId和sessionId
+ String[] parts = agentSessionInfo.split(":");
+ if (parts.length != 2) {
+ throw new RenException(ErrorCode.DOWNLOAD_LINK_INVALID);
+ }
+ String agentId = parts[0];
+ String sessionId = parts[1];
+
+ // 获取所有会话列表
+ Map params = Map.of(
+ "agentId", agentId,
+ Constant.PAGE, 1,
+ Constant.LIMIT, 1000 // 获取足够多的会话
+ );
+ PageData sessionPage = agentChatHistoryService.getSessionListByAgentId(params);
+ List allSessions = sessionPage.getList();
+
+ // 查找当前会话在列表中的位置
+ int currentIndex = -1;
+ for (int i = 0; i < allSessions.size(); i++) {
+ if (allSessions.get(i).getSessionId().equals(sessionId)) {
+ currentIndex = i;
+ break;
+ }
+ }
+
+ // 如果找到了当前会话，收集当前会话及前20条会话ID
+ List sessionIdsToDownload = new ArrayList<>();
+ if (currentIndex != -1) {
+ // 从当前会话开始，向后（数组后面）取最多20条会话（包括当前会话）
+ int endIndex = Math.min(allSessions.size() - 1, currentIndex + 20); // 确保不越界
+ for (int i = currentIndex; i <= endIndex; i++) {
+ sessionIdsToDownload.add(allSessions.get(i).getSessionId());
+ }
+ }
+
+ // 如果没有找到当前会话，至少下载当前会话
+ if (sessionIdsToDownload.isEmpty()) {
+ sessionIdsToDownload.add(sessionId);
+ }
+ downloadChatHistory(agentId, sessionIdsToDownload, response);
+ } finally {
+ // 下载完成后删除UUID，防止盗刷
+ redisUtils.delete(RedisKeys.getChatHistoryKey(uuid));
+ }
+ }
+
+ /**
+ * 下载指定会话的聊天记录
+ *
+ * @param agentId 智能体ID
+ * @param sessionIds 会话ID列表
+ * @param response HTTP响应
+ */
+ private void downloadChatHistory(String agentId, List sessionIds, HttpServletResponse response) {
+ try {
+ // 设置响应头
+ response.setContentType("text/plain;charset=UTF-8");
+ String fileName = URLEncoder.encode("history.txt", StandardCharsets.UTF_8.toString());
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+ // 获取聊天记录并写入响应流
+ try (OutputStream out = response.getOutputStream()) {
+ // 为每个会话生成聊天记录
+ for (String sessionId : sessionIds) {
+ // 获取该会话的所有聊天记录
+ List chatHistoryList = agentChatHistoryService
+ .getChatHistoryBySessionId(agentId, sessionId);
+
+ // 从聊天记录中获取第一条消息的创建时间作为会话时间
+ if (!chatHistoryList.isEmpty()) {
+ Date firstMessageTime = chatHistoryList.get(0).getCreatedAt();
+ String sessionTimeStr = DateUtils.format(firstMessageTime, DateUtils.DATE_TIME_PATTERN);
+ out.write((sessionTimeStr + "\n").getBytes(StandardCharsets.UTF_8));
+ }
+
+ for (AgentChatHistoryDTO message : chatHistoryList) {
+ String role = message.getChatType() == 1 ? MessageUtils.getMessage(ErrorCode.CHAT_ROLE_USER)
+ : MessageUtils.getMessage(ErrorCode.CHAT_ROLE_AGENT);
+ String direction = message.getChatType() == 1 ? ">>" : "<<";
+ Date messageTime = message.getCreatedAt();
+ String messageTimeStr = DateUtils.format(messageTime, DateUtils.DATE_TIME_PATTERN);
+ String content = message.getContent();
+
+ String line = "[" + role + "]-[" + messageTimeStr + "]" + direction + ":" + content + "\n";
+ out.write(line.getBytes(StandardCharsets.UTF_8));
+ }
+
+ // 会话之间添加空行分隔
+ if (sessionIds.indexOf(sessionId) < sessionIds.size() - 1) {
+ out.write("\n".getBytes(StandardCharsets.UTF_8));
+ }
+ }
+
+ out.flush();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index a4ad0863..0052c7cc 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -44,6 +44,8 @@ import xiaozhi.modules.agent.entity.AgentEntity;
import xiaozhi.modules.agent.entity.AgentTemplateEntity;
import xiaozhi.modules.agent.service.AgentChatAudioService;
import xiaozhi.modules.agent.service.AgentChatHistoryService;
+import xiaozhi.modules.agent.service.AgentChatSummaryService;
+import xiaozhi.modules.agent.service.AgentContextProviderService;
import xiaozhi.modules.agent.service.AgentPluginMappingService;
import xiaozhi.modules.agent.service.AgentService;
import xiaozhi.modules.agent.service.AgentTemplateService;
@@ -64,6 +66,8 @@ public class AgentController {
private final AgentChatHistoryService agentChatHistoryService;
private final AgentChatAudioService agentChatAudioService;
private final AgentPluginMappingService agentPluginMappingService;
+ private final AgentContextProviderService agentContextProviderService;
+ private final AgentChatSummaryService agentChatSummaryService;
private final RedisUtils redisUtils;
@GetMapping("/list")
@@ -117,6 +121,27 @@ public class AgentController {
return new Result<>();
}
+ @PostMapping("/chat-summary/{sessionId}/save")
+ @Operation(summary = "根据会话ID生成聊天记录总结并保存（异步执行）")
+ public Result generateAndSaveChatSummary(@PathVariable String sessionId) {
+ try {
+ // 异步执行总结生成任务，立即返回成功响应
+ new Thread(() -> {
+ try {
+ agentChatSummaryService.generateAndSaveChatSummary(sessionId);
+ System.out.println("异步执行会话 " + sessionId + " 的聊天记录总结完成");
+ } catch (Exception e) {
+ System.err.println("异步执行会话 " + sessionId + " 的聊天记录总结失败: " + e.getMessage());
+ }
+ }).start();
+
+ // 立即返回成功响应，不等待总结生成完成
+ return new Result().ok(null);
+ } catch (Exception e) {
+ return new Result().error("启动异步总结生成任务失败: " + e.getMessage());
+ }
+ }
+
@PutMapping("/{id}")
@Operation(summary = "更新智能体")
@RequiresPermissions("sys:role:normal")
@@ -135,6 +160,8 @@ public class AgentController {
agentChatHistoryService.deleteByAgentId(id, true, true);
// 删除关联的插件
agentPluginMappingService.deleteByAgentId(id);
+ // 删除关联的上下文源配置
+ agentContextProviderService.deleteByAgentId(id);
// 再删除智能体
agentService.deleteById(id);
return new Result<>();
@@ -182,6 +209,7 @@ public class AgentController {
List result = agentChatHistoryService.getChatHistoryBySessionId(id, sessionId);
return new Result>().ok(result);
}
+
@GetMapping("/{id}/chat-history/user")
@Operation(summary = "获取智能体聊天记录（用户）")
@RequiresPermissions("sys:role:normal")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentTemplateController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentTemplateController.java
new file mode 100644
index 00000000..9c8366ed
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentTemplateController.java
@@ -0,0 +1,158 @@
+package xiaozhi.modules.agent.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.ConvertUtils;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.utils.ResultUtils;
+import xiaozhi.modules.agent.entity.AgentTemplateEntity;
+import xiaozhi.modules.agent.service.AgentTemplateService;
+import xiaozhi.modules.agent.vo.AgentTemplateVO;
+
+@Tag(name = "智能体模板管理")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/agent/template")
+public class AgentTemplateController {
+
+ private final AgentTemplateService agentTemplateService;
+
+ @GetMapping("/page")
+ @Operation(summary = "获取模板分页列表")
+ @RequiresPermissions("sys:role:superAdmin")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
+ @Parameter(name = "agentName", description = "模板名称，模糊查询")
+ })
+ public Result> getAgentTemplatesPage(
+ @Parameter(hidden = true) @RequestParam Map params) {
+
+ // 创建分页对象
+ int page = Integer.parseInt(params.getOrDefault(Constant.PAGE, "1").toString());
+ int limit = Integer.parseInt(params.getOrDefault(Constant.LIMIT, "10").toString());
+ Page pageInfo = new Page<>(page, limit);
+
+ // 创建查询条件
+ QueryWrapper wrapper = new QueryWrapper<>();
+ String agentName = (String) params.get("agentName");
+ if (agentName != null && !agentName.isEmpty()) {
+ wrapper.like("agent_name", agentName);
+ }
+ wrapper.orderByAsc("sort");
+
+ // 执行分页查询
+ IPage pageResult = agentTemplateService.page(pageInfo, wrapper);
+
+ // 使用ConvertUtils转换为VO列表
+ List voList = ConvertUtils.sourceToTarget(pageResult.getRecords(), AgentTemplateVO.class);
+
+ // 修复：使用构造函数创建PageData对象，而不是无参构造+setter
+ PageData pageData = new PageData<>(voList, pageResult.getTotal());
+
+ return new Result>().ok(pageData);
+ }
+
+ @GetMapping("/{id}")
+ @Operation(summary = "获取模板详情")
+ @RequiresPermissions("sys:role:superAdmin")
+ public Result getAgentTemplateById(@PathVariable("id") String id) {
+ AgentTemplateEntity template = agentTemplateService.getById(id);
+ if (template == null) {
+ return ResultUtils.error("模板不存在");
+ }
+
+ // 使用ConvertUtils转换为VO
+ AgentTemplateVO vo = ConvertUtils.sourceToTarget(template, AgentTemplateVO.class);
+
+ return ResultUtils.success(vo);
+ }
+
+ @PostMapping
+ @Operation(summary = "创建模板")
+ @RequiresPermissions("sys:role:superAdmin")
+ public Result createAgentTemplate(@Valid @RequestBody AgentTemplateEntity template) {
+ // 设置排序值为下一个可用的序号
+ template.setSort(agentTemplateService.getNextAvailableSort());
+
+ boolean saved = agentTemplateService.save(template);
+ if (saved) {
+ return ResultUtils.success(template);
+ } else {
+ return ResultUtils.error("创建模板失败");
+ }
+ }
+
+ @PutMapping
+ @Operation(summary = "更新模板")
+ @RequiresPermissions("sys:role:superAdmin")
+ public Result updateAgentTemplate(@Valid @RequestBody AgentTemplateEntity template) {
+ boolean updated = agentTemplateService.updateById(template);
+ if (updated) {
+ return ResultUtils.success(template);
+ } else {
+ return ResultUtils.error("更新模板失败");
+ }
+ }
+
+ @DeleteMapping("/{id}")
+ @Operation(summary = "删除模板")
+ @RequiresPermissions("sys:role:superAdmin")
+ public Result deleteAgentTemplate(@PathVariable("id") String id) {
+ // 先查询要删除的模板信息，获取其排序值
+ AgentTemplateEntity template = agentTemplateService.getById(id);
+ if (template == null) {
+ return ResultUtils.error("模板不存在");
+ }
+
+ Integer deletedSort = template.getSort();
+
+ // 执行删除操作
+ boolean deleted = agentTemplateService.removeById(id);
+ if (deleted) {
+ // 删除成功后，重新排序剩余模板
+ agentTemplateService.reorderTemplatesAfterDelete(deletedSort);
+ return ResultUtils.success("删除模板成功");
+ } else {
+ return ResultUtils.error("删除模板失败");
+ }
+ }
+
+
+ // 添加新的批量删除方法，使用不同的URL
+ @PostMapping("/batch-remove")
+ @Operation(summary = "批量删除模板")
+ @RequiresPermissions("sys:role:superAdmin")
+ public Result batchRemoveAgentTemplates(@RequestBody List ids) {
+ boolean deleted = agentTemplateService.removeByIds(ids);
+ if (deleted) {
+ return ResultUtils.success("批量删除成功");
+ } else {
+ return ResultUtils.error("批量删除模板失败");
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentVoicePrintController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentVoicePrintController.java
index 1615cee5..9b7555eb 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentVoicePrintController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentVoicePrintController.java
@@ -17,6 +17,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
+import xiaozhi.common.exception.ErrorCode;
import xiaozhi.common.exception.RenException;
import xiaozhi.common.utils.Result;
import xiaozhi.modules.agent.dto.AgentVoicePrintSaveDTO;
@@ -42,7 +43,7 @@ public class AgentVoicePrintController {
if (b) {
return new Result<>();
}
- return new Result().error("智能体的声纹创建失败");
+ return new Result().error(ErrorCode.AGENT_VOICEPRINT_CREATE_FAILED);
}
@PutMapping
@@ -54,7 +55,7 @@ public class AgentVoicePrintController {
if (b) {
return new Result<>();
}
- return new Result().error("智能体的对应声纹更新失败");
+ return new Result().error(ErrorCode.AGENT_VOICEPRINT_UPDATE_FAILED);
}
@DeleteMapping("/{id}")
@@ -67,7 +68,7 @@ public class AgentVoicePrintController {
if (delete) {
return new Result<>();
}
- return new Result().error("智能体的对应声纹删除失败");
+ return new Result().error(ErrorCode.AGENT_VOICEPRINT_DELETE_FAILED);
}
@GetMapping("/list/{id}")
@@ -76,7 +77,7 @@ public class AgentVoicePrintController {
public Result> list(@PathVariable String id) {
String voiceprintUrl = sysParamsService.getValue("server.voice_print", true);
if (StringUtils.isBlank(voiceprintUrl) || "null".equals(voiceprintUrl)) {
- throw new RenException("声纹接口未配置，请先在参数配置中配置声纹接口地址(server.voice_print)");
+ throw new RenException(ErrorCode.VOICEPRINT_API_NOT_CONFIGURED);
}
Long userId = SecurityUser.getUserId();
List list = agentVoicePrintService.list(userId, id);
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentContextProviderDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentContextProviderDao.java
new file mode 100644
index 00000000..d46ad3ab
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentContextProviderDao.java
@@ -0,0 +1,9 @@
+package xiaozhi.modules.agent.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import xiaozhi.common.dao.BaseDao;
+import xiaozhi.modules.agent.entity.AgentContextProviderEntity;
+
+@Mapper
+public interface AgentContextProviderDao extends BaseDao {
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
index b75312d2..7c9bf1eb 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
@@ -1,6 +1,9 @@
package xiaozhi.modules.agent.dao;
+import java.util.List;
+
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,12 +18,6 @@ import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
*/
@Mapper
public interface AiAgentChatHistoryDao extends BaseMapper {
- /**
- * 根据智能体ID删除音频
- *
- * @param agentId 智能体ID
- */
- void deleteAudioByAgentId(String agentId);
/**
* 根据智能体ID删除聊天历史记录
@@ -35,4 +32,19 @@ public interface AiAgentChatHistoryDao extends BaseMapper getAudioIdsByAgentId(String agentId);
+
+ /**
+ * 批量删除音频
+ *
+ * @param audioIds 音频ID列表
+ */
+ void deleteAudioByIds(@Param("audioIds") List audioIds);
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSummaryDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSummaryDTO.java
new file mode 100644
index 00000000..f6fbe660
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSummaryDTO.java
@@ -0,0 +1,45 @@
+package xiaozhi.modules.agent.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 智能体聊天记录总结DTO
+ */
+@Data
+@Schema(description = "智能体聊天记录总结对象")
+public class AgentChatSummaryDTO {
+
+ @Schema(description = "会话ID")
+ private String sessionId;
+
+ @Schema(description = "智能体ID")
+ private String agentId;
+
+ @Schema(description = "总结内容")
+ private String summary;
+
+ @Schema(description = "总结状态")
+ private boolean success;
+
+ @Schema(description = "错误信息")
+ private String errorMessage;
+
+ public AgentChatSummaryDTO() {
+ this.success = true;
+ }
+
+ public AgentChatSummaryDTO(String sessionId, String agentId, String summary) {
+ this.sessionId = sessionId;
+ this.agentId = agentId;
+ this.summary = summary;
+ this.success = true;
+ }
+
+ public AgentChatSummaryDTO(String sessionId, String errorMessage) {
+ this.sessionId = sessionId;
+ this.errorMessage = errorMessage;
+ this.success = false;
+ }
+
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java
index 0e3d9bc3..ebb29fbd 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java
@@ -69,6 +69,9 @@ public class AgentUpdateDTO implements Serializable {
@Schema(description = "排序", example = "1", nullable = true)
private Integer sort;
+ @Schema(description = "上下文源配置", nullable = true)
+ private List contextProviders;
+
@Data
@Schema(description = "插件函数信息")
public static class FunctionInfo implements Serializable {
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/ContextProviderDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/ContextProviderDTO.java
new file mode 100644
index 00000000..0b8edfd8
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/ContextProviderDTO.java
@@ -0,0 +1,19 @@
+package xiaozhi.modules.agent.dto;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "上下文源配置DTO")
+public class ContextProviderDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "URL地址")
+ private String url;
+
+ @Schema(description = "请求头")
+ private Map headers;
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentContextProviderEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentContextProviderEntity.java
new file mode 100644
index 00000000..937556ef
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentContextProviderEntity.java
@@ -0,0 +1,43 @@
+package xiaozhi.modules.agent.entity;
+
+import java.util.Date;
+import java.util.List;
+
+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 com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import xiaozhi.modules.agent.dto.ContextProviderDTO;
+
+@Data
+@TableName(value = "ai_agent_context_provider", autoResultMap = true)
+@Schema(description = "智能体上下文源配置")
+public class AgentContextProviderEntity {
+
+ @TableId(type = IdType.ASSIGN_UUID)
+ @Schema(description = "主键")
+ private String id;
+
+ @Schema(description = "智能体ID")
+ private String agentId;
+
+ @Schema(description = "上下文源配置")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List contextProviders;
+
+ @Schema(description = "创建者")
+ private Long creator;
+
+ @Schema(description = "创建时间")
+ private Date createdAt;
+
+ @Schema(description = "更新者")
+ private Long updater;
+
+ @Schema(description = "更新时间")
+ private Date updatedAt;
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatSummaryService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatSummaryService.java
new file mode 100644
index 00000000..418ee9a0
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatSummaryService.java
@@ -0,0 +1,15 @@
+package xiaozhi.modules.agent.service;
+
+/**
+ * 智能体聊天记录总结服务接口
+ */
+public interface AgentChatSummaryService {
+
+ /**
+ * 根据会话ID生成聊天记录总结并保存到智能体记忆
+ *
+ * @param sessionId 会话ID
+ * @return 保存结果
+ */
+ boolean generateAndSaveChatSummary(String sessionId);
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentContextProviderService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentContextProviderService.java
new file mode 100644
index 00000000..da759971
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentContextProviderService.java
@@ -0,0 +1,25 @@
+package xiaozhi.modules.agent.service;
+
+import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.agent.entity.AgentContextProviderEntity;
+
+public interface AgentContextProviderService extends BaseService {
+ /**
+ * 根据智能体ID获取上下文源配置
+ * @param agentId 智能体ID
+ * @return 上下文源配置实体
+ */
+ AgentContextProviderEntity getByAgentId(String agentId);
+
+ /**
+ * 保存或更新上下文源配置
+ * @param entity 实体
+ */
+ void saveOrUpdateByAgentId(AgentContextProviderEntity entity);
+
+ /**
+ * 根据智能体ID删除上下文源配置
+ * @param agentId 智能体ID
+ */
+ void deleteByAgentId(String agentId);
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java
index 4e279c40..b10a67f9 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java
@@ -25,4 +25,18 @@ public interface AgentTemplateService extends IService {
* @param modelId 模型ID
*/
void updateDefaultTemplateModelId(String modelType, String modelId);
+
+ /**
+ * 删除模板后重新排序剩余模板
+ *
+ * @param deletedSort 被删除模板的排序值
+ */
+ void reorderTemplatesAfterDelete(Integer deletedSort);
+
+ /**
+ * 获取下一个可用的排序序号（寻找最小的未使用序号）
+ *
+ * @return 下一个可用的排序序号
+ */
+ Integer getNextAvailableSort();
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
index 36b59993..8831bb1a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
@@ -17,6 +17,7 @@ import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
import xiaozhi.modules.agent.entity.AgentEntity;
import xiaozhi.modules.agent.service.AgentChatAudioService;
import xiaozhi.modules.agent.service.AgentChatHistoryService;
+import xiaozhi.modules.agent.service.AgentChatSummaryService;
import xiaozhi.modules.agent.service.AgentService;
import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
import xiaozhi.modules.device.entity.DeviceEntity;
@@ -36,6 +37,7 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
private final AgentService agentService;
private final AgentChatHistoryService agentChatHistoryService;
private final AgentChatAudioService agentChatAudioService;
+ private final AgentChatSummaryService agentChatSummaryService;
private final RedisUtils redisUtils;
private final DeviceService deviceService;
@@ -50,7 +52,8 @@ 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() * 1000 : System.currentTimeMillis();
+ Long reportTimeMillis = null != report.getReportTime() ? report.getReportTime() * 1000
+ : System.currentTimeMillis();
log.info("小智设备聊天上报请求: macAddress={}, type={} reportTime={}", macAddress, chatType, reportTimeMillis);
// 根据设备MAC地址查询对应的默认智能体，判断是否需要上报
@@ -105,7 +108,8 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
/**
* 组装上报数据
*/
- private void saveChatText(AgentChatHistoryReportDTO report, String agentId, String macAddress, String audioId, Long reportTime) {
+ private void saveChatText(AgentChatHistoryReportDTO report, String agentId, String macAddress, String audioId,
+ Long reportTime) {
// 构建聊天记录实体
AgentChatHistoryEntity entity = AgentChatHistoryEntity.builder()
.macAddress(macAddress)
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
index 76da2fc8..63b820c9 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
@@ -84,7 +84,16 @@ public class AgentChatHistoryServiceImpl extends ServiceImpl audioIds = baseMapper.getAudioIdsByAgentId(agentId);
+ 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 batch = audioIds.subList(i, end);
+ baseMapper.deleteAudioByIds(batch);
+ }
+ }
}
if (deleteAudio && !deleteText) {
baseMapper.deleteAudioIdByAgentId(agentId);
@@ -107,7 +116,7 @@ public class AgentChatHistoryServiceImpl extends ServiceImpl pageParam = new Page<>(0, 50);
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java
new file mode 100644
index 00000000..f367891f
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java
@@ -0,0 +1,423 @@
+package xiaozhi.modules.agent.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import lombok.RequiredArgsConstructor;
+import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
+import xiaozhi.modules.agent.dto.AgentChatSummaryDTO;
+import xiaozhi.modules.agent.dto.AgentMemoryDTO;
+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.AgentService;
+import xiaozhi.modules.agent.vo.AgentInfoVO;
+import xiaozhi.modules.device.entity.DeviceEntity;
+import xiaozhi.modules.device.service.DeviceService;
+import xiaozhi.modules.llm.service.LLMService;
+import xiaozhi.modules.model.entity.ModelConfigEntity;
+import xiaozhi.modules.model.service.ModelConfigService;
+
+/**
+ * 智能体聊天记录总结服务实现类
+ * 实现Python端mem_local_short.py中的总结逻辑
+ */
+@Service
+@RequiredArgsConstructor
+public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
+
+ private static final Logger log = LoggerFactory.getLogger(AgentChatSummaryServiceImpl.class);
+
+ private final AgentChatHistoryService agentChatHistoryService;
+ private final AgentService agentService;
+ private final DeviceService deviceService;
+ private final LLMService llmService;
+ private final ModelConfigService modelConfigService;
+
+ // 总结规则常量
+ private static final int MAX_SUMMARY_LENGTH = 1800; // 最大总结长度
+ private static final Pattern JSON_PATTERN = Pattern.compile("\\{.*?\\}", Pattern.DOTALL);
+ private static final Pattern DEVICE_CONTROL_PATTERN = Pattern.compile("设备控制|设备操作|控制设备|设备状态",
+ Pattern.CASE_INSENSITIVE);
+ private static final Pattern WEATHER_PATTERN = Pattern.compile("天气|温度|湿度|降雨|气象", Pattern.CASE_INSENSITIVE);
+ private static final Pattern DATE_PATTERN = Pattern.compile("日期|时间|星期|月份|年份", Pattern.CASE_INSENSITIVE);
+
+ private AgentChatSummaryDTO generateChatSummary(String sessionId) {
+ try {
+ System.out.println("开始生成会话 " + sessionId + " 的聊天记录总结");
+
+ // 1. 根据sessionId获取聊天记录
+ List chatHistory = getChatHistoryBySessionId(sessionId);
+ if (chatHistory == null || chatHistory.isEmpty()) {
+ return new AgentChatSummaryDTO(sessionId, "未找到该会话的聊天记录");
+ }
+
+ // 2. 获取智能体信息
+ String agentId = getAgentIdFromSession(sessionId, chatHistory);
+ if (StringUtils.isBlank(agentId)) {
+ return new AgentChatSummaryDTO(sessionId, "无法获取智能体信息");
+ }
+
+ // 3. 提取关键对话内容
+ List meaningfulMessages = extractMeaningfulMessages(chatHistory);
+ if (meaningfulMessages.isEmpty()) {
+ return new AgentChatSummaryDTO(sessionId, "没有有效的对话内容可总结");
+ }
+
+ // 4. 生成总结（generateSummaryFromMessages方法已包含长度限制逻辑）
+ String summary = generateSummaryFromMessages(meaningfulMessages, agentId);
+
+ System.out.println("成功生成会话 " + sessionId + " 的聊天记录总结，长度: " + summary.length() + " 字符");
+ return new AgentChatSummaryDTO(sessionId, agentId, summary);
+
+ } catch (Exception e) {
+ System.err.println("生成会话 " + sessionId + " 的聊天记录总结时发生错误: " + e.getMessage());
+ return new AgentChatSummaryDTO(sessionId, "生成总结时发生错误: " + e.getMessage());
+ }
+ }
+
+ @Override
+ public boolean generateAndSaveChatSummary(String sessionId) {
+ try {
+ // 1. 生成总结
+ AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
+ if (!summaryDTO.isSuccess()) {
+ System.err.println("生成总结失败: " + summaryDTO.getErrorMessage());
+ return false;
+ }
+
+ // 2. 获取设备信息（通过会话关联的设备）
+ DeviceEntity device = getDeviceBySessionId(sessionId);
+ if (device == null) {
+ System.err.println("未找到与会话 " + sessionId + " 关联的设备");
+ return false;
+ }
+
+ // 3. 更新智能体记忆
+ AgentMemoryDTO memoryDTO = new AgentMemoryDTO();
+ memoryDTO.setSummaryMemory(summaryDTO.getSummary());
+
+ // 调用现有接口更新记忆
+ agentService.updateAgentById(device.getAgentId(),
+ new AgentUpdateDTO() {
+ {
+ setSummaryMemory(summaryDTO.getSummary());
+ }
+ });
+
+ System.out.println("成功保存会话 " + sessionId + " 的聊天记录总结到智能体 " + device.getAgentId());
+ return true;
+
+ } catch (Exception e) {
+ System.err.println("保存会话 " + sessionId + " 的聊天记录总结时发生错误: " + e.getMessage());
+ return false;
+ }
+ }
+
+ /**
+ * 根据会话ID获取聊天记录
+ */
+ private List getChatHistoryBySessionId(String sessionId) {
+ try {
+ // 这里需要根据sessionId获取聊天记录
+ // 由于现有接口需要agentId，我们需要先找到关联的agentId
+ String agentId = findAgentIdBySessionId(sessionId);
+ if (StringUtils.isBlank(agentId)) {
+ return null;
+ }
+ return agentChatHistoryService.getChatHistoryBySessionId(agentId, sessionId);
+ } catch (Exception e) {
+ System.err.println("获取会话 " + sessionId + " 的聊天记录失败: " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 根据会话ID查找关联的智能体ID
+ */
+ private String findAgentIdBySessionId(String sessionId) {
+ try {
+ // 查询该会话的第一条记录获取agentId
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.select("agent_id")
+ .eq("session_id", sessionId)
+ .last("LIMIT 1");
+
+ AgentChatHistoryEntity entity = agentChatHistoryService.getOne(wrapper);
+ return entity != null ? entity.getAgentId() : null;
+ } catch (Exception e) {
+ System.err.println("根据会话ID " + sessionId + " 查找智能体ID失败: " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 从会话中获取智能体ID
+ */
+ private String getAgentIdFromSession(String sessionId, List chatHistory) {
+ // 直接从数据库查询智能体ID
+ return findAgentIdBySessionId(sessionId);
+ }
+
+ /**
+ * 提取有意义的对话内容（只提取用户消息，排除AI回复）
+ */
+ private List extractMeaningfulMessages(List chatHistory) {
+ List meaningfulMessages = new ArrayList<>();
+
+ for (AgentChatHistoryDTO message : chatHistory) {
+ // 只处理用户消息（chatType = 1）
+ if (message.getChatType() != null && message.getChatType() == 1) {
+ String content = extractContentFromMessage(message);
+ if (isMeaningfulMessage(content)) {
+ meaningfulMessages.add(content);
+ }
+ }
+ }
+
+ return meaningfulMessages;
+ }
+
+ /**
+ * 从消息中提取内容（处理JSON格式）
+ */
+ private String extractContentFromMessage(AgentChatHistoryDTO message) {
+ String content = message.getContent();
+ if (StringUtils.isBlank(content)) {
+ return "";
+ }
+
+ // 处理JSON格式内容（与前端ChatHistoryDialog.vue逻辑一致）
+ Matcher matcher = JSON_PATTERN.matcher(content);
+ if (matcher.find()) {
+ String jsonContent = matcher.group();
+ // 简化处理：提取JSON中的文本内容
+ return extractTextFromJson(jsonContent);
+ }
+
+ return content;
+ }
+
+ /**
+ * 从JSON中提取文本内容
+ */
+ private String extractTextFromJson(String jsonContent) {
+ // 简化处理：提取"content"字段的值
+ Pattern contentPattern = Pattern.compile("\"content\"\s*:\s*\"([^\"]*)\"");
+ Matcher matcher = contentPattern.matcher(jsonContent);
+ if (matcher.find()) {
+ return matcher.group(1);
+ }
+ return jsonContent;
+ }
+
+ /**
+ * 判断是否为有意义的消息
+ */
+ private boolean isMeaningfulMessage(String content) {
+ if (StringUtils.isBlank(content)) {
+ return false;
+ }
+
+ // 排除设备控制信息
+ if (DEVICE_CONTROL_PATTERN.matcher(content).find()) {
+ return false;
+ }
+
+ // 排除日期天气等无关内容
+ if (WEATHER_PATTERN.matcher(content).find() || DATE_PATTERN.matcher(content).find()) {
+ return false;
+ }
+
+ // 排除过短的消息
+ return content.length() >= 5;
+ }
+
+ /**
+ * 从消息生成总结
+ */
+ private String generateSummaryFromMessages(List messages, String agentId) {
+ if (messages.isEmpty()) {
+ return "本次对话内容较少，没有需要总结的重要信息。";
+ }
+
+ // 构建完整的对话内容
+ StringBuilder conversation = new StringBuilder();
+ for (int i = 0; i < messages.size(); i++) {
+ conversation.append("消息").append(i + 1).append(": ").append(messages.get(i)).append("\n");
+ }
+
+ try {
+ // 获取当前智能体的历史记忆
+ String historyMemory = getCurrentAgentMemory(agentId);
+
+ // 调用LLM服务进行智能总结，传递agentId以获取正确的模型配置
+ String summary = callJavaLLMForSummaryWithHistory(conversation.toString(), historyMemory, agentId);
+
+ // 应用总结规则：限制最大长度
+ if (summary.length() > MAX_SUMMARY_LENGTH) {
+ summary = summary.substring(0, MAX_SUMMARY_LENGTH) + "...";
+ }
+
+ return summary;
+ } catch (Exception e) {
+ System.err.println("调用Java端LLM服务失败: " + e.getMessage());
+ throw new RuntimeException("LLM服务不可用，无法生成聊天总结");
+ }
+ }
+
+ /**
+ * 获取当前智能体的历史记忆
+ */
+ private String getCurrentAgentMemory(String agentId) {
+ try {
+ if (StringUtils.isBlank(agentId)) {
+ return null;
+ }
+
+ // 获取智能体信息
+ AgentInfoVO agentInfo = agentService.getAgentById(agentId);
+ if (agentInfo == null) {
+ return null;
+ }
+
+ // 返回智能体的当前总结记忆
+ return agentInfo.getSummaryMemory();
+ } catch (Exception e) {
+ System.err.println("获取智能体历史记忆失败，agentId: " + agentId + ", 错误: " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 调用Java端LLM服务进行智能总结（支持历史记忆合并）
+ */
+ private String callJavaLLMForSummaryWithHistory(String conversation, String historyMemory, String agentId) {
+ try {
+ // 获取智能体配置，从中提取记忆总结的模型ID
+ String modelId = getMemorySummaryModelId(agentId);
+
+ if (StringUtils.isBlank(modelId)) {
+ 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("总结生成失败")) {
+ return summary;
+ }
+
+ throw new RuntimeException("Java端LLM服务返回异常: " + summary);
+
+ } catch (Exception e) {
+ System.err.println("调用Java端LLM服务异常，agentId: " + agentId + ", 错误: " + e.getMessage());
+ throw e;
+ }
+ }
+
+ /**
+ * 调用Java端LLM服务进行智能总结
+ */
+ private String callJavaLLMForSummary(String conversation, String agentId) {
+ try {
+ // 获取智能体配置，从中提取记忆总结的模型ID
+ String modelId = getMemorySummaryModelId(agentId);
+
+ if (StringUtils.isBlank(modelId)) {
+ 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("总结生成失败")) {
+ return summary;
+ }
+
+ throw new RuntimeException("Java端LLM服务返回异常: " + summary);
+
+ } catch (Exception e) {
+ System.err.println("调用Java端LLM服务异常，agentId: " + agentId + ", 错误: " + e.getMessage());
+ throw e;
+ }
+ }
+
+ /**
+ * 获取记忆总结的LLM模型ID
+ */
+ private String getMemorySummaryModelId(String agentId) {
+ try {
+ if (StringUtils.isBlank(agentId)) {
+ return null;
+ }
+
+ // 获取智能体信息
+ AgentInfoVO agentInfo = agentService.getAgentById(agentId);
+ if (agentInfo == null) {
+ return null;
+ }
+
+ // 获取智能体的记忆模型ID
+ String memModelId = agentInfo.getMemModelId();
+ if (StringUtils.isBlank(memModelId)) {
+ return null;
+ }
+
+ // 获取记忆模型配置
+ ModelConfigEntity memModelConfig = modelConfigService.getModelByIdFromCache(memModelId);
+ if (memModelConfig == null || memModelConfig.getConfigJson() == null) {
+ return null;
+ }
+
+ // 从记忆模型配置中提取对应的LLM模型ID
+ Map configMap = memModelConfig.getConfigJson();
+ String llmModelId = (String) configMap.get("llm");
+
+ if (StringUtils.isBlank(llmModelId)) {
+ // 如果记忆模型没有配置独立的LLM，则使用智能体的默认LLM模型
+ return agentInfo.getLlmModelId();
+ }
+
+ return llmModelId;
+ } catch (Exception e) {
+ System.err.println("获取记忆总结LLM模型ID失败，agentId: " + agentId + ", 错误: " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 根据会话ID获取设备信息
+ */
+ private DeviceEntity getDeviceBySessionId(String sessionId) {
+ try {
+ // 查询该会话的第一条记录获取macAddress
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.select("mac_address")
+ .eq("session_id", sessionId)
+ .last("LIMIT 1");
+
+ AgentChatHistoryEntity entity = agentChatHistoryService.getOne(wrapper);
+ if (entity != null && StringUtils.isNotBlank(entity.getMacAddress())) {
+ return deviceService.getDeviceByMacAddress(entity.getMacAddress());
+ }
+ return null;
+ } catch (Exception e) {
+ System.err.println("根据会话ID " + sessionId + " 查找设备信息失败: " + e.getMessage());
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentContextProviderServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentContextProviderServiceImpl.java
new file mode 100644
index 00000000..b68ab8c9
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentContextProviderServiceImpl.java
@@ -0,0 +1,35 @@
+package xiaozhi.modules.agent.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import xiaozhi.common.service.impl.BaseServiceImpl;
+import xiaozhi.modules.agent.dao.AgentContextProviderDao;
+import xiaozhi.modules.agent.entity.AgentContextProviderEntity;
+import xiaozhi.modules.agent.service.AgentContextProviderService;
+
+@Service
+public class AgentContextProviderServiceImpl extends BaseServiceImpl implements AgentContextProviderService {
+
+ @Override
+ public AgentContextProviderEntity getByAgentId(String agentId) {
+ return baseDao.selectOne(new QueryWrapper().eq("agent_id", agentId));
+ }
+
+ @Override
+ public void saveOrUpdateByAgentId(AgentContextProviderEntity entity) {
+ AgentContextProviderEntity exist = getByAgentId(entity.getAgentId());
+ if (exist != null) {
+ entity.setId(exist.getId());
+ updateById(entity);
+ } else {
+ insert(entity);
+ }
+ }
+
+ @Override
+ public void deleteByAgentId(String agentId) {
+ baseDao.delete(new QueryWrapper().eq("agent_id", agentId));
+ }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentPluginMappingServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentPluginMappingServiceImpl.java
index 2a53d474..6d839d9c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentPluginMappingServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentPluginMappingServiceImpl.java
@@ -1,16 +1,26 @@
package xiaozhi.modules.agent.service.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.utils.JsonUtils;
import xiaozhi.modules.agent.dao.AgentPluginMappingMapper;
import xiaozhi.modules.agent.entity.AgentPluginMapping;
import xiaozhi.modules.agent.service.AgentPluginMappingService;
+import xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity;
+import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
+import xiaozhi.modules.model.entity.ModelConfigEntity;
+import xiaozhi.modules.model.service.ModelConfigService;
/**
* @description 针对表【ai_agent_plugin_mapping(Agent与插件的唯一映射表)】的数据库操作Service实现
@@ -18,13 +28,73 @@ import xiaozhi.modules.agent.service.AgentPluginMappingService;
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class AgentPluginMappingServiceImpl extends ServiceImpl
implements AgentPluginMappingService {
private final AgentPluginMappingMapper agentPluginMappingMapper;
+ private final KnowledgeBaseService knowledgeBaseService;
+ private final ModelConfigService modelConfigService;
@Override
public List agentPluginParamsByAgentId(String agentId) {
- return agentPluginMappingMapper.selectPluginsByAgentId(agentId);
+ List list = agentPluginMappingMapper.selectPluginsByAgentId(agentId);
+ Map> knowledgeBaseMap = new HashMap<>();
+ Map modelConfigMap = new HashMap<>();
+ for (int i = list.size() - 1; i >= 0; i--) {
+ AgentPluginMapping mapping = list.get(i);
+ if (StringUtils.isBlank(mapping.getProviderCode())) {
+ // 查询知识库插件参数
+ KnowledgeBaseEntity knowledgeBaseEntity = knowledgeBaseService.selectById(mapping.getPluginId());
+ if (knowledgeBaseEntity == null) {
+ list.remove(i);
+ continue;
+ }
+ ModelConfigEntity modelConfigEntity = modelConfigService
+ .getModelByIdFromCache(knowledgeBaseEntity.getRagModelId());
+ if (modelConfigEntity == null) {
+ list.remove(i);
+ continue;
+ }
+ List knowledgeBaseList = knowledgeBaseMap.get(modelConfigEntity.getModelCode());
+ if (knowledgeBaseList == null) {
+ knowledgeBaseList = new ArrayList<>();
+ }
+ modelConfigMap.put(modelConfigEntity.getModelCode(), modelConfigEntity);
+ knowledgeBaseList.add(knowledgeBaseEntity);
+ knowledgeBaseMap.put(modelConfigEntity.getModelCode(), knowledgeBaseList);
+ list.remove(i);
+ }
+ }
+ if (knowledgeBaseMap.size() > 0) {
+ for (String pluginCode : knowledgeBaseMap.keySet()) {
+ List knowledgeBaseList = knowledgeBaseMap.get(pluginCode);
+ if (knowledgeBaseList == null || knowledgeBaseList.isEmpty()) {
+ continue;
+ }
+
+ AgentPluginMapping agentPluginMapping = new AgentPluginMapping();
+ agentPluginMapping.setAgentId(agentId);
+ agentPluginMapping.setPluginId(pluginCode);
+ agentPluginMapping.setProviderCode("search_from_" + pluginCode);
+ agentPluginMapping.setId(Long.valueOf(list.size() + 1));
+
+ Map paramInfo = new HashMap<>(4);
+ ModelConfigEntity modelConfigEntity = modelConfigMap.get(pluginCode);
+ paramInfo.put("base_url", modelConfigEntity.getConfigJson().getStr("base_url"));
+ paramInfo.put("api_key", modelConfigEntity.getConfigJson().getStr("api_key"));
+ paramInfo.put("dataset_ids",
+ knowledgeBaseList.stream().map(KnowledgeBaseEntity::getDatasetId).toList());
+
+ String description = "如果用户询问与【"
+ + String.join(",", knowledgeBaseList.stream().map(KnowledgeBaseEntity::getName).toList())
+ + "】涵盖的主体范围相关内容时应调用本方法，用于查询：" + String.join(",",
+ knowledgeBaseList.stream().map(KnowledgeBaseEntity::getDescription).toList());
+ paramInfo.put("description", description);
+ agentPluginMapping.setParamInfo(JsonUtils.toJsonString(paramInfo));
+ list.add(agentPluginMapping);
+ }
+ }
+ return list;
}
@Override
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 4f5681e2..0adf0873 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
import xiaozhi.common.exception.RenException;
import xiaozhi.common.page.PageData;
import xiaozhi.common.redis.RedisKeys;
@@ -31,16 +32,19 @@ import xiaozhi.modules.agent.dao.AgentDao;
import xiaozhi.modules.agent.dto.AgentCreateDTO;
import xiaozhi.modules.agent.dto.AgentDTO;
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.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.AgentTemplateService;
import xiaozhi.modules.agent.vo.AgentInfoVO;
import xiaozhi.modules.device.service.DeviceService;
import xiaozhi.modules.model.dto.ModelProviderDTO;
+import xiaozhi.modules.model.dto.VoiceDTO;
import xiaozhi.modules.model.entity.ModelConfigEntity;
import xiaozhi.modules.model.service.ModelConfigService;
import xiaozhi.modules.model.service.ModelProviderService;
@@ -60,6 +64,7 @@ public class AgentServiceImpl extends BaseServiceImpl imp
private final AgentChatHistoryService agentChatHistoryService;
private final AgentTemplateService agentTemplateService;
private final ModelProviderService modelProviderService;
+ private final AgentContextProviderService agentContextProviderService;
@Override
public PageData adminAgentList(Map params) {
@@ -74,7 +79,7 @@ public class AgentServiceImpl extends BaseServiceImpl imp
AgentInfoVO agent = agentDao.selectAgentInfoById(id);
if (agent == null) {
- throw new RenException("智能体不存在");
+ throw new RenException(ErrorCode.AGENT_NOT_FOUND);
}
if (agent.getMemModelId() != null && agent.getMemModelId().equals(Constant.MEMORY_NO_MEM)) {
@@ -83,6 +88,13 @@ public class AgentServiceImpl extends BaseServiceImpl imp
agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode());
}
}
+
+ // 查询上下文源配置
+ AgentContextProviderEntity contextProviderEntity = agentContextProviderService.getByAgentId(id);
+ if (contextProviderEntity != null) {
+ agent.setContextProviders(contextProviderEntity.getContextProviders());
+ }
+
// 无需额外查询插件列表，已通过SQL查询出来
return agent;
}
@@ -182,6 +194,9 @@ public class AgentServiceImpl extends BaseServiceImpl imp
@Override
public boolean checkAgentPermission(String agentId, Long userId) {
+ if (SecurityUser.getUser() == null || SecurityUser.getUser().getId() == null) {
+ return false;
+ }
// 获取智能体信息
AgentEntity agent = getAgentById(agentId);
if (agent == null) {
@@ -204,7 +219,7 @@ public class AgentServiceImpl extends BaseServiceImpl imp
// 先查询现有实体
AgentEntity existingEntity = this.getAgentById(agentId);
if (existingEntity == null) {
- throw new RuntimeException("智能体不存在");
+ throw new RenException(ErrorCode.AGENT_NOT_FOUND);
}
// 只更新提供的非空字段
@@ -326,9 +341,17 @@ public class AgentServiceImpl extends BaseServiceImpl imp
agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, false);
}
+ // 更新上下文源配置
+ if (dto.getContextProviders() != null) {
+ AgentContextProviderEntity contextEntity = new AgentContextProviderEntity();
+ contextEntity.setAgentId(agentId);
+ contextEntity.setContextProviders(dto.getContextProviders());
+ agentContextProviderService.saveOrUpdateByAgentId(contextEntity);
+ }
+
boolean b = validateLLMIntentParams(dto.getLlmModelId(), dto.getIntentModelId());
if (!b) {
- throw new RenException("LLM大模型和Intent意图识别，选择参数不匹配");
+ throw new RenException(ErrorCode.LLM_INTENT_PARAMS_MISMATCH);
}
this.updateById(existingEntity);
}
@@ -369,12 +392,41 @@ public class AgentServiceImpl extends BaseServiceImpl imp
entity.setLlmModelId(template.getLlmModelId());
entity.setVllmModelId(template.getVllmModelId());
entity.setTtsModelId(template.getTtsModelId());
+
+ if (template.getTtsVoiceId() == null && template.getTtsModelId() != null) {
+ ModelConfigEntity ttsModel = modelConfigService.selectById(template.getTtsModelId());
+ if (ttsModel != null && ttsModel.getConfigJson() != null) {
+ Map config = ttsModel.getConfigJson();
+ String voice = (String) config.get("voice");
+ if (StringUtils.isBlank(voice)) {
+ voice = (String) config.get("speaker");
+ }
+ VoiceDTO timbre = timbreModelService.getByVoiceCode(template.getTtsModelId(), voice);
+ if (timbre != null) {
+ template.setTtsVoiceId(timbre.getId());
+ }
+ }
+ }
+
entity.setTtsVoiceId(template.getTtsVoiceId());
entity.setMemModelId(template.getMemModelId());
entity.setIntentModelId(template.getIntentModelId());
entity.setSystemPrompt(template.getSystemPrompt());
entity.setSummaryMemory(template.getSummaryMemory());
- entity.setChatHistoryConf(template.getChatHistoryConf());
+
+ // 根据记忆模型类型设置默认的chatHistoryConf值
+ if (template.getMemModelId() != null) {
+ if (template.getMemModelId().equals("Memory_nomem")) {
+ // 无记忆功能的模型，默认不记录聊天记录
+ entity.setChatHistoryConf(0);
+ } else {
+ // 有记忆功能的模型，默认记录文本和语音
+ entity.setChatHistoryConf(2);
+ }
+ } else {
+ entity.setChatHistoryConf(template.getChatHistoryConf());
+ }
+
entity.setLangCode(template.getLangCode());
entity.setLanguage(template.getLanguage());
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTemplateServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTemplateServiceImpl.java
index 581adbdd..321b5cb2 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTemplateServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTemplateServiceImpl.java
@@ -10,6 +10,11 @@ import xiaozhi.modules.agent.dao.AgentTemplateDao;
import xiaozhi.modules.agent.entity.AgentTemplateEntity;
import xiaozhi.modules.agent.service.AgentTemplateService;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
/**
* @author chenerlei
* @description 针对表【ai_agent_template(智能体配置模板表)】的数据库操作Service实现
@@ -40,6 +45,10 @@ public class AgentTemplateServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>();
switch (modelType) {
@@ -69,4 +78,48 @@ public class AgentTemplateServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>();
+ updateWrapper.gt("sort", deletedSort)
+ .setSql("sort = sort - 1");
+
+ // 执行批量更新，将这些记录的排序值减1
+ this.update(updateWrapper);
+ }
+
+ @Override
+ public Integer getNextAvailableSort() {
+ // 查询所有已存在的排序值并按升序排序
+ List sortValues = baseMapper.selectList(new QueryWrapper())
+ .stream()
+ .map(AgentTemplateEntity::getSort)
+ .filter(Objects::nonNull)
+ .sorted()
+ .collect(Collectors.toList());
+
+ // 如果没有排序值，返回1
+ if (sortValues.isEmpty()) {
+ return 1;
+ }
+
+ // 寻找最小的未使用序号
+ int expectedSort = 1;
+ for (Integer sort : sortValues) {
+ if (sort > expectedSort) {
+ // 找到空缺的序号
+ return expectedSort;
+ }
+ expectedSort = sort + 1;
+ }
+
+ // 如果没有空缺，返回最大序号+1
+ return expectedSort;
+ }
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentVoicePrintServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentVoicePrintServiceImpl.java
index 31accbab..088e4663 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentVoicePrintServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentVoicePrintServiceImpl.java
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
import xiaozhi.common.exception.RenException;
import xiaozhi.common.utils.ConvertUtils;
import xiaozhi.common.utils.JsonUtils;
@@ -78,7 +79,7 @@ public class AgentVoicePrintServiceImpl extends ServiceImpl functions;
+
+ @Schema(description = "上下文源配置")
+ private List contextProviders;
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
index 476f09cd..ead30b70 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
@@ -20,10 +20,12 @@ import xiaozhi.common.redis.RedisUtils;
import xiaozhi.common.utils.ConvertUtils;
import xiaozhi.common.utils.JsonUtils;
import xiaozhi.modules.agent.dao.AgentVoicePrintDao;
+import xiaozhi.modules.agent.entity.AgentContextProviderEntity;
import xiaozhi.modules.agent.entity.AgentEntity;
import xiaozhi.modules.agent.entity.AgentPluginMapping;
import xiaozhi.modules.agent.entity.AgentTemplateEntity;
import xiaozhi.modules.agent.entity.AgentVoicePrintEntity;
+import xiaozhi.modules.agent.service.AgentContextProviderService;
import xiaozhi.modules.agent.service.AgentMcpAccessPointService;
import xiaozhi.modules.agent.service.AgentPluginMappingService;
import xiaozhi.modules.agent.service.AgentService;
@@ -38,6 +40,8 @@ import xiaozhi.modules.sys.dto.SysParamsDTO;
import xiaozhi.modules.sys.service.SysParamsService;
import xiaozhi.modules.timbre.service.TimbreService;
import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
+import xiaozhi.modules.voiceclone.entity.VoiceCloneEntity;
+import xiaozhi.modules.voiceclone.service.VoiceCloneService;
@Service
@AllArgsConstructor
@@ -51,6 +55,8 @@ public class ConfigServiceImpl implements ConfigService {
private final TimbreService timbreService;
private final AgentPluginMappingService agentPluginMappingService;
private final AgentMcpAccessPointService agentMcpAccessPointService;
+ private final AgentContextProviderService agentContextProviderService;
+ private final VoiceCloneService cloneVoiceService;
private final AgentVoicePrintDao agentVoicePrintDao;
@Override
@@ -70,7 +76,7 @@ public class ConfigServiceImpl implements ConfigService {
// 查询默认智能体
AgentTemplateEntity agent = agentTemplateService.getDefaultTemplate();
if (agent == null) {
- throw new RenException("默认智能体未找到");
+ throw new RenException(ErrorCode.AGENT_TEMPLATE_NOT_FOUND);
}
// 构建模块配置
@@ -88,6 +94,7 @@ public class ConfigServiceImpl implements ConfigService {
null,
null,
null,
+ null,
result,
isCache);
@@ -99,6 +106,15 @@ public class ConfigServiceImpl implements ConfigService {
@Override
public Map getAgentModels(String macAddress, Map selectedModule) {
+ // 检查是否为管理控制台请求
+ String redisKey = RedisKeys.getTmpRegisterMacKey(macAddress);
+ Object isAdminRequest = redisUtils.get(redisKey);
+
+ if (isAdminRequest != null && "true".equals(isAdminRequest)) {
+ // 管理控制台请求，返回getConfig的结果
+ redisUtils.delete(redisKey); // 使用后清理
+ return (Map) getConfig(true);
+ }
// 根据MAC地址查找设备
DeviceEntity device = deviceService.getDeviceByMacAddress(macAddress);
if (device == null) {
@@ -107,13 +123,13 @@ public class ConfigServiceImpl implements ConfigService {
if (StringUtils.isNotBlank(cachedCode)) {
throw new RenException(ErrorCode.OTA_DEVICE_NEED_BIND, cachedCode);
}
- throw new RenException(ErrorCode.OTA_DEVICE_NOT_FOUND, "not found device");
+ throw new RenException(ErrorCode.OTA_DEVICE_NOT_FOUND);
}
// 获取智能体信息
AgentEntity agent = agentService.getAgentById(device.getAgentId());
if (agent == null) {
- throw new RenException("智能体未找到");
+ throw new RenException(ErrorCode.AGENT_NOT_FOUND);
}
// 获取音色信息
String voice = null;
@@ -124,6 +140,11 @@ public class ConfigServiceImpl implements ConfigService {
voice = timbre.getTtsVoice();
referenceAudio = timbre.getReferenceAudio();
referenceText = timbre.getReferenceText();
+ } else {
+ VoiceCloneEntity voice_print = cloneVoiceService.selectById(agent.getTtsVoiceId());
+ if (voice_print != null) {
+ voice = voice_print.getVoiceId();
+ }
}
// 构建返回数据
Map result = new HashMap<>();
@@ -169,6 +190,13 @@ 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()) {
+ result.put("context_providers", contextProviderEntity.getContextProviders());
+ }
+
// 获取声纹信息
buildVoiceprintConfig(agent.getId(), result);
@@ -187,6 +215,7 @@ public class ConfigServiceImpl implements ConfigService {
agent.getTtsModelId(),
agent.getMemModelId(),
agent.getIntentModelId(),
+ null,
result,
true);
@@ -299,6 +328,20 @@ public class ConfigServiceImpl implements ConfigService {
voiceprintConfig.put("url", voiceprintUrl);
voiceprintConfig.put("speakers", speakers);
+ // 获取声纹识别相似度阈值，默认0.4
+ String thresholdStr = sysParamsService.getValue("server.voiceprint_similarity_threshold", true);
+ if (StringUtils.isNotBlank(thresholdStr) && !"null".equals(thresholdStr)) {
+ try {
+ double threshold = Double.parseDouble(thresholdStr);
+ voiceprintConfig.put("similarity_threshold", threshold);
+ } catch (NumberFormatException e) {
+ // 如果解析失败，使用默认值0.4
+ voiceprintConfig.put("similarity_threshold", 0.4);
+ }
+ } else {
+ voiceprintConfig.put("similarity_threshold", 0.4);
+ }
+
result.put("voiceprint", voiceprintConfig);
} catch (Exception e) {
// 声纹配置获取失败时不影响其他功能
@@ -349,12 +392,14 @@ public class ConfigServiceImpl implements ConfigService {
String ttsModelId,
String memModelId,
String intentModelId,
+ String ragModelId,
Map result,
boolean isCache) {
Map selectedModule = new HashMap<>();
- String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM" };
- String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId };
+ String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM", "RAG" };
+ String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId,
+ ragModelId };
String intentLLMModelId = null;
String memLocalShortLLMModelId = null;
@@ -362,7 +407,8 @@ public class ConfigServiceImpl implements ConfigService {
if (modelIds[i] == null) {
continue;
}
- ModelConfigEntity model = modelConfigService.getModelById(modelIds[i], isCache);
+ // 关键：第三个参数传false，确保获取原始密钥
+ ModelConfigEntity model = modelConfigService.getModelByIdFromCache(modelIds[i]);
if (model == null) {
continue;
}
@@ -377,6 +423,15 @@ public class ConfigServiceImpl implements ConfigService {
((Map) model.getConfigJson()).put("ref_audio", referenceAudio);
if (referenceText != null)
((Map) model.getConfigJson()).put("ref_text", referenceText);
+
+ // 火山引擎声音克隆需要替换resource_id
+ Map map = (Map) model.getConfigJson();
+ if (Constant.VOICE_CLONE_HUOSHAN_DOUBLE_STREAM.equals(map.get("type"))) {
+ // 如果voice是”S_“开头的，使用seed-icl-1.0
+ if (voice != null && voice.startsWith("S_")) {
+ map.put("resource_id", "seed-icl-1.0");
+ }
+ }
}
// 如果是Intent类型，且type=intent_llm，则给他添加附加模型
if ("Intent".equals(modelTypes[i])) {
@@ -410,14 +465,16 @@ public class ConfigServiceImpl implements ConfigService {
if ("LLM".equals(modelTypes[i])) {
if (StringUtils.isNotBlank(intentLLMModelId)) {
if (!typeConfig.containsKey(intentLLMModelId)) {
- ModelConfigEntity intentLLM = modelConfigService.getModelById(intentLLMModelId, isCache);
+ // 修改这里：添加isMaskSensitive=false参数
+ ModelConfigEntity intentLLM = modelConfigService.getModelByIdFromCache(intentLLMModelId);
typeConfig.put(intentLLM.getId(), intentLLM.getConfigJson());
}
}
if (StringUtils.isNotBlank(memLocalShortLLMModelId)) {
if (!typeConfig.containsKey(memLocalShortLLMModelId)) {
+ // 修改这里：添加isMaskSensitive=false参数
ModelConfigEntity memLocalShortLLM = modelConfigService
- .getModelById(memLocalShortLLMModelId, isCache);
+ .getModelByIdFromCache(memLocalShortLLMModelId);
typeConfig.put(memLocalShortLLM.getId(), memLocalShortLLM.getConfigJson());
}
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
index b0320e3c..78a17b02 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java
@@ -5,6 +5,10 @@ import java.util.List;
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;
@@ -12,32 +16,45 @@ 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;
import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
import xiaozhi.common.exception.ErrorCode;
import xiaozhi.common.redis.RedisKeys;
import xiaozhi.common.redis.RedisUtils;
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.DeviceUnBindDTO;
import xiaozhi.modules.device.dto.DeviceUpdateDTO;
-import xiaozhi.modules.device.dto.DeviceManualAddDTO;
import xiaozhi.modules.device.entity.DeviceEntity;
import xiaozhi.modules.device.service.DeviceService;
import xiaozhi.modules.security.user.SecurityUser;
+import xiaozhi.modules.sys.service.SysParamsService;
@Tag(name = "设备管理")
-@AllArgsConstructor
@RestController
@RequestMapping("/device")
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,
+ RestTemplate restTemplate, ObjectMapper objectMapper) {
+ this.deviceService = deviceService;
+ this.redisUtils = redisUtils;
+ this.sysParamsService = sysParamsService;
+ this.restTemplate = restTemplate;
+ this.objectMapper = objectMapper;
+ }
@PostMapping("/bind/{agentId}/{deviceCode}")
@Operation(summary = "绑定设备")
@@ -52,13 +69,15 @@ public class DeviceController {
public Result registerDevice(@RequestBody DeviceRegisterDTO deviceRegisterDTO) {
String macAddress = deviceRegisterDTO.getMacAddress();
if (StringUtils.isBlank(macAddress)) {
- return new Result().error(ErrorCode.NOT_NULL, "mac地址不能为空");
+ return new Result().error(ErrorCode.MCA_NOT_NULL);
}
// 生成六位验证码
- String code = String.valueOf(Math.random()).substring(2, 8);
- String key = RedisKeys.getDeviceCaptchaKey(code);
+ String code;
+ String key;
String existsMac = null;
do {
+ code = String.valueOf(Math.random()).substring(2, 8);
+ key = RedisKeys.getDeviceCaptchaKey(code);
existsMac = (String) redisUtils.get(key);
} while (StringUtils.isNotBlank(existsMac));
@@ -75,6 +94,88 @@ public class DeviceController {
return new Result>().ok(devices);
}
+ @PostMapping("/bind/{agentId}")
+ @Operation(summary = "设备在线接口")
+ @RequiresPermissions("sys:role:normal")
+ public Result forwardToMqttGateway(@PathVariable String agentId, @RequestBody String requestBody) {
+ try {
+ // 从系统参数中获取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 devices = deviceService.getUserDevices(user.getId(), agentId);
+
+ // 构建deviceIds数组
+ java.util.List 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().error("令牌生成失败");
+ }
+ headers.set("Authorization", "Bearer " + token);
+
+ // 构建请求体JSON
+ String jsonBody = "{\"clientIds\":" + objectMapper.writeValueAsString(deviceIds) + "}";
+ HttpEntity requestEntity = new HttpEntity<>(jsonBody, headers);
+
+ // 发送POST请求
+ ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+
+ // 返回响应
+ return new Result().ok(response.getBody());
+ } catch (Exception e) {
+ return new Result().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")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java
index 023510cd..4a4bfee8 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java
@@ -77,6 +77,10 @@ public class OTAController {
@GetMapping
@Hidden
public ResponseEntity getOTA() {
+ String mqttUdpConfig = sysParamsService.getValue(Constant.SERVER_MQTT_GATEWAY, false);
+ if (StringUtils.isBlank(mqttUdpConfig)) {
+ return ResponseEntity.ok("OTA接口不正常，缺少mqtt_gateway地址，请登录智控台，在参数管理找到【server.mqtt_gateway】配置");
+ }
String wsUrl = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
if (StringUtils.isBlank(wsUrl) || wsUrl.equals("null")) {
return ResponseEntity.ok("OTA接口不正常，缺少websocket地址，请登录智控台，在参数管理找到【server.websocket】配置");
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java
index f938001e..85c8972a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java
@@ -19,10 +19,13 @@ public class DeviceReportRespDTO {
@Schema(description = "固件版本信息")
private Firmware firmware;
-
+
@Schema(description = "WebSocket配置")
private Websocket websocket;
+ @Schema(description = "MQTT Gateway配置")
+ private MQTT mqtt;
+
@Getter
@Setter
public static class Firmware {
@@ -63,11 +66,30 @@ public class DeviceReportRespDTO {
@Schema(description = "时区偏移量，单位为分钟")
private Integer timezone_offset;
}
-
+
@Getter
@Setter
public static class Websocket {
@Schema(description = "WebSocket服务器地址")
private String url;
+ @Schema(description = "WebSocket 认证 token")
+ private String token;
}
-}
+
+ @Getter
+ @Setter
+ public static class MQTT {
+ @Schema(description = "MQTT 配置网址")
+ private String endpoint;
+ @Schema(description = "MQTT 客户端唯一标识符")
+ private String client_id;
+ @Schema(description = "MQTT 认证用户名")
+ private String username;
+ @Schema(description = "MQTT 认证密码")
+ private String password;
+ @Schema(description = "ESP32 发布消息的主题")
+ private String publish_topic;
+ @Schema(description = "ESP32 订阅的主题")
+ private String subscribe_topic;
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java
index 3392c96f..5b56161f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java
@@ -98,4 +98,14 @@ public interface DeviceService extends BaseService {
*/
void updateDeviceConnectionInfo(String agentId, String deviceId, String appVersion);
+ /**
+ * 生成WebSocket认证token
+ *
+ * @param clientId 客户端ID
+ * @param username 用户名(通常为deviceId)
+ * @return 认证token字符串
+ * @throws Exception 生成token时的异常
+ */
+ String generateWebSocketToken(String clientId, String username) throws Exception;
+
}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java
index 3cff111d..5c807645 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java
@@ -1,6 +1,10 @@
package xiaozhi.modules.device.service.impl;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
import java.time.Instant;
+import java.util.Base64;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -8,6 +12,9 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.aop.framework.AopContext;
import org.springframework.scheduling.annotation.Async;
@@ -24,6 +31,7 @@ import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
import xiaozhi.common.exception.RenException;
import xiaozhi.common.page.PageData;
import xiaozhi.common.redis.RedisKeys;
@@ -33,6 +41,7 @@ import xiaozhi.common.user.UserDetail;
import xiaozhi.common.utils.ConvertUtils;
import xiaozhi.common.utils.DateUtils;
import xiaozhi.modules.device.dao.DeviceDao;
+import xiaozhi.modules.device.dto.DeviceManualAddDTO;
import xiaozhi.modules.device.dto.DevicePageUserDTO;
import xiaozhi.modules.device.dto.DeviceReportReqDTO;
import xiaozhi.modules.device.dto.DeviceReportRespDTO;
@@ -44,7 +53,6 @@ import xiaozhi.modules.device.vo.UserShowDeviceListVO;
import xiaozhi.modules.security.user.SecurityUser;
import xiaozhi.modules.sys.service.SysParamsService;
import xiaozhi.modules.sys.service.SysUserUtilService;
-import xiaozhi.modules.device.dto.DeviceManualAddDTO;
@Slf4j
@Service
@@ -78,27 +86,27 @@ public class DeviceServiceImpl extends BaseServiceImpl
@Override
public Boolean deviceActivation(String agentId, String activationCode) {
if (StringUtils.isBlank(activationCode)) {
- throw new RenException("激活码不能为空");
+ throw new RenException(ErrorCode.ACTIVATION_CODE_EMPTY);
}
String deviceKey = "ota:activation:code:" + activationCode;
Object cacheDeviceId = redisUtils.get(deviceKey);
if (cacheDeviceId == null) {
- throw new RenException("激活码错误");
+ throw new RenException(ErrorCode.ACTIVATION_CODE_ERROR);
}
String deviceId = (String) cacheDeviceId;
String safeDeviceId = deviceId.replace(":", "_").toLowerCase();
String cacheDeviceKey = String.format("ota:activation:data:%s", safeDeviceId);
Map cacheMap = (Map) redisUtils.get(cacheDeviceKey);
if (cacheMap == null) {
- throw new RenException("激活码错误");
+ throw new RenException(ErrorCode.ACTIVATION_CODE_ERROR);
}
String cachedCode = (String) cacheMap.get("activation_code");
if (!activationCode.equals(cachedCode)) {
- throw new RenException("激活码错误");
+ throw new RenException(ErrorCode.ACTIVATION_CODE_ERROR);
}
// 检查设备有没有被激活
if (selectById(deviceId) != null) {
- throw new RenException("设备已激活");
+ throw new RenException(ErrorCode.DEVICE_ALREADY_ACTIVATED);
}
String macAddress = (String) cacheMap.get("mac_address");
@@ -106,7 +114,7 @@ public class DeviceServiceImpl extends BaseServiceImpl
String appVersion = (String) cacheMap.get("app_version");
UserDetail user = SecurityUser.getUser();
if (user.getId() == null) {
- throw new RenException("用户未登录");
+ throw new RenException(ErrorCode.USER_NOT_LOGIN);
}
Date currentTime = new Date();
@@ -128,6 +136,10 @@ public class DeviceServiceImpl extends BaseServiceImpl
// 清理redis缓存
redisUtils.delete(cacheDeviceKey);
redisUtils.delete(deviceKey);
+
+ // 添加：清除智能体设备数量缓存
+ redisUtils.delete(RedisKeys.getAgentDeviceCountById(agentId));
+
return true;
}
@@ -159,6 +171,22 @@ public class DeviceServiceImpl extends BaseServiceImpl
DeviceReportRespDTO.Websocket websocket = new DeviceReportRespDTO.Websocket();
// 从系统参数获取WebSocket URL，如果未配置则使用默认值
String wsUrl = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
+
+ // 检查是否启用认证并生成token
+ String authEnabled = sysParamsService.getValue(Constant.SERVER_AUTH_ENABLED, true);
+ if ("true".equalsIgnoreCase(authEnabled)) {
+ try {
+ // 生成token
+ String token = generateWebSocketToken(clientId, macAddress);
+ websocket.setToken(token);
+ } catch (Exception e) {
+ log.error("生成WebSocket token失败: {}", e.getMessage());
+ websocket.setToken("");
+ }
+ } else {
+ websocket.setToken("");
+ }
+
if (StringUtils.isBlank(wsUrl) || wsUrl.equals("null")) {
log.error("WebSocket地址未配置，请登录智控台，在参数管理找到【server.websocket】配置");
wsUrl = "ws://xiaozhi.server.com:8000/xiaozhi/v1/";
@@ -176,6 +204,23 @@ public class DeviceServiceImpl extends BaseServiceImpl
response.setWebsocket(websocket);
+ // 添加MQTT UDP配置
+ // 从系统参数获取MQTT Gateway地址，仅在配置有效时使用
+ String mqttUdpConfig = sysParamsService.getValue(Constant.SERVER_MQTT_GATEWAY, true);
+ if (mqttUdpConfig != null && !mqttUdpConfig.equals("null") && !mqttUdpConfig.isEmpty()) {
+ try {
+ String groupId = deviceById != null && deviceById.getBoard() != null ? deviceById.getBoard()
+ : "GID_default";
+ DeviceReportRespDTO.MQTT mqtt = buildMqttConfig(macAddress, groupId);
+ if (mqtt != null) {
+ mqtt.setEndpoint(mqttUdpConfig);
+ response.setMqtt(mqtt);
+ }
+ } catch (Exception e) {
+ log.error("生成MQTT配置失败: {}", e.getMessage());
+ }
+ }
+
if (deviceById != null) {
// 如果设备存在，则异步更新上次连接时间和版本信息
String appVersion = deviceReport.getApplication() != null ? deviceReport.getApplication().getVersion()
@@ -202,6 +247,16 @@ public class DeviceServiceImpl extends BaseServiceImpl
@Override
public void unbindDevice(Long userId, String deviceId) {
+ // 先查询设备信息，获取agentId
+ DeviceEntity device = baseDao.selectById(deviceId);
+ if (device == null) {
+ return;
+ }
+ if (StringUtils.isNotBlank(device.getAgentId())) {
+ // 清除智能体设备数量缓存
+ redisUtils.delete(RedisKeys.getAgentDeviceCountById(device.getAgentId()));
+ }
+
UpdateWrapper wrapper = new UpdateWrapper<>();
wrapper.eq("user_id", userId);
wrapper.eq("id", deviceId);
@@ -419,7 +474,7 @@ public class DeviceServiceImpl extends BaseServiceImpl
wrapper.eq("mac_address", dto.getMacAddress());
DeviceEntity exist = baseDao.selectOne(wrapper);
if (exist != null) {
- throw new RenException("该Mac地址已存在");
+ throw new RenException(ErrorCode.MAC_ADDRESS_ALREADY_EXISTS);
}
Date now = new Date();
DeviceEntity entity = new DeviceEntity();
@@ -436,5 +491,111 @@ public class DeviceServiceImpl extends BaseServiceImpl
entity.setUpdater(userId);
entity.setAutoUpdate(1);
baseDao.insert(entity);
+
+ // 添加：清除智能体设备数量缓存
+ redisUtils.delete(RedisKeys.getAgentDeviceCountById(dto.getAgentId()));
+ }
+
+ /**
+ * 生成MQTT密码签名
+ *
+ * @param content 签名内容 (clientId + '|' + username)
+ * @param secretKey 密钥
+ * @return Base64编码的HMAC-SHA256签名
+ */
+ private String generatePasswordSignature(String content, String secretKey) throws Exception {
+ Mac hmac = Mac.getInstance("HmacSHA256");
+ SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+ hmac.init(keySpec);
+ byte[] signature = hmac.doFinal(content.getBytes(StandardCharsets.UTF_8));
+ return Base64.getEncoder().encodeToString(signature);
+ }
+
+ /**
+ * 生成WebSocket认证token 遵循Python端AuthManager的实现逻辑：token = signature.timestamp
+ *
+ * @param clientId 客户端ID
+ * @param username 用户名 (通常为deviceId/macAddress)
+ * @return 认证token字符串
+ */
+ public String generateWebSocketToken(String clientId, String username)
+ throws NoSuchAlgorithmException, InvalidKeyException {
+ // 从系统参数获取密钥
+ String secretKey = sysParamsService.getValue(Constant.SERVER_SECRET, false);
+ if (StringUtils.isBlank(secretKey)) {
+ throw new IllegalStateException("WebSocket认证密钥未配置(server.secret)");
+ }
+
+ // 获取当前时间戳(秒)
+ long timestamp = System.currentTimeMillis() / 1000;
+
+ // 构建签名内容: clientId|username|timestamp
+ String content = String.format("%s|%s|%d", clientId, username, timestamp);
+
+ // 生成HMAC-SHA256签名
+ Mac hmac = Mac.getInstance("HmacSHA256");
+ SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+ hmac.init(keySpec);
+ byte[] signature = hmac.doFinal(content.getBytes(StandardCharsets.UTF_8));
+
+ // Base64 URL-safe编码签名(去除填充符=)
+ String signatureBase64 = Base64.getUrlEncoder().withoutPadding().encodeToString(signature);
+
+ // 返回格式: signature.timestamp
+ return String.format("%s.%d", signatureBase64, timestamp);
+ }
+
+ /**
+ * 构建MQTT配置信息
+ *
+ * @param macAddress MAC地址
+ * @param groupId 分组ID
+ * @return MQTT配置对象
+ */
+ private DeviceReportRespDTO.MQTT buildMqttConfig(String macAddress, String groupId)
+ throws Exception {
+ // 从环境变量或系统参数获取签名密钥
+ String signatureKey = sysParamsService.getValue("server.mqtt_signature_key", true);
+ if (StringUtils.isBlank(signatureKey)) {
+ log.warn("缺少MQTT_SIGNATURE_KEY，跳过MQTT配置生成");
+ return null;
+ }
+
+ // 构建客户端ID格式：groupId@@@macAddress@@@uuid
+ String groupIdSafeStr = groupId.replace(":", "_");
+ String deviceIdSafeStr = macAddress.replace(":", "_");
+ String mqttClientId = String.format("%s@@@%s@@@%s", groupIdSafeStr, deviceIdSafeStr, deviceIdSafeStr);
+
+ // 构建用户数据（包含IP等信息）
+ Map userData = new HashMap<>();
+ // 尝试获取客户端IP
+ try {
+ ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder
+ .getRequestAttributes();
+ if (attributes != null) {
+ HttpServletRequest request = attributes.getRequest();
+ String clientIp = request.getRemoteAddr();
+ userData.put("ip", clientIp);
+ }
+ } catch (Exception e) {
+ userData.put("ip", "unknown");
+ }
+
+ // 将用户数据编码为Base64 JSON
+ String userDataJson = new com.fasterxml.jackson.databind.ObjectMapper().writeValueAsString(userData);
+ String username = Base64.getEncoder().encodeToString(userDataJson.getBytes(StandardCharsets.UTF_8));
+
+ // 生成密码签名
+ String password = generatePasswordSignature(mqttClientId + "|" + username, signatureKey);
+
+ // 构建MQTT配置
+ DeviceReportRespDTO.MQTT mqtt = new DeviceReportRespDTO.MQTT();
+ mqtt.setClient_id(mqttClientId);
+ mqtt.setUsername(username);
+ mqtt.setPassword(password);
+ mqtt.setPublish_topic("device-server");
+ mqtt.setSubscribe_topic("devices/p2p/" + deviceIdSafeStr);
+
+ return mqtt;
}
}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/config/KnowledgeBaseConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/config/KnowledgeBaseConfig.java
new file mode 100644
index 00000000..3b34d348
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/config/KnowledgeBaseConfig.java
@@ -0,0 +1,22 @@
+package xiaozhi.modules.knowledge.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import xiaozhi.modules.knowledge.rag.KnowledgeBaseAdapterFactory;
+
+/**
+ * 知识库配置类
+ * 配置知识库相关的Bean
+ */
+@Configuration
+public class KnowledgeBaseConfig {
+
+ /**
+ * 提供KnowledgeBaseAdapterFactory的Bean实例
+ * @return KnowledgeBaseAdapterFactory实例
+ */
+ @Bean
+ public KnowledgeBaseAdapterFactory knowledgeBaseAdapterFactory() {
+ return new KnowledgeBaseAdapterFactory();
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java
new file mode 100644
index 00000000..cddfead5
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java
@@ -0,0 +1,159 @@
+package xiaozhi.modules.knowledge.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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+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;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.Result;
+import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
+import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
+import xiaozhi.modules.security.user.SecurityUser;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/datasets")
+@Tag(name = "知识库管理")
+public class KnowledgeBaseController {
+
+ private final KnowledgeBaseService knowledgeBaseService;
+
+ @GetMapping
+ @Operation(summary = "分页查询知识库列表")
+ @RequiresPermissions("sys:role:normal")
+ public Result> getPageList(
+ @RequestParam(required = false) String name,
+ @RequestParam(required = false, defaultValue = "1") Integer page,
+ @RequestParam(required = false, defaultValue = "10") Integer page_size) {
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+
+ KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO();
+ knowledgeBaseDTO.setName(name);
+ knowledgeBaseDTO.setCreator(currentUserId); // 设置创建者ID，用于权限过滤
+
+ PageData pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, page, page_size);
+ return new Result>().ok(pageData);
+ }
+
+ @GetMapping("/{dataset_id}")
+ @Operation(summary = "根据知识库ID获取知识库详情")
+ @RequiresPermissions("sys:role:normal")
+ public Result getByDatasetId(@PathVariable("dataset_id") String datasetId) {
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+
+ KnowledgeBaseDTO knowledgeBaseDTO = knowledgeBaseService.getByDatasetId(datasetId);
+
+ // 检查权限：用户只能查看自己创建的知识库
+ if (knowledgeBaseDTO.getCreator() == null || !knowledgeBaseDTO.getCreator().equals(currentUserId)) {
+ throw new RenException(ErrorCode.NO_PERMISSION);
+ }
+
+ return new Result().ok(knowledgeBaseDTO);
+ }
+
+ @PostMapping
+ @Operation(summary = "创建知识库")
+ @RequiresPermissions("sys:role:normal")
+ public Result save(@RequestBody @Validated KnowledgeBaseDTO knowledgeBaseDTO) {
+ KnowledgeBaseDTO resp = knowledgeBaseService.save(knowledgeBaseDTO);
+ return new Result().ok(resp);
+ }
+
+ @PutMapping("/{dataset_id}")
+ @Operation(summary = "更新知识库")
+ @RequiresPermissions("sys:role:normal")
+ public Result update(@PathVariable("dataset_id") String datasetId,
+ @RequestBody @Validated KnowledgeBaseDTO knowledgeBaseDTO) {
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+
+ // 先获取现有知识库信息以检查权限
+ KnowledgeBaseDTO existingKnowledgeBase = knowledgeBaseService.getByDatasetId(datasetId);
+
+ // 检查权限：用户只能更新自己创建的知识库
+ if (existingKnowledgeBase.getCreator() == null || !existingKnowledgeBase.getCreator().equals(currentUserId)) {
+ throw new RenException(ErrorCode.NO_PERMISSION);
+ }
+
+ knowledgeBaseDTO.setDatasetId(datasetId);
+ KnowledgeBaseDTO resp = knowledgeBaseService.update(knowledgeBaseDTO);
+ return new Result().ok(resp);
+ }
+
+ @DeleteMapping("/{dataset_id}")
+ @Operation(summary = "删除单个知识库")
+ @Parameter(name = "dataset_id", description = "知识库ID", required = true)
+ @RequiresPermissions("sys:role:normal")
+ public Result delete(@PathVariable("dataset_id") String datasetId) {
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+
+ // 先获取现有知识库信息以检查权限
+ KnowledgeBaseDTO existingKnowledgeBase = knowledgeBaseService.getByDatasetId(datasetId);
+
+ // 检查权限：用户只能删除自己创建的知识库
+ if (existingKnowledgeBase.getCreator() == null || !existingKnowledgeBase.getCreator().equals(currentUserId)) {
+ throw new RenException(ErrorCode.NO_PERMISSION);
+ }
+
+ knowledgeBaseService.deleteByDatasetId(datasetId);
+ return new Result<>();
+ }
+
+ @DeleteMapping("/batch")
+ @Operation(summary = "批量删除知识库")
+ @Parameter(name = "ids", description = "知识库ID列表，用逗号分隔", required = true)
+ @RequiresPermissions("sys:role:normal")
+ public Result deleteBatch(@RequestParam("ids") String ids) {
+ if (StringUtils.isBlank(ids)) {
+ throw new RenException(ErrorCode.PARAMS_GET_ERROR);
+ }
+
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+ String[] idArray = ids.split(",");
+ for (String datasetId : idArray) {
+ if (StringUtils.isNotBlank(datasetId)) {
+ // 先获取现有知识库信息以检查权限
+ KnowledgeBaseDTO existingKnowledgeBase = knowledgeBaseService.getByDatasetId(datasetId.trim());
+
+ // 检查权限：用户只能删除自己创建的知识库
+ if (existingKnowledgeBase.getCreator() == null
+ || !existingKnowledgeBase.getCreator().equals(currentUserId)) {
+ throw new RenException(ErrorCode.NO_PERMISSION);
+ }
+
+ knowledgeBaseService.deleteByDatasetId(datasetId.trim());
+ }
+ }
+ return new Result<>();
+ }
+
+ @GetMapping("/rag-models")
+ @Operation(summary = "获取RAG模型列表")
+ @RequiresPermissions("sys:role:normal")
+ public Result>> getRAGModels() {
+ List> result = knowledgeBaseService.getRAGModels();
+ return new Result>>().ok(result);
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java
new file mode 100644
index 00000000..fbc62309
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java
@@ -0,0 +1,224 @@
+package xiaozhi.modules.knowledge.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+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;
+import xiaozhi.common.exception.RenException;
+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.service.KnowledgeBaseService;
+import xiaozhi.modules.knowledge.service.KnowledgeFilesService;
+import xiaozhi.modules.security.user.SecurityUser;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/datasets/{dataset_id}")
+@Tag(name = "知识库文档管理")
+public class KnowledgeFilesController {
+
+ private final KnowledgeFilesService knowledgeFilesService;
+ private final KnowledgeBaseService knowledgeBaseService;
+
+ /**
+ * 验证当前用户是否有权限操作指定知识库
+ *
+ * @param datasetId 知识库ID
+ */
+ private void validateKnowledgeBasePermission(String datasetId) {
+ // 获取当前登录用户ID
+ Long currentUserId = SecurityUser.getUserId();
+
+ // 获取知识库信息
+ KnowledgeBaseDTO knowledgeBase = knowledgeBaseService.getByDatasetId(datasetId);
+
+ // 检查权限：用户只能操作自己创建的知识库
+ if (knowledgeBase.getCreator() == null || !knowledgeBase.getCreator().equals(currentUserId)) {
+ throw new RenException(ErrorCode.NO_PERMISSION);
+ }
+ }
+
+ @GetMapping("/documents")
+ @Operation(summary = "分页查询文档列表")
+ @RequiresPermissions("sys:role:normal")
+ public Result> getPageList(
+ @PathVariable("dataset_id") String datasetId,
+ @RequestParam(required = false) String name,
+ @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 pageData = knowledgeFilesService.getPageListByStatus(datasetId, status, page, page_size);
+ return new Result>().ok(pageData);
+ }
+
+ // 否则使用通用查询接口
+ KnowledgeFilesDTO knowledgeFilesDTO = new KnowledgeFilesDTO();
+ knowledgeFilesDTO.setDatasetId(datasetId);
+ knowledgeFilesDTO.setName(name);
+ PageData pageData = knowledgeFilesService.getPageList(knowledgeFilesDTO, page, page_size);
+ return new Result>().ok(pageData);
+ }
+
+ @GetMapping("/documents/status/{status}")
+ @Operation(summary = "根据状态分页查询文档列表")
+ @RequiresPermissions("sys:role:normal")
+ public Result> getPageListByStatus(
+ @PathVariable("dataset_id") String datasetId,
+ @PathVariable("status") Integer status,
+ @RequestParam(required = false, defaultValue = "1") Integer page,
+ @RequestParam(required = false, defaultValue = "10") Integer page_size) {
+ // 验证知识库权限
+ validateKnowledgeBasePermission(datasetId);
+
+ PageData pageData = knowledgeFilesService.getPageListByStatus(datasetId, status, page, page_size);
+ return new Result>().ok(pageData);
+ }
+
+ @PostMapping("/documents")
+ @Operation(summary = "上传文档到知识库")
+ @RequiresPermissions("sys:role:normal")
+ public Result uploadDocument(
+ @PathVariable("dataset_id") String datasetId,
+ @RequestParam("file") MultipartFile file,
+ @RequestParam(required = false) String name,
+ @RequestParam(required = false) String chunkMethod,
+ @RequestParam(required = false) String metaFields,
+ @RequestParam(required = false) String parserConfig) {
+
+ // 验证知识库权限
+ validateKnowledgeBasePermission(datasetId);
+
+ KnowledgeFilesDTO resp = knowledgeFilesService.uploadDocument(datasetId, file, name,
+ metaFields != null ? parseJsonMap(metaFields) : null,
+ chunkMethod,
+ parserConfig != null ? parseJsonMap(parserConfig) : null);
+ return new Result().ok(resp);
+ }
+
+ @DeleteMapping("/documents/{document_id}")
+ @Operation(summary = "删除单个文档")
+ @Parameter(name = "document_id", description = "文档ID", required = true)
+ @RequiresPermissions("sys:role:normal")
+ public Result delete(@PathVariable("dataset_id") String datasetId,
+ @PathVariable("document_id") String documentId) {
+ // 验证知识库权限
+ validateKnowledgeBasePermission(datasetId);
+
+ knowledgeFilesService.deleteByDocumentId(documentId, datasetId);
+ return new Result<>();
+ }
+
+ @PostMapping("/chunks")
+ @Operation(summary = "解析文档（切块）")
+ @RequiresPermissions("sys:role:normal")
+ public Result parseDocuments(@PathVariable("dataset_id") String datasetId,
+ @RequestBody Map> requestBody) {
+ // 验证知识库权限
+ validateKnowledgeBasePermission(datasetId);
+
+ List documentIds = requestBody.get("document_ids");
+ if (documentIds == null || documentIds.isEmpty()) {
+ return new Result().error("document_ids参数不能为空");
+ }
+
+ boolean success = knowledgeFilesService.parseDocuments(datasetId, documentIds);
+ if (success) {
+ return new Result();
+ } else {
+ return new Result().error("文档解析失败，文档可能正在处理中");
+ }
+ }
+
+ @GetMapping("/documents/{document_id}/chunks")
+ @Operation(summary = "列出指定文档的切片")
+ @RequiresPermissions("sys:role:normal")
+ public Result> listChunks(@PathVariable("dataset_id") String datasetId,
+ @PathVariable("document_id") String documentId,
+ @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);
+
+ Map result = knowledgeFilesService.listChunks(datasetId, documentId, keywords, page, page_size,
+ id);
+ return new Result>().ok(result);
+ }
+
+ /**
+ * 召回测试
+ */
+ @PostMapping("/retrieval-test")
+ @Operation(summary = "召回测试")
+ @RequiresPermissions("sys:role:normal")
+ public Result> retrievalTest(@PathVariable("dataset_id") String datasetId,
+ @RequestBody Map params) {
+ // 验证知识库权限
+ validateKnowledgeBasePermission(datasetId);
+
+ try {
+ // 提取参数
+ String question = (String) params.get("question");
+ if (question == null || question.trim().isEmpty()) {
+ return new Result>().error("问题不能为空");
+ }
+
+ List datasetIds = (List) params.get("dataset_ids");
+ List documentIds = (List) 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 crossLanguages = (List) params.get("cross_languages");
+ Map metadataCondition = (Map) params.get("metadata_condition");
+
+ // 如果未指定数据集ID，使用当前数据集
+ if (datasetIds == null || datasetIds.isEmpty()) {
+ datasetIds = java.util.Arrays.asList(datasetId);
+ }
+
+ Map result = knowledgeFilesService.retrievalTest(
+ question, datasetIds, documentIds, page, pageSize, similarityThreshold,
+ vectorSimilarityWeight, topK, rerankId, keyword, highlight, crossLanguages, metadataCondition);
+
+ return new Result>().ok(result);
+ } catch (Exception e) {
+ return new Result>().error("召回测试失败: " + e.getMessage());
+ }
+ }
+ /**
+ * 解析JSON字符串为Map对象
+ */
+ private Map parseJsonMap(String jsonString) {
+ try {
+ ObjectMapper objectMapper = new ObjectMapper();
+ return objectMapper.readValue(jsonString, new TypeReference>() {
+ });
+ } catch (Exception e) {
+ throw new RuntimeException("解析JSON字符串失败: " + jsonString, e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dao/KnowledgeBaseDao.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dao/KnowledgeBaseDao.java
new file mode 100644
index 00000000..b9a8aa0c
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dao/KnowledgeBaseDao.java
@@ -0,0 +1,22 @@
+package xiaozhi.modules.knowledge.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import xiaozhi.common.dao.BaseDao;
+import xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity;
+
+/**
+ * 知识库知识库
+ */
+@Mapper
+public interface KnowledgeBaseDao extends BaseDao {
+
+ /**
+ * 根据知识库ID删除相关的插件映射记录
+ *
+ * @param knowledgeBaseId 知识库ID
+ */
+ void deletePluginMappingByKnowledgeBaseId(@Param("knowledgeBaseId") String knowledgeBaseId);
+
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeBaseDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeBaseDTO.java
new file mode 100644
index 00000000..77f6d198
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeBaseDTO.java
@@ -0,0 +1,49 @@
+package xiaozhi.modules.knowledge.dto;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "知识库知识库")
+public class KnowledgeBaseDTO implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识")
+ private String id;
+
+ @Schema(description = "知识库ID")
+ private String datasetId;
+
+ @Schema(description = "RAG模型配置ID")
+ private String ragModelId;
+
+ @Schema(description = "知识库名称")
+ private String name;
+
+ @Schema(description = "知识库描述")
+ private String description;
+
+ @Schema(description = "状态(0:禁用 1:启用)")
+ private Integer status;
+
+ @Schema(description = "创建者")
+ private Long creator;
+
+ @Schema(description = "创建时间")
+ private Date createdAt;
+
+ @Schema(description = "更新者")
+ private Long updater;
+
+ @Schema(description = "更新时间")
+ private Date updatedAt;
+
+ @Schema(description = "文档数量")
+ private Integer documentCount;
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeFilesDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeFilesDTO.java
new file mode 100644
index 00000000..ccf56447
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/dto/KnowledgeFilesDTO.java
@@ -0,0 +1,96 @@
+package xiaozhi.modules.knowledge.dto;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "知识库文档")
+public class KnowledgeFilesDTO implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+ @Schema(description = "唯一标识")
+ private String id;
+
+ @Schema(description = "文档ID")
+ private String documentId;
+
+ @Schema(description = "知识库ID")
+ private String datasetId;
+
+ @Schema(description = "文档名称")
+ private String name;
+
+ @Schema(description = "文档类型")
+ private String fileType;
+
+ @Schema(description = "文件大小（字节）")
+ private Long fileSize;
+
+ @Schema(description = "文件路径")
+ private String filePath;
+
+ @Schema(description = "元数据字段")
+ private Map metaFields;
+
+ @Schema(description = "分块方法")
+ private String chunkMethod;
+
+ @Schema(description = "解析器配置")
+ private Map parserConfig;
+
+ @Schema(description = "状态")
+ private Integer status;
+
+ @Schema(description = "文档解析状态")
+ private String run;
+
+ @Schema(description = "创建者")
+ private Long creator;
+
+ @Schema(description = "创建时间")
+ private Date createdAt;
+
+ @Schema(description = "更新者")
+ private Long updater;
+
+ @Schema(description = "更新时间")
+ private Date updatedAt;
+
+ // 文档解析状态常量定义
+ private static final Integer STATUS_UNSTART = 0;
+ private static final Integer STATUS_RUNNING = 1;
+ private static final Integer STATUS_CANCEL = 2;
+ private static final Integer STATUS_DONE = 3;
+ private static final Integer STATUS_FAIL = 4;
+
+ /**
+ * 获取文档解析状态码（基于run字段转换）
+ */
+ public Integer getParseStatusCode() {
+ if (run == null) {
+ return STATUS_UNSTART;
+ }
+
+ // RAGFlow根据run字段的值直接映射到对应的状态码
+ switch (run.toUpperCase()) {
+ case "RUNNING":
+ return STATUS_RUNNING;
+ case "CANCEL":
+ return STATUS_CANCEL;
+ case "DONE":
+ return STATUS_DONE;
+ case "FAIL":
+ return STATUS_FAIL;
+ case "UNSTART":
+ default:
+ return STATUS_UNSTART;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/entity/KnowledgeBaseEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/entity/KnowledgeBaseEntity.java
new file mode 100644
index 00000000..e6c897ea
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/entity/KnowledgeBaseEntity.java
@@ -0,0 +1,53 @@
+package xiaozhi.modules.knowledge.entity;
+
+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;
+
+@Data
+@TableName(value = "ai_rag_dataset", autoResultMap = true)
+@Schema(description = "知识库知识库表")
+public class KnowledgeBaseEntity {
+
+ @TableId(type = IdType.ASSIGN_UUID)
+ @Schema(description = "唯一标识")
+ private String id;
+
+ @Schema(description = "知识库ID")
+ private String datasetId;
+
+ @Schema(description = "RAG模型配置ID")
+ private String ragModelId;
+
+ @Schema(description = "知识库名称")
+ private String name;
+
+ @Schema(description = "知识库描述")
+ private String description;
+
+ @Schema(description = "状态(0:禁用 1:启用)")
+ private Integer status;
+
+ @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 Long updater;
+
+ @Schema(description = "更新时间")
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updatedAt;
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapter.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapter.java
new file mode 100644
index 00000000..0c2d50ed
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapter.java
@@ -0,0 +1,200 @@
+package xiaozhi.modules.knowledge.rag;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import xiaozhi.common.page.PageData;
+import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
+
+/**
+ * 知识库API适配器抽象基类
+ * 定义通用的知识库操作接口，支持多种后端API实现
+ */
+public abstract class KnowledgeBaseAdapter {
+
+ /**
+ * 获取适配器类型标识
+ *
+ * @return 适配器类型（如：ragflow, milvus, pinecone等）
+ */
+ public abstract String getAdapterType();
+
+ /**
+ * 初始化适配器配置
+ *
+ * @param config 配置参数
+ */
+ public abstract void initialize(Map config);
+
+ /**
+ * 验证配置是否有效
+ *
+ * @param config 配置参数
+ * @return 验证结果
+ */
+ public abstract boolean validateConfig(Map config);
+
+ /**
+ * 分页查询文档列表
+ *
+ * @param datasetId 知识库ID
+ * @param queryParams 查询参数
+ * @param page 页码
+ * @param limit 每页数量
+ * @return 分页数据
+ */
+ public abstract PageData getDocumentList(String datasetId,
+ Map queryParams,
+ Integer page,
+ Integer limit);
+
+ /**
+ * 根据文档ID获取文档详情
+ *
+ * @param datasetId 知识库ID
+ * @return 文档详情
+ */
+ public abstract KnowledgeFilesDTO getDocumentById(String datasetId, String documentId);
+
+ /**
+ * 上传文档到知识库
+ *
+ * @param datasetId 知识库ID
+ * @param file 上传的文件
+ * @param name 文档名称
+ * @param metaFields 元数据字段
+ * @param chunkMethod 分块方法
+ * @param parserConfig 解析器配置
+ * @return 上传的文档信息
+ */
+ public abstract KnowledgeFilesDTO uploadDocument(String datasetId,
+ MultipartFile file,
+ String name,
+ Map metaFields,
+ String chunkMethod,
+ Map parserConfig);
+
+ /**
+ * 根据状态分页查询文档列表
+ *
+ * @param datasetId 知识库ID
+ * @param status 文档解析状态
+ * @param page 页码
+ * @param limit 每页数量
+ * @return 分页数据
+ */
+ public abstract PageData getDocumentListByStatus(String datasetId,
+ Integer status,
+ Integer page,
+ Integer limit);
+
+ /**
+ * 删除文档
+ *
+ * @param datasetId 知识库ID
+ * @param documentId 文档ID
+ */
+ public abstract void deleteDocument(String datasetId, String documentId);
+
+ /**
+ * 解析文档（切块）
+ *
+ * @param datasetId 知识库ID
+ * @param documentIds 文档ID列表
+ * @return 解析结果
+ */
+ public abstract boolean parseDocuments(String datasetId, List documentIds);
+
+ /**
+ * 列出指定文档的切片
+ *
+ * @param datasetId 知识库ID
+ * @param documentId 文档ID
+ * @param keywords 关键词过滤
+ * @param page 页码
+ * @param pageSize 每页数量
+ * @param chunkId 切片ID
+ * @return 切片列表信息
+ */
+ public abstract Map listChunks(String datasetId,
+ String documentId,
+ String keywords,
+ Integer page,
+ Integer pageSize,
+ String chunkId);
+
+ /**
+ * 召回测试 - 从知识库中检索相关切片
+ *
+ * @param question 用户查询
+ * @param datasetIds 数据集ID列表
+ * @param documentIds 文档ID列表
+ * @param retrievalParams 检索参数
+ * @return 召回测试结果
+ */
+ public abstract Map retrievalTest(String question,
+ List datasetIds,
+ List documentIds,
+ Map retrievalParams);
+
+ /**
+ * 测试连接
+ *
+ * @return 连接测试结果
+ */
+ public abstract boolean testConnection();
+
+ /**
+ * 获取适配器状态信息
+ *
+ * @return 状态信息
+ */
+ public abstract Map getStatus();
+
+ /**
+ * 获取支持的配置参数
+ *
+ * @return 配置参数说明
+ */
+ public abstract Map getSupportedConfig();
+
+ /**
+ * 获取默认配置
+ *
+ * @return 默认配置
+ */
+ public abstract Map getDefaultConfig();
+
+ /**
+ * 创建数据集
+ *
+ * @param createParams 创建参数
+ * @return 数据集ID
+ */
+ public abstract String createDataset(Map createParams);
+
+ /**
+ * 更新数据集
+ *
+ * @param datasetId 数据集ID
+ * @param updateParams 更新参数
+ */
+ public abstract void updateDataset(String datasetId, Map updateParams);
+
+ /**
+ * 删除数据集
+ *
+ * @param datasetId 数据集ID
+ */
+ public abstract void deleteDataset(String datasetId);
+
+ /**
+ * 获取数据集的文档数量
+ *
+ * @param datasetId 数据集ID
+ * @return 文档数量
+ */
+ public abstract Integer getDocumentCount(String datasetId);
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapterFactory.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapterFactory.java
new file mode 100644
index 00000000..42fb4ca9
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapterFactory.java
@@ -0,0 +1,197 @@
+package xiaozhi.modules.knowledge.rag;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+
+/**
+ * 知识库适配器工厂类
+ * 负责创建和管理不同类型的知识库API适配器
+ */
+@Slf4j
+public class KnowledgeBaseAdapterFactory {
+
+ // 注册的适配器类型映射
+ private static final Map> adapterRegistry = new HashMap<>();
+
+ // 适配器实例缓存
+ private static final Map adapterCache = new ConcurrentHashMap<>();
+
+ static {
+ // 注册内置适配器类型
+ registerAdapter("ragflow", xiaozhi.modules.knowledge.rag.impl.RAGFlowAdapter.class);
+ // 可以在这里注册更多适配器类型
+ }
+
+ /**
+ * 注册新的适配器类型
+ *
+ * @param adapterType 适配器类型标识
+ * @param adapterClass 适配器类
+ */
+ public static void registerAdapter(String adapterType, Class adapterClass) {
+ if (adapterRegistry.containsKey(adapterType)) {
+ log.warn("适配器类型 '{}' 已存在，将被覆盖", adapterType);
+ }
+ adapterRegistry.put(adapterType, adapterClass);
+ log.info("注册适配器类型: {} -> {}", adapterType, adapterClass.getSimpleName());
+ }
+
+ /**
+ * 获取适配器实例
+ *
+ * @param adapterType 适配器类型
+ * @param config 配置参数
+ * @return 适配器实例
+ */
+ public static KnowledgeBaseAdapter getAdapter(String adapterType, Map config) {
+ String cacheKey = buildCacheKey(adapterType, config);
+
+ // 检查缓存中是否已存在实例
+ if (adapterCache.containsKey(cacheKey)) {
+ log.debug("从缓存获取适配器实例: {}", cacheKey);
+ return adapterCache.get(cacheKey);
+ }
+
+ // 创建新的适配器实例
+ KnowledgeBaseAdapter adapter = createAdapter(adapterType, config);
+
+ // 缓存适配器实例
+ adapterCache.put(cacheKey, adapter);
+ log.info("创建并缓存适配器实例: {}", cacheKey);
+
+ return adapter;
+ }
+
+ /**
+ * 获取适配器实例（无配置）
+ *
+ * @param adapterType 适配器类型
+ * @return 适配器实例
+ */
+ public static KnowledgeBaseAdapter getAdapter(String adapterType) {
+ return getAdapter(adapterType, null);
+ }
+
+ /**
+ * 获取所有已注册的适配器类型
+ *
+ * @return 适配器类型集合
+ */
+ public static Set getRegisteredAdapterTypes() {
+ return adapterRegistry.keySet();
+ }
+
+ /**
+ * 检查适配器类型是否已注册
+ *
+ * @param adapterType 适配器类型
+ * @return 是否已注册
+ */
+ public static boolean isAdapterTypeRegistered(String adapterType) {
+ return adapterRegistry.containsKey(adapterType);
+ }
+
+ /**
+ * 清除适配器缓存
+ */
+ public static void clearCache() {
+ int cacheSize = adapterCache.size();
+ adapterCache.clear();
+ log.info("清除适配器缓存，共清除 {} 个实例", cacheSize);
+ }
+
+ /**
+ * 移除特定适配器类型的缓存
+ *
+ * @param adapterType 适配器类型
+ */
+ public static void removeCacheByType(String adapterType) {
+ int removedCount = 0;
+ for (String cacheKey : adapterCache.keySet()) {
+ if (cacheKey.startsWith(adapterType + "@")) {
+ adapterCache.remove(cacheKey);
+ removedCount++;
+ }
+ }
+ log.info("移除适配器类型 '{}' 的缓存，共移除 {} 个实例", adapterType, removedCount);
+ }
+
+ /**
+ * 获取适配器工厂状态信息
+ *
+ * @return 状态信息
+ */
+ public static Map getFactoryStatus() {
+ Map status = new HashMap<>();
+ status.put("registeredAdapterTypes", adapterRegistry.keySet());
+ status.put("cachedAdapterCount", adapterCache.size());
+ status.put("cacheKeys", adapterCache.keySet());
+ return status;
+ }
+
+ /**
+ * 创建适配器实例
+ *
+ * @param adapterType 适配器类型
+ * @param config 配置参数
+ * @return 适配器实例
+ */
+ private static KnowledgeBaseAdapter createAdapter(String adapterType, Map config) {
+ if (!adapterRegistry.containsKey(adapterType)) {
+ throw new RenException(ErrorCode.RAG_ADAPTER_TYPE_NOT_SUPPORTED,
+ "不支持的适配器类型: " + adapterType);
+ }
+
+ try {
+ Class adapterClass = adapterRegistry.get(adapterType);
+ KnowledgeBaseAdapter adapter = adapterClass.getDeclaredConstructor().newInstance();
+
+ // 初始化适配器
+ if (config != null) {
+ adapter.initialize(config);
+
+ // 验证配置
+ if (!adapter.validateConfig(config)) {
+ throw new RenException(ErrorCode.RAG_CONFIG_VALIDATION_FAILED,
+ "适配器配置验证失败: " + adapterType);
+ }
+ }
+
+ log.info("成功创建适配器实例: {}", adapterType);
+ return adapter;
+
+ } catch (Exception e) {
+ log.error("创建适配器实例失败: {}", adapterType, e);
+ throw new RenException(ErrorCode.RAG_ADAPTER_CREATION_FAILED,
+ "创建适配器失败: " + adapterType + ", 错误: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 构建缓存键
+ *
+ * @param adapterType 适配器类型
+ * @param config 配置参数
+ * @return 缓存键
+ */
+ private static String buildCacheKey(String adapterType, Map config) {
+ if (config == null || config.isEmpty()) {
+ return adapterType + "@default";
+ }
+
+ // 基于配置参数生成缓存键
+ StringBuilder keyBuilder = new StringBuilder(adapterType + "@");
+
+ // 使用配置的哈希值作为缓存键的一部分
+ int configHash = config.hashCode();
+ keyBuilder.append(configHash);
+
+ return keyBuilder.toString();
+ }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
new file mode 100644
index 00000000..2da8cc7e
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
@@ -0,0 +1,1155 @@
+package xiaozhi.modules.knowledge.rag.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.AbstractResource;
+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.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.page.PageData;
+import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
+import xiaozhi.modules.knowledge.rag.KnowledgeBaseAdapter;
+
+/**
+ * RAGFlow知识库适配器实现
+ */
+@Slf4j
+public class RAGFlowAdapter extends KnowledgeBaseAdapter {
+
+ private static final String ADAPTER_TYPE = "ragflow";
+
+ private RestTemplate restTemplate;
+ private ObjectMapper objectMapper;
+ private Map config;
+
+ public RAGFlowAdapter() {
+ this.restTemplate = new RestTemplate();
+ this.objectMapper = new ObjectMapper();
+ }
+
+ @Override
+ public String getAdapterType() {
+ return ADAPTER_TYPE;
+ }
+
+ @Override
+ public void initialize(Map config) {
+ this.config = config;
+ log.info("RAGFlow适配器初始化完成，配置参数: {}", config.keySet());
+ }
+
+ @Override
+ public boolean validateConfig(Map config) {
+ if (config == null) {
+ throw new RenException(ErrorCode.RAG_CONFIG_NOT_FOUND);
+ }
+
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ if (StringUtils.isBlank(baseUrl)) {
+ throw new RenException(ErrorCode.RAG_API_ERROR_URL_NULL);
+ }
+
+ if (StringUtils.isBlank(apiKey)) {
+ throw new RenException(ErrorCode.RAG_API_ERROR_API_KEY_NULL);
+ }
+
+ if (apiKey.contains("你")) {
+ throw new RenException(ErrorCode.RAG_API_ERROR_API_KEY_INVALID);
+ }
+
+ if (!baseUrl.startsWith("http://") && !baseUrl.startsWith("https://")) {
+ throw new RenException(ErrorCode.RAG_API_ERROR_URL_INVALID);
+ }
+
+ return true;
+ }
+
+ @Override
+ public PageData getDocumentList(String datasetId, Map queryParams, Integer page,
+ Integer limit) {
+ try {
+ log.info("=== RAGFlow适配器开始获取文档列表 ===");
+
+ validateConfig(config);
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents";
+
+ // 构建查询参数
+ StringBuilder urlBuilder = new StringBuilder(url);
+ List params = new ArrayList<>();
+
+ // 基本分页参数
+ if (page > 0) {
+ params.add("page=" + page);
+ }
+ if (limit > 0) {
+ params.add("page_size=" + limit);
+ }
+
+ // 查询参数处理
+ if (queryParams != null) {
+ // 关键词搜索
+ if (queryParams.containsKey("name")) {
+ params.add("keywords=" + queryParams.get("name"));
+ }
+
+ // 排序参数
+ if (queryParams.containsKey("orderby")) {
+ String orderby = (String) queryParams.get("orderby");
+ if ("create_time".equals(orderby) || "update_time".equals(orderby)) {
+ params.add("orderby=" + orderby);
+ }
+ }
+
+ // 排序方向
+ if (queryParams.containsKey("desc")) {
+ Boolean desc = (Boolean) queryParams.get("desc");
+ params.add("desc=" + (desc != null ? desc : true));
+ }
+
+ // 文档ID过滤
+ if (queryParams.containsKey("id")) {
+ params.add("id=" + queryParams.get("id"));
+ }
+
+ // 文档名称过滤
+ if (queryParams.containsKey("documentName")) {
+ params.add("name=" + queryParams.get("documentName"));
+ }
+
+ // 创建时间范围过滤
+ if (queryParams.containsKey("createTimeFrom")) {
+ Long createTimeFrom = (Long) queryParams.get("createTimeFrom");
+ if (createTimeFrom != null && createTimeFrom > 0) {
+ params.add("create_time_from=" + createTimeFrom);
+ }
+ }
+
+ if (queryParams.containsKey("createTimeTo")) {
+ Long createTimeTo = (Long) queryParams.get("createTimeTo");
+ if (createTimeTo != null && createTimeTo > 0) {
+ params.add("create_time_to=" + createTimeTo);
+ }
+ }
+
+ // 文件后缀过滤
+ if (queryParams.containsKey("suffix")) {
+ Object suffixObj = queryParams.get("suffix");
+ if (suffixObj instanceof String) {
+ params.add("suffix=" + suffixObj);
+ } else if (suffixObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List suffixes = (List) suffixObj;
+ if (!suffixes.isEmpty()) {
+ params.add("suffix=" + String.join(",", suffixes));
+ }
+ }
+ }
+
+ // 处理状态过滤
+ if (queryParams.containsKey("run")) {
+ Object runObj = queryParams.get("run");
+ if (runObj instanceof String) {
+ params.add("run=" + runObj);
+ } else if (runObj instanceof Integer) {
+ params.add("run=" + runObj);
+ } else if (runObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List runStatuses = (List) runObj;
+ if (!runStatuses.isEmpty()) {
+ List runParams = new ArrayList<>();
+ for (Object status : runStatuses) {
+ if (status != null) {
+ runParams.add(status.toString());
+ }
+ }
+ params.add("run=" + String.join(",", runParams));
+ }
+ }
+ }
+ }
+
+ if (!params.isEmpty()) {
+ urlBuilder.append("?").append(String.join("&", params));
+ }
+
+ url = urlBuilder.toString();
+ log.debug("RAGFlow API请求URL: {}", url);
+
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("Authorization", "Bearer " + apiKey);
+
+ HttpEntity requestEntity = new HttpEntity<>(headers);
+
+ // 发送GET请求
+ log.info("发送GET请求到RAGFlow API获取文档列表...");
+ ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, String.class);
+
+ log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ log.error("RAGFlow API调用失败，状态码: {}", response.getStatusCode());
+ throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+ }
+
+ String responseBody = response.getBody();
+ log.debug("RAGFlow API原始响应: {}", responseBody);
+
+ Map responseMap = objectMapper.readValue(responseBody, Map.class);
+ Integer code = (Integer) responseMap.get("code");
+
+ if (code != null && code == 0) {
+ Object dataObj = responseMap.get("data");
+ log.debug("RAGFlow API返回的data字段: {}", dataObj);
+ return parseDocumentListResponse(dataObj, page, limit);
+ } else {
+ String apiMessage = (String) responseMap.get("message");
+ String errorDetail = apiMessage != null ? apiMessage : "无详细错误信息";
+ log.error("RAGFlow API调用失败，响应码: {}, 错误详情: {}", code, errorDetail);
+ throw new RenException(ErrorCode.RAG_API_ERROR, errorDetail);
+ }
+
+ } catch (Exception e) {
+ log.error("RAGFlow适配器获取文档列表失败: {}", e.getMessage(), e);
+ if (e instanceof RenException) {
+ throw (RenException) e;
+ }
+ throw new RenException(ErrorCode.RAG_API_ERROR, e.getMessage());
+ } finally {
+ log.info("=== RAGFlow适配器获取文档列表操作结束 ===");
+ }
+ }
+
+ @Override
+ public KnowledgeFilesDTO getDocumentById(String datasetId, String documentId) {
+ // 实现根据ID获取文档详情的逻辑
+ // 这里需要调用RAGFlow API获取特定文档的详细信息
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public KnowledgeFilesDTO uploadDocument(String datasetId, MultipartFile file, String name,
+ Map metaFields, String chunkMethod,
+ Map parserConfig) {
+ try {
+ log.info("=== RAGFlow适配器开始文档上传操作 ===");
+
+ validateConfig(config);
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents";
+
+ // 构建多部分请求
+ MultiValueMap body = new LinkedMultiValueMap<>();
+
+ // 添加文件
+ body.add("file", new MultipartFileResource(file));
+
+ // 添加其他参数
+ if (StringUtils.isNotBlank(name)) {
+ body.add("name", name);
+ }
+
+ if (metaFields != null && !metaFields.isEmpty()) {
+ body.add("meta", objectMapper.writeValueAsString(metaFields));
+ }
+
+ if (StringUtils.isNotBlank(chunkMethod)) {
+ body.add("chunk_method", chunkMethod);
+ }
+
+ if (parserConfig != null && !parserConfig.isEmpty()) {
+ body.add("parser_config", objectMapper.writeValueAsString(parserConfig));
+ }
+
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+ headers.set("Authorization", "Bearer " + apiKey);
+
+ HttpEntity> requestEntity = new HttpEntity<>(body, headers);
+
+ // 发送POST请求
+ log.info("发送POST请求到RAGFlow API上传文档...");
+ ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+
+ log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ log.error("RAGFlow API调用失败，状态码: {}", response.getStatusCode());
+ throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+ }
+
+ String responseBody = response.getBody();
+ log.debug("RAGFlow API获取文档数量原始响应: {}", responseBody);
+ Map responseMap = objectMapper.readValue(responseBody, Map.class);
+ Integer code = (Integer) responseMap.get("code");
+
+ log.debug("RAGFlow API获取文档数量响应码: {}, data字段: {}", code, responseMap.get("data"));
+
+ if (code != null && code == 0) {
+ Object dataObj = responseMap.get("data");
+ return parseUploadResponse(dataObj, datasetId, file);
+ } else {
+ String apiMessage = (String) responseMap.get("message");
+ String errorDetail = apiMessage != null ? apiMessage : "无详细错误信息";
+ log.error("RAGFlow API调用失败，响应码: {}, 错误详情: {}", code, errorDetail);
+ throw new RenException(ErrorCode.RAG_API_ERROR, errorDetail);
+ }
+
+ } catch (Exception e) {
+ log.error("RAGFlow适配器文档上传失败: {}", e.getMessage(), e);
+ if (e instanceof RenException) {
+ throw (RenException) e;
+ }
+ throw new RenException(ErrorCode.RAG_API_ERROR, e.getMessage());
+ } finally {
+ log.info("=== RAGFlow适配器文档上传操作结束 ===");
+ }
+ }
+
+ @Override
+ public PageData getDocumentListByStatus(String datasetId, Integer status, Integer page,
+ Integer limit) {
+ try {
+ log.info("=== RAGFlow适配器开始根据状态获取文档列表 ===");
+ log.info("datasetId: {}, status: {}, page: {}, limit: {}", datasetId, status, page, limit);
+
+ // 构建查询参数，包含状态过滤
+ Map queryParams = new HashMap<>();
+
+ // 将状态码转换为RAGFlow API支持的格式
+ if (status != null) {
+ // 根据KnowledgeFilesDTO中的状态常量映射
+ String runStatus;
+ switch (status) {
+ case 0: // STATUS_UNSTART
+ runStatus = "UNSTART";
+ break;
+ case 1: // STATUS_RUNNING
+ runStatus = "RUNNING";
+ break;
+ case 2: // STATUS_CANCEL
+ runStatus = "CANCEL";
+ break;
+ case 3: // STATUS_DONE
+ runStatus = "DONE";
+ break;
+ case 4: // STATUS_FAIL
+ runStatus = "FAIL";
+ break;
+ default:
+ runStatus = status.toString(); // 使用数字格式
+ }
+ queryParams.put("run", runStatus);
+ log.debug("状态过滤参数: run={}", runStatus);
+ }
+
+ // 调用通用的文档列表获取方法
+ return getDocumentList(datasetId, queryParams, page, limit);
+
+ } catch (Exception e) {
+ log.error("RAGFlow适配器根据状态获取文档列表失败: {}", e.getMessage(), e);
+ if (e instanceof RenException) {
+ throw (RenException) e;
+ }
+ throw new RenException(ErrorCode.RAG_API_ERROR, e.getMessage());
+ } finally {
+ log.info("=== RAGFlow适配器根据状态获取文档列表操作结束 ===");
+ }
+ }
+
+ @Override
+ public void deleteDocument(String datasetId, String documentId) {
+ try {
+ log.info("=== RAGFlow适配器开始删除文档 ===");
+
+ validateConfig(config);
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents";
+
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("Authorization", "Bearer " + apiKey);
+
+ // 构建请求体 - 根据API文档，需要传递文档ID列表
+ Map requestBody = new HashMap<>();
+ List documentIds = new ArrayList<>();
+ documentIds.add(documentId);
+ requestBody.put("ids", documentIds);
+
+ HttpEntity> requestEntity = new HttpEntity<>(requestBody, headers);
+
+ // 发送DELETE请求
+ log.info("发送DELETE请求到RAGFlow API删除文档...");
+ ResponseEntity response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity,
+ String.class);
+
+ log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ log.error("RAGFlow API调用失败，状态码: {}", response.getStatusCode());
+ throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+ }
+
+ String responseBody = response.getBody();
+ Map responseMap = objectMapper.readValue(responseBody, Map.class);
+ Integer code = (Integer) responseMap.get("code");
+
+ if (code != null && code == 0) {
+ log.info("文档删除成功: documentId={}, datasetId={}", documentId, datasetId);
+ } else {
+ String apiMessage = (String) responseMap.get("message");
+ String errorDetail = apiMessage != null ? apiMessage : "无详细错误信息";
+ log.error("RAGFlow API调用失败，响应码: {}, 错误详情: {}", code, errorDetail);
+ throw new RenException(ErrorCode.RAG_API_ERROR, errorDetail);
+ }
+
+ } catch (Exception e) {
+ log.error("RAGFlow适配器删除文档失败: {}", e.getMessage(), e);
+ if (e instanceof RenException) {
+ throw (RenException) e;
+ }
+ throw new RenException(ErrorCode.RAG_API_ERROR, e.getMessage());
+ } finally {
+ log.info("=== RAGFlow适配器删除文档操作结束 ===");
+ }
+ }
+
+ @Override
+ public boolean parseDocuments(String datasetId, List documentIds) {
+ try {
+ log.info("=== RAGFlow适配器开始解析文档 ===");
+
+ validateConfig(config);
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ String url = baseUrl + "/api/v1/datasets/" + datasetId + "/chunks";
+
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set("Authorization", "Bearer " + apiKey);
+
+ // 构建请求体 - 根据API文档，需要传递文档ID列表
+ Map requestBody = new HashMap<>();
+ requestBody.put("document_ids", documentIds);
+
+ HttpEntity> requestEntity = new HttpEntity<>(requestBody, headers);
+
+ // 发送POST请求
+ log.info("发送POST请求到RAGFlow API解析文档...");
+ ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, requestEntity,
+ String.class);
+
+ log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ log.error("RAGFlow API调用失败，状态码: {}", response.getStatusCode());
+ throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+ }
+
+ String responseBody = response.getBody();
+ Map responseMap = objectMapper.readValue(responseBody, Map.class);
+ Integer code = (Integer) responseMap.get("code");
+
+ if (code != null && code == 0) {
+ log.info("文档解析成功: datasetId={}, 文档数量={}", datasetId, documentIds.size());
+ return true;
+ } else {
+ String apiMessage = (String) responseMap.get("message");
+ String errorDetail = apiMessage != null ? apiMessage : "无详细错误信息";
+ log.error("RAGFlow API调用失败，响应码: {}, 错误详情: {}", code, errorDetail);
+ throw new RenException(ErrorCode.RAG_API_ERROR, errorDetail);
+ }
+
+ } catch (Exception e) {
+ log.error("RAGFlow适配器解析文档失败: {}", e.getMessage(), e);
+ if (e instanceof RenException) {
+ throw (RenException) e;
+ }
+ throw new RenException(ErrorCode.RAG_API_ERROR, e.getMessage());
+ } finally {
+ log.info("=== RAGFlow适配器解析文档操作结束 ===");
+ }
+ }
+
+ @Override
+ public Map listChunks(String datasetId, String documentId, String keywords,
+ Integer page, Integer pageSize, String chunkId) {
+ try {
+ log.info("=== RAGFlow适配器开始列出切片 ===");
+
+ validateConfig(config);
+ String baseUrl = (String) config.get("base_url");
+ String apiKey = (String) config.get("api_key");
+
+ // 构建URL和查询参数
+ String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents/" + documentId + "/chunks";
+
+ // 构建查询参数
+ UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url);
+ if (StringUtils.isNotBlank(keywords)) {
+ builder.queryParam("keywords", keywords);
+ }
+ if (page != null) {
+ builder.queryParam("page", page);
+ }
+ if (pageSize != null) {
+ builder.queryParam("page_size", pageSize);
+ }
+ if (StringUtils.isNotBlank(chunkId)) {
+ builder.queryParam("id", chunkId);
+ }
+
+ String finalUrl = builder.toUriString();
+
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.set("Authorization", "Bearer " + apiKey);
+
+ HttpEntity requestEntity = new HttpEntity<>(headers);
+
+ // 发送GET请求
+ log.info("发送GET请求到RAGFlow API列出切片...");
+ ResponseEntity response = restTemplate.exchange(finalUrl, HttpMethod.GET, requestEntity,
+ String.class);
+
+ log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+ if (!response.getStatusCode().is2xxSuccessful()) {
+ log.error("RAGFlow API调用失败，状态码: {}", response.getStatusCode());
+ throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+ }
+
+ String responseBody = response.getBody();
+ Map responseMap = objectMapper.readValue(responseBody, Map.class);
+ Integer code = (Integer) responseMap.get("code");
+
+ if (code != null && code == 0) {
+ Map data = (Map 
+ 
+ 
+ 
-
- 
-
-
- 
-
-
- 
-
@@ -56,27 +51,43 @@ Spearheaded by Professor Siyuan Liu's Team (South China University of Technology
+ 
+ 
+ 
+ 
+ 
- 
+ 
+ 
+ 
+ 
+ 
| [Bailing Voice Dialogue Robot](https://github.com/wwbin2017/bailing) | Dieses Projekt wurde von [Bailing Voice Dialogue Robot](https://github.com/wwbin2017/bailing) inspiriert und auf dessen Basis implementiert |
+| 
| [Tenclass](https://www.tenclass.com/) | Dank an [Tenclass](https://www.tenclass.com/) für die Formulierung von Standardkommunikationsprotokollen, Multi-Geräte-Kompatibilitätslösungen und High-Concurrency-Szenario-Praxisdemonstrationen für das Xiaozhi-Ökosystem; für die Bereitstellung vollständiger technischer Dokumentationsunterstützung für dieses Projekt |
+| 
| [Xuanfeng Technology](https://github.com/Eric0308) | Dank an [Xuanfeng Technology](https://github.com/Eric0308) für den Beitrag des Funktionsaufruf-Frameworks, des MCP-Kommunikationsprotokolls und der plugin-basierten Aufrufmechanismus-Implementierungscode. Durch standardisiertes Befehlsplanungssystem und dynamische Erweiterungsfähigkeiten wird die Interaktionseffizienz und funktionale Erweiterbarkeit von Frontend-Geräten (IoT) erheblich verbessert |
+| 
| [huangjunsen](https://github.com/huangjunsen0406) | Dank an [huangjunsen](https://github.com/huangjunsen0406) für den Beitrag des `Smart Control Console Mobile`-Moduls, das eine effiziente Steuerung und Echtzeit-Interaktion über mobile Geräte ermöglicht und die Betriebsbequemlichkeit und Verwaltungseffizienz des Systems in mobilen Szenarien erheblich verbessert |
+| 
| [Huiyuan Design](http://ui.kwd988.net/) | Dank an [Huiyuan Design](http://ui.kwd988.net/) für die Bereitstellung professioneller visueller Lösungen für dieses Projekt, unter Verwendung ihrer Design-Praxiserfahrung im Dienst von über tausend Unternehmen, um die Produktbenutzererfahrung dieses Projekts zu stärken |
+| 
| [Xi'an Qinren Information Technology](https://www.029app.com/) | Dank an [Xi'an Qinren Information Technology](https://www.029app.com/) für die Vertiefung des visuellen Systems dieses Projekts und die Sicherstellung der Konsistenz und Erweiterbarkeit des Gesamtdesignstils in Multi-Szenario-Anwendungen |
+| 
| [Code-Mitwirkende](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors) | Dank an [alle Code-Mitwirkenden](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors), Ihre Bemühungen haben das Projekt robuster und leistungsfähiger gemacht. |
+
+
+
+
+ 
+
+ 