From 26d8683e76ebda8c6e55c46174cccda2fc45873a Mon Sep 17 00:00:00 2001 From: tiger_zhou <123456> Date: Thu, 10 Nov 2022 13:24:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=898=E5=8F=B7=E7=BA=BF=E5=90=88?= =?UTF-8?q?=E5=B9=B6test=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voice/huawei/HuaweiVoiceServiceImpl.java | 8 ++++++-- .../cbtc/ATS/operation/Operation.java | 2 -- .../command/service/VoiceCommandService.java | 2 +- .../work/MetroSimulationWorkServiceImpl.java | 2 +- src/main/resources/application.yml | 17 +++++++++-------- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java b/src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java index d59414b65..2fb3ea259 100644 --- a/src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java @@ -1,3 +1,4 @@ +/* package club.joylink.rtss.services.voice.huawei; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; @@ -32,9 +33,11 @@ public class HuaweiVoiceServiceImpl implements IVoiceService { return this.synthesis(message, "0"); } - /** + */ +/** * 华为语音识别配置 - */ + *//* + private final String ak = "YDUXTXRYGAHGPHAIXZCU"; private final String sk = "Kcbm3sTDCYEou8kGeAhKxfBkgWybIn6IjJyGBX3p"; private final String region = "cn-north-4"; @@ -72,3 +75,4 @@ public class HuaweiVoiceServiceImpl implements IVoiceService { return voiceRecognition(bytes, filePath); } } +*/ diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java index b5324e767..9a1700df0 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java @@ -1432,9 +1432,7 @@ public class Operation { * 发送会话消息（语音输入）Base64格式 */ Conversation_Chat_Audio_Base64(new Label[]{Label.CLIENT}), - ; - REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD(new Label[]{Label.CLIENT}), /** * 紧急应急语音命令 */ diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/command/service/VoiceCommandService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/command/service/VoiceCommandService.java index e85de446f..36b9b8108 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/command/service/VoiceCommandService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/command/service/VoiceCommandService.java @@ -8,7 +8,7 @@ import club.joylink.rtss.simulation.cbtc.conversation.SimulationVoiceHandler; import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository; import club.joylink.rtss.simulation.cbtc.data.map.MapElement; import club.joylink.rtss.simulation.cbtc.data.map.Switch; -import club.joylink.rtss.vo.client.VoiceRecognitionResult; +import club.joylink.rtss.vo.client.voice.VoiceRecognitionResult; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java b/src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java index 5b5e2cfac..3c6e8dc32 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java @@ -180,7 +180,7 @@ public class MetroSimulationWorkServiceImpl implements SimulationWorkService { powerSupplyService.addJobs(simulation); iVirtualRealityPslService.addJobs(simulation); iscsMessageCollectAndDispatcher.addJob(simulation); - iscsLogicLoop.addJob(simulation); + iscsLogicLoop.addJobs(simulation); pisLogicLoop.addJobs(simulation); atpLogicLoop.addJobs(simulation); atsLogicLoop.addJobs(simulation); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 75c0753d0..3841761e9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,7 +50,7 @@ spring: connection-timeout: 30000 # 等待连接的超时时间，单位ms mybatis: mapper-locations: classpath:mybatis/mapper/**/*.xml - type-aliases-package: club.joylink.rtss.entity +# type-aliases-package: club.joylink.rtss.entity configuration: map-underscore-to-camel-case: true pagehelper: @@ -88,11 +88,11 @@ tencent-cloud: # 环境连接配置 start --- spring: - profiles: dev - datasource: - url: jdbc:mysql://localhost:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: root - password: root + profiles: dev + datasource: + url: jdbc:mysql://192.168.3.233:3306/joylink?useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: joylink0503 tencent-cloud: allow-send: false @@ -209,7 +209,7 @@ minio: replaceHttps: false common: - env: test + env: prd --- spring: @@ -227,7 +227,8 @@ logging: path: /usr/local/joylink/logs/rtss level: club.joylink.rtss: INFO - +tencent-cloud: + allow-send: false minio: endpoint: https://joylink.club accessKey: jladmin