From 476dc3f30c014e0d2ebdc46ce0283ddbfe63eeb8 Mon Sep 17 00:00:00 2001
From: VirtuosoQ <2416050435@qq.com>
Date: 星期日, 28 四月 2024 16:37:54 +0800
Subject: [PATCH] 16:37 java_http_client
---
/dev/null | 13 ------
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService.java | 2
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl.java | 19 ++++++---
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/FunasrJavaClientApplication.java | 7 +++
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/RecognitionController.java | 2
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService2.java | 2
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl2.java | 19 ++++++---
runtime/java_http_client/http/src/main/resources/application.yml | 21 ++++++++++
runtime/java_http_client/http/src/Readme.md | 12 +++++-
runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/WebSocketClient.java | 2
10 files changed, 68 insertions(+), 31 deletions(-)
diff --git a/runtime/java_http_client/http/src/Readme.md b/runtime/java_http_client/http/src/Readme.md
index ea18551..ef03d1d 100644
--- a/runtime/java_http_client/http/src/Readme.md
+++ b/runtime/java_http_client/http/src/Readme.md
@@ -2,5 +2,13 @@
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.json:json:20240303")
implementation("org.springframework.boot:spring-boot-starter-websocket")
- testImplementation("org.springframework.boot:spring-boot-starter-test")
-}
\ No newline at end of file
+}
+
+
+浣跨敤鎺ュ彛娴嬭瘯宸ュ叿 form-data鏍煎紡浼犲叆鏂囦欢 杩斿洖娴嬭瘯鎴愬姛鍗宠繍琛屾垚鍔�
+
+榛樿璁块棶璺緞:
+ io璺緞: http://localhost:8081/recognition/testIO
+ nio璺緞: http://localhost:8081/recognition/testNIO
+
+application.yml涓彲鏍规嵁鑷韩闇�瑕佷慨鏀瑰搴旀ā鍨嬪弬鏁�
\ No newline at end of file
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/FunasrJavaClientApplication.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/FunasrJavaClientApplication.java
index e60563d..5d41892 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/FunasrJavaClientApplication.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/FunasrJavaClientApplication.java
@@ -3,6 +3,13 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+/**
+ *
+ * @author Virgil Qiu
+ * @since 2024/04/24
+ *
+ */
+
@SpringBootApplication
public class FunasrJavaClientApplication {
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/RecognitionController.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/RecognitionController.java
index 81e4927..df60bea 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/RecognitionController.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/RecognitionController.java
@@ -9,7 +9,7 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionController.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionController.java
deleted file mode 100644
index 81e4927..0000000
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.example.funasr_java_client.Servcvice;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-/**
- *
- * @author Virtuoso Qiu
- * @since 2024/04/24
- *
- */
-@RestController
-@RequestMapping("/recognition")
-public class RecognitionController {
-
- private final RecognitionService recognitionService;
-
- public RecognitionController(RecognitionService recognitionService) {
- this.recognitionService = recognitionService;
- }
- @PostMapping("/testNIO")
- public String testIO(@RequestParam MultipartFile file) throws IOException, ExecutionException, InterruptedException {
- recognitionService.recognition(file);
- return "娴嬭瘯鎴愬姛";
- }
-
- @PostMapping("/testIO")
- public String testNIO(@RequestParam MultipartFile file) throws IOException, ExecutionException, InterruptedException {
- recognitionService.recognition(file);
- return "娴嬭瘯鎴愬姛";
- }
-}
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService.java
index 16558fc..44d9142 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService.java
@@ -8,7 +8,7 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService2.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService2.java
index 58805b5..f08245c 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService2.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/RecognitionService2.java
@@ -7,7 +7,7 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl.java
index 1aa6c48..af589a6 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl.java
@@ -20,13 +20,20 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
@Service
public class RecognitionServiceImpl implements RecognitionService {
-
+ @Value("${parameters.fileUrl}")
+ private String fileUrl;
+ @Value("${parameters.model}")
+ private String model;
+ @Value("${parameters.hotWords}")
+ private String hotWords;
+ @Value("${parameters.serverIpPort}")
+ private String serverIpPort;
@Override
public Object recognition(MultipartFile file) throws IOException, ExecutionException, InterruptedException {
if (file.isEmpty()) {
@@ -38,7 +45,7 @@
String[] parts = originalFilename.split("\\.");
String prefix = (parts.length > 0) ? parts[0] : originalFilename;
System.out.println(prefix);
- String localFilePath = "E:/EI/Audio" + prefix + ".pcm";
+ String localFilePath = fileUrl + prefix + ".pcm";
File localFile = new File(localFilePath);
@@ -50,17 +57,17 @@
file.transferTo(localFile);
WebSocketClient client = new WebSocketClient();
- URI uri = URI.create("ws://182.40.192.72:10095");
+ URI uri = URI.create(serverIpPort);
StandardWebSocketClient standardWebSocketClient = new StandardWebSocketClient();
WebSocketSession webSocketSession = standardWebSocketClient.execute(client, null, uri).get();
JSONObject configJson = new JSONObject();
- configJson.put("mode", "offline");
+ configJson.put("mode", model);
configJson.put("wav_name", prefix);
configJson.put("wav_format", "pcm"); // 鏂囦欢鏍煎紡涓簆cm
configJson.put("is_speaking", true);
- configJson.put("hotwords", "{\"鑷畾涔塡":20,\"鐑瘝\":20,\"璁剧疆\":30}");
+ configJson.put("hotwords", hotWords");
configJson.put("itn", true);
// 鍙戦�侀厤缃弬鏁颁笌meta淇℃伅
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl2.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl2.java
index 4748a4e..4cbdafa 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl2.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/Servcvice/impl/RecognitionServiceImpl2.java
@@ -23,14 +23,21 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
@Service
public class RecognitionServiceImpl2 implements RecognitionService2 {
-
+ @Value("${parameters.fileUrl}")
+ private String fileUrl;
+ @Value("${parameters.model}")
+ private String model;
+ @Value("${parameters.hotWords}")
+ private String hotWords;
+ @Value("${parameters.serverIpPort}")
+ private String serverIpPort;
@Override
public Object recognition(MultipartFile file) throws IOException, ExecutionException, InterruptedException {
if (file.isEmpty()) {
@@ -42,7 +49,7 @@
String[] parts = originalFilename.split("\\.");
String prefix = (parts.length > 0) ? parts[0] : originalFilename;
System.out.println(prefix);
- String localFilePath = "E:/EI/Audio" + prefix + ".pcm";
+ String localFilePath = fileUrl + prefix + ".pcm";
File localFile = new File(localFilePath);
@@ -54,17 +61,17 @@
file.transferTo(localFile);
WebSocketClient client = new WebSocketClient();
- URI uri = URI.create("ws://182.40.192.72:10095");
+ URI uri = URI.create(serverIpPort);
StandardWebSocketClient standardWebSocketClient = new StandardWebSocketClient();
WebSocketSession webSocketSession = standardWebSocketClient.execute(client, null, uri).get();
JSONObject configJson = new JSONObject();
- configJson.put("mode", "offline");
+ configJson.put("mode", model);
configJson.put("wav_name", prefix);
configJson.put("wav_format", "pcm"); // 鏂囦欢鏍煎紡涓簆cm
configJson.put("is_speaking", true);
- configJson.put("hotwords", "{\"鑷畾涔塡":20,\"鐑瘝\":20,\"璁剧疆\":30}");
+ configJson.put("hotwords", hotWords);
configJson.put("itn", true);
// 鍙戦�侀厤缃弬鏁颁笌meta淇℃伅
diff --git a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/WebSocketClient.java b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/WebSocketClient.java
index 331b510..1857374 100644
--- a/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/WebSocketClient.java
+++ b/runtime/java_http_client/http/src/main/java/com/example/funasr_java_client/WebSocketClient.java
@@ -6,7 +6,7 @@
/**
*
- * @author Virtuoso Qiu
+ * @author Virgil Qiu
* @since 2024/04/24
*
*/
diff --git a/runtime/java_http_client/http/src/main/resources/application.yml b/runtime/java_http_client/http/src/main/resources/application.yml
new file mode 100644
index 0000000..5f179bf
--- /dev/null
+++ b/runtime/java_http_client/http/src/main/resources/application.yml
@@ -0,0 +1,21 @@
+#/**
+# *
+# * @author Virgil Qiu
+# * @since 2024/04/24
+# *
+# */
+
+spring:
+ application:
+ name: java_http_client
+server:
+ port: 8081
+
+
+parameters:
+ model: "offline" #绂荤嚎妯″瀷涓轰緥
+ hotWords: "{\"鑷畾涔塡":20,\"鐑瘝\":20,\"璁剧疆\":30}"
+ fileUrl: "E:/EI/Audio"
+ serverIpPort: "ws://your_funasr_ip:port"
+
+
diff --git a/runtime/java_http_client/http/src/test/java/com/example/funasr_java_client/FunasrJavaClientApplicationTests.java b/runtime/java_http_client/http/src/test/java/com/example/funasr_java_client/FunasrJavaClientApplicationTests.java
deleted file mode 100644
index 761713c..0000000
--- a/runtime/java_http_client/http/src/test/java/com/example/funasr_java_client/FunasrJavaClientApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.funasr_java_client;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class FunasrJavaClientApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
--
Gitblit v1.9.1