1

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiTTSController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.applet.controller;
 
 
+import com.tencentcloudapi.tts.v20190823.models.TextToVoiceResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -77,7 +78,7 @@ public class AppletApiTTSController {
 //            return ResponseEntity.internalServerError().build();
 //        }
 //    }
-    public Result textToVoice(
+    public Result<TextToVoiceResponse> textToVoice(
             @Parameter(description = "要转换的文本内容", required = true) String text,
             @Parameter(description = "语速，范围：[-2，6]，默认为0-2代表0.6倍\n" +
                     "-1代表0.8倍\n" +
@@ -89,7 +90,7 @@ public class AppletApiTTSController {
             @Parameter(description = "音量大小，范围[-10，10]，默认为0") Float volume,
             @Parameter(description = "返回音频格式，可取值：wav（默认），mp3，pcm") String codec) {
 
-        String audioData = appletApiTTService.textToVoice(text, speed, voiceType, volume, codec);
+        TextToVoiceResponse audioData = appletApiTTService.textToVoice(text, speed, voiceType, volume, codec);
         return Result.ok(audioData);
     }
 

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiTTService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.applet.service;
 
+import com.tencentcloudapi.tts.v20190823.models.TextToVoiceResponse;
 import org.jeecg.modules.demo.appletTtsTimbre.entity.AppletTtsTimbre;
 
 import java.util.List;
@@ -14,7 +15,7 @@ public interface AppletApiTTService {
      * @param codec 返回音频格式，可取值：wav（默认），mp3，pcm
      * @return 音频二进制数据
      */
-    String textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec);
+    TextToVoiceResponse textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec);
     
     /**
      * 文字转语音（带用户ID记录日志）
@@ -26,7 +27,7 @@ public interface AppletApiTTService {
      * @param userId 用户ID，用于记录日志
      * @return 音频二进制数据
      */
-    String textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec, String userId);
+    TextToVoiceResponse textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec, String userId);
 
     List<AppletTtsTimbre> list();
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiTTServiceImpl.java

@@ -34,7 +34,7 @@ public class AppletApiTTServiceImpl implements AppletApiTTService {
     private IAppletTtsPlayLogService appletTtsPlayLogService;
 
     @Override
-    public String textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec) {
+    public TextToVoiceResponse textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec) {
         return textToVoice(text, speed, voiceType, volume, codec, null);
     }
     
@@ -127,7 +127,7 @@ public class AppletApiTTServiceImpl implements AppletApiTTService {
 //        }
 //    }
 
-    public String textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec, String userId) {
+    public TextToVoiceResponse textToVoice(String text, Float speed, Integer voiceType, Float volume, String codec, String userId) {
         long startTime = System.currentTimeMillis();
 
         try {
@@ -172,6 +172,7 @@ public class AppletApiTTServiceImpl implements AppletApiTTService {
             req.setModelType(1L); // 默认模型
             req.setPrimaryLanguage(2L); // 中文
             req.setSampleRate(16000L); // 16k采样率
+            req.setEnableSubtitle(true);
 
             // 返回的resp是一个TextToVoiceResponse的实例，与请求对象对应
             TextToVoiceResponse resp = client.TextToVoice(req);
@@ -189,7 +190,7 @@ public class AppletApiTTServiceImpl implements AppletApiTTService {
                         speed != null ? speed.doubleValue() : null, elapsedTime, true);
 
                 log.info("TTS调用成功，文本长度: {}, 耗时: {}秒", text != null ? text.length() : 0, elapsedTime);
-                return audioBase64;
+                return resp;
             } else {
                 // 记录失败的TTS调用日志
                 savePlayLog(userId, text, voiceType, volume != null ? volume.doubleValue() : null,

jeecg-boot/jeecg-boot-module/module-pay/src/main/java/org/jeecg/modules/pay/config/WxPay.java

@@ -67,13 +67,4 @@ public class WxPay {
      */
     public String notifyOrderUrlDev;
 
-
-
-
-
-
-
-
-
-
 }