diff --git a/pom.xml b/pom.xml index c8c0f8c..bb12a34 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ org.springframework.boot spring-boot-maven-plugin - com.bw.asr.Application + com.bw.translate.Application ZIP diff --git a/src/main/java/com/bw/translate/entity/Constants.java b/src/main/java/com/bw/translate/entity/Constants.java index 4c5bffc..8c76dd5 100644 --- a/src/main/java/com/bw/translate/entity/Constants.java +++ b/src/main/java/com/bw/translate/entity/Constants.java @@ -157,7 +157,7 @@ public class Constants { public static final String APIKEY = "apiKey"; public static final String SECRETKEY = "secretKey"; public static final String TOKENURL = "tokenUrl"; - public static final String CREATEURL = "createUrl"; + public static final String TEXTURL = "textUrl"; public static final String SPEECH_URL = "speech_url"; public static final String FORMAT = "format"; public static final String RATE = "rate"; @@ -181,4 +181,5 @@ public class Constants { public static final String DST = "dst"; public static final String TRANS_FIAL = "翻译失败"; public static final String ERROR_CODE = "error_code"; + public static final String SRCCONTENT = "srcContent"; } diff --git a/src/main/java/com/bw/translate/handler/MainHandler.java b/src/main/java/com/bw/translate/handler/MainHandler.java index 14dac7e..9c63ecf 100644 --- a/src/main/java/com/bw/translate/handler/MainHandler.java +++ b/src/main/java/com/bw/translate/handler/MainHandler.java @@ -39,10 +39,10 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class MainHandler implements ApplicationRunner { - @Value("${task.create-task-queue-path}") - private String createTaskPath; - @Value("${task.query-task-queue-path}") - private String queryTaskPath; + @Value("${task.text-task-queue-path}") + private String textTaskPath; + @Value("${task.document-task-queue-path}") + private String documentTaskPath; @Value("${zookeeper.connection-string}") private String connectionString; @Value("${zookeeper.publish-node}") @@ -121,8 +121,8 @@ public class MainHandler implements ApplicationRunner { //停止处理 waitDown(); //启动加载缓存任务 - readTask(createTaskPath, ConfigCache.textTaskQueue); - readTask(queryTaskPath, ConfigCache.documentTaskQueue); + readTask(textTaskPath, ConfigCache.textTaskQueue); + readTask(documentTaskPath, ConfigCache.documentTaskQueue); } /** @@ -196,7 +196,7 @@ public class MainHandler implements ApplicationRunner { if (ConfigCache.textTaskQueue.size() > 0) { try { Map task = ConfigCache.textTaskQueue.take(); - FileUtil.writeFile(queryTaskPath, JSONObject.toJSONString(task)); + FileUtil.writeFile(textTaskPath, JSONObject.toJSONString(task)); } catch (InterruptedException e) { e.printStackTrace(); } @@ -209,7 +209,7 @@ public class MainHandler implements ApplicationRunner { if (ConfigCache.documentTaskQueue.size() > 0) { try { Map task = ConfigCache.documentTaskQueue.take(); - FileUtil.writeFile(createTaskPath, JSONObject.toJSONString(task)); + FileUtil.writeFile(documentTaskPath, JSONObject.toJSONString(task)); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/src/main/java/com/bw/translate/service/impl/ExecTranslateServiceImpl.java b/src/main/java/com/bw/translate/service/impl/ExecTranslateServiceImpl.java index 3def34b..627ba41 100644 --- a/src/main/java/com/bw/translate/service/impl/ExecTranslateServiceImpl.java +++ b/src/main/java/com/bw/translate/service/impl/ExecTranslateServiceImpl.java @@ -47,8 +47,8 @@ public class ExecTranslateServiceImpl implements ExecTranslateService { } String token = getToken(input); - String createUrl = (String) input.get(Constants.CREATEURL); - String url = createUrl + token; + String textUrl = (String) input.get(Constants.TEXTURL); + String url = textUrl + token; Map param = new HashMap(16); //原语种 String from = (String) input.get(Constants.FROM); @@ -62,10 +62,12 @@ public class ExecTranslateServiceImpl implements ExecTranslateService { List sentences = joinSentences(parts, 5800); String translateContent = Constants.EMPTY; for (String sentence : sentences) { + param.put(Constants.Q, sentence); String resStr = DownLoadUtil.doPost(url,JSONObject.toJSONString(param)); JSONObject res = JSONObject.parseObject(resStr); if(res.containsKey(Constants.RESULT)) { - List> transResult = (List>) res.get(Constants.TRANS_RESULT); + Map result = (Map) res.get(Constants.RESULT); + List> transResult = (List>) result.get(Constants.TRANS_RESULT); for (Map tran : transResult) { String dst = (String) tran.get(Constants.DST); translateContent += dst; @@ -87,6 +89,7 @@ public class ExecTranslateServiceImpl implements ExecTranslateService { Map results = new HashMap(16); //遍历入库返回结果,拼接响应内容 results.put(Constants.ISLAST, 1); + results.put(Constants.SRCCONTENT, q); results.put(Constants.CONTENT, Constants.TRANS_FIAL); results.put(Constants.ID, UUID.randomUUID().toString()); result.put(Constants.RESULTS, JSONObject.toJSONString(results)); @@ -101,6 +104,7 @@ public class ExecTranslateServiceImpl implements ExecTranslateService { Map results = new HashMap(16); //遍历入库返回结果,拼接响应内容 results.put(Constants.ISLAST, 1); + results.put(Constants.SRCCONTENT, q); results.put(Constants.CONTENT, translateContent); results.put(Constants.ID, UUID.randomUUID().toString()); result.put(Constants.RESULTS, JSONObject.toJSONString(results)); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6e250c0..16faffe 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ logging: root: info path: ./logs server: - port: 8017 + port: 8018 servlet: context-path: /translate tomcat: @@ -71,7 +71,7 @@ spring: client: url: http://192.168.0.44:8001 instance: - service-base-url: http://192.168.0.44:8017 + service-base-url: http://192.168.0.44:8018 management: endpoints: @@ -89,7 +89,7 @@ zookeeper: publish-node: /analyze customize-kafka: producer: - topic: analyze + topic: produce_analyze task: text-task-queue-path: ../data/textTaskQueue.txt document-task-queue-path: ../data/documentTaskQueue.txt