Pārlūkot izejas kodu

优化发现服务

xiaochan 7 mēneši atpakaļ
vecāks
revīzija
a6ca346682

+ 1 - 3
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/Tts.java

@@ -1,12 +1,10 @@
 package org.thyy.thirdpartapi.tts;
 
-import jakarta.servlet.http.HttpServletResponse;
 import org.thyy.utils.result.ResultVo;
 
 
 public interface Tts {
 
-    ResultVo<String> textToSpeech(TtsRequest request, HttpServletResponse response);
-
+    ResultVo<String> textToSpeech(TtsRequest request);
 
 }

+ 12 - 3
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/TtsController.java

@@ -1,11 +1,13 @@
 package org.thyy.thirdpartapi.tts;
 
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.thyy.utils.exception.ExceptionEnum;
+import org.thyy.utils.result.R;
 import org.thyy.utils.result.ResultVo;
 
 
@@ -15,15 +17,22 @@ import org.thyy.utils.result.ResultVo;
 public class TtsController {
 
     private final Tts ttsService;
+    private DefaultTgetObject defaultTgetObject;
 
     public TtsController(Tts ttsService) {
         this.ttsService = ttsService;
     }
 
+    static class DefaultTgetObject implements Tts {
+        @Override
+        public ResultVo<String> textToSpeech(TtsRequest request) {
+            return R.fail(ExceptionEnum.NOT_SERVICE);
+        }
+    }
 
     @PostMapping("/textToSpeech")
-    public ResultVo<String> textToSpeech(@RequestBody TtsRequest request, HttpServletResponse response) {
-        return ttsService.textToSpeech(request, response);
+    public ResultVo<String> textToSpeech(@RequestBody TtsRequest request) {
+        return ttsService.textToSpeech(request);
     }
 
 }

+ 1 - 2
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/ttsService/TtsTest.java

@@ -1,6 +1,5 @@
 package org.thyy.thirdpartapi.tts.ttsService;
 
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
@@ -16,7 +15,7 @@ import org.thyy.utils.result.ResultVo;
 public class TtsTest implements Tts {
 
     @Override
-    public ResultVo<String> textToSpeech(TtsRequest request, HttpServletResponse response) {
+    public ResultVo<String> textToSpeech(TtsRequest request) {
         return R.fail(ExceptionEnum.NOT_SERVICE);
     }
 }

+ 1 - 7
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/ttsService/XfTtsApi.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.xfyun.api.TtsClient;
 import cn.xfyun.model.response.TtsResponse;
 import cn.xfyun.service.tts.AbstractTtsWebSocketListener;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Response;
 import okhttp3.WebSocket;
@@ -50,12 +49,7 @@ public class XfTtsApi implements Tts {
     }
 
 
-    public ResultVo<String> textToSpeech(TtsRequest request, HttpServletResponse response) {
-
-        if (ttsClient == null) {
-            return R.fail(ExceptionEnum.LOGICAL_ERROR, "未发现服务");
-        }
-
+    public ResultVo<String> textToSpeech(TtsRequest request) {
         String filePath = cfg.getDirectory() + File.separator + request.getId() + ".mp3";
         FileUtil.del(filePath);