Merge remote-tracking branch 'origin-private/main'

Author: dc444

CHANGELOG.md

@@ -1,4 +1,42 @@
 # 变更日志
+## [2.7.60] - 2025-06-11
+
+### 新功能
+- Merge pull request #96 from vritser/main
+- feat(tts): support minimax t2a
+
+### 修复
+- fix:修复阿里语音合成多余参数，删除
+- fix(tts): tts service factory
+
+### 其他变更
+- chore: update version to 2.7.60 [skip ci]
+- docs: update changelog for v2.7.59 [skip ci]
+- chore: update version to 2.7.59 [skip ci]
+- refactor(tts): add default implements
+- docs: update changelog for v2.7.58 [skip ci]
+- chore: update version to 2.7.58 [skip ci]
+
+## [2.7.59] - 2025-06-11
+
+### 新功能
+- Merge pull request #96 from vritser/main
+- feat(tts): support minimax t2a
+
+### 修复
+- fix(tts): tts service factory
+
+### 其他变更
+- chore: update version to 2.7.59 [skip ci]
+- refactor(tts): add default implements
+- docs: update changelog for v2.7.58 [skip ci]
+- chore: update version to 2.7.58 [skip ci]
+
+## [2.7.58] - 2025-06-09
+
+### 其他变更
+- chore: update version to 2.7.58 [skip ci]
+
 ## [2.7.57] - 2025-06-09
 
 

README.md

@@ -225,6 +225,16 @@ Xiaozhi ESP32 Server Java 是基于 [Xiaozhi ESP32](https://github.com/78/xiaozh
 
 ---
 
+## 免责声明 ⚠️
+
+本项目仅提供音乐和绘本播放的技术实现代码，不提供任何媒体内容。用户在使用相关功能时应确保拥有合法的使用权或版权许可，并遵守所在地区的版权法律法规。
+
+项目中可能涉及的示例内容或资源均来自网络或由用户投稿提供，仅用于功能演示和技术测试。如有任何内容侵犯了您的权益，请立即联系我们，我们将在核实后立即采取删除等处理措施。
+
+本项目开发者不对用户使用本项目代码获取或播放的任何内容承担法律责任。使用本项目即表示您同意自行承担使用过程中的全部法律风险和责任。
+
+---
+
 ## Star History 📈
 
 <a href="https://www.star-history.com/#joey-zhou/xiaozhi-esp32-server-java&Date">

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.xiaozhi.server</groupId>
     <artifactId>xiaozhi.server</artifactId>
-    <version>2.7.57</version>
+    <version>2.7.60</version>
     <name>xiaozhi-server</name>
     <description></description>
 

src/main/java/com/xiaozhi/communication/common/MessageHandler.java

@@ -211,7 +211,7 @@ public void handleUnboundDevice(String sessionId, SysDevice device) {
                 if (device.getDeviceName() != null && device.getModelId() == null) {
                     String message = "设备未配置对话模型，请到配置页面完成配置后开始对话";
 
-                    String audioFilePath = ttsService.getTtsService().textToSpeech(message);
+                    String audioFilePath = ttsService.getDefaultTtsService().textToSpeech(message);
                     audioService.sendAudioMessage(chatSession, new DialogueService.Sentence(message, audioFilePath), true,
                             true);
 
@@ -231,7 +231,7 @@ public void handleUnboundDevice(String sessionId, SysDevice device) {
                 String audioFilePath;
                 if (!StringUtils.hasText(codeResult.getAudioPath())) {
                     String codeMessage = "请到设备管理页面添加设备，输入验证码" + codeResult.getCode();
-                    audioFilePath = ttsService.getTtsService().textToSpeech(codeMessage);
+                    audioFilePath = ttsService.getDefaultTtsService().textToSpeech(codeMessage);
                     codeResult.setDeviceId(deviceId);
                     codeResult.setSessionId(sessionId);
                     codeResult.setAudioPath(audioFilePath);

src/main/java/com/xiaozhi/dialogue/llm/tool/function/PlayHuiBenFunction.java

@@ -0,0 +1,66 @@
+package com.xiaozhi.dialogue.llm.tool.function;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.xiaozhi.communication.common.ChatSession;
+import com.xiaozhi.dialogue.llm.ChatService;
+import com.xiaozhi.dialogue.llm.tool.ToolCallStringResultConverter;
+import com.xiaozhi.dialogue.llm.tool.ToolsGlobalRegistry;
+import com.xiaozhi.dialogue.service.HuiBenService;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.model.ToolContext;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
+import org.springframework.ai.tool.metadata.ToolMetadata;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class PlayHuiBenFunction implements ToolsGlobalRegistry.GlobalFunction {
+    private static final Logger logger = LoggerFactory.getLogger(PlayHuiBenFunction.class);
+
+    @Resource
+    private HuiBenService huiBenService;
+
+    ToolCallback toolCallback = FunctionToolCallback
+            .builder("func_playHuiBen", (Map<String, String> params, ToolContext toolContext) -> {
+                ChatSession chatSession = (ChatSession) toolContext.getContext().get(ChatService.TOOL_CONTEXT_SESSION_KEY);
+                Integer num = MapUtil.getInt(params, "num");
+                try {
+                    if (num == null || num < 5 || num > 1100) {
+                        num = RandomUtil.randomInt(5, 1100);
+                    }
+                    huiBenService.playHuiBen(chatSession, num);
+                    return "尝试播放绘本《" + num + "》";
+
+                } catch (Exception e) {
+                    logger.error("播放绘本异常，绘本编号: {}", num, e);
+                    return "绘本播放失败";
+                }
+            })
+            .toolMetadata(ToolMetadata.builder().returnDirect(true).build())
+            .description("绘本播放助手，需要用户提供绘本数字编号")
+            .inputSchema("""
+                        {
+                            "type": "object",
+                            "properties": {
+                                "num": {
+                                    "type": "integer",
+                                    "description": "要播放的绘本数字编号"
+                                }
+                            },
+                            "required": ["num"]
+                        }
+                    """)
+            .inputType(Map.class)
+            .toolCallResultConverter(ToolCallStringResultConverter.INSTANCE)
+            .build();
+
+    @Override
+    public ToolCallback getFunctionCallTool(ChatSession chatSession) {
+        return toolCallback;
+    }
+}