Forráskód Böngészése

因语音目录调整 和 解析确认为离线解析,但是服务器上存在文件 最终的下载语音文件逻辑调整

王苗苗 3 hónapja
szülő
commit
bd059ffa5a

+ 9 - 4
slibra-admin/src/main/java/com/slibra/web/controller/business/TCallRecordController.java

@@ -55,11 +55,14 @@ public class TCallRecordController extends BaseController
     @Autowired
     private ITCallRecordService tCallRecordService;
 
-    @Value("${DOMAIN}")
+    /*@Value("${DOMAIN}")
     private String domain;
 
     @Value("${URL_DISK_PREFIX}")
-    private String urlDiskPrefix;
+    private String urlDiskPrefix;*/
+
+    @Value("${FILE_URL_PREFIX}")
+    private String fileUrlPrefix;
 
     /**
      * 查询通话记录列表
@@ -189,7 +192,8 @@ public class TCallRecordController extends BaseController
         if(StringUtils.isBlank(url))
             throw new ServiceException("未查询到录音");
         //查询服务器上的文件
-        url = url.replace(domain, urlDiskPrefix);
+//        url = url.replace(domain, urlDiskPrefix);
+        url = fileUrlPrefix + url;
         // 构造文件的完整路径
         File file = new File(url);
 
@@ -229,7 +233,8 @@ public class TCallRecordController extends BaseController
         for (TCallRecord callRecord : tCallRecords) {
             String url = callRecord.getUrl();
             if(StringUtils.isNotBlank(url))
-                fileNames.add(url.replace(domain, urlDiskPrefix));
+//                fileNames.add(url.replace(domain, urlDiskPrefix));
+                fileNames.add(fileUrlPrefix + url);
         }
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {

+ 2 - 2
slibra-admin/src/main/resources/application.yml

@@ -246,8 +246,8 @@ ALIYUN_AK_ID: LTAI5tQ2HmiHCygZkt5BYrYR
 ALIYUN_AK_SECRET: KhmxTd14SUcXafpFk5yofA43FoeM99
 NLS_APP_KEY: OKt6jogp6fRjHQVp
 WS_URL: wss://nls-gateway-cn-shanghai.aliyuncs.com/ws/v1
-DOMAIN: https://pbx.fuxicarbon.com/voice/
-URL_DISK_PREFIX: /root/aibot/dm/voice/
+#DOMAIN: https://pbx.fuxicarbon.com/voice/
+#URL_DISK_PREFIX: /root/aibot/dm/voice/
 SIP_SUFFIX: '@pbx.fuxicarbon.com:5060'
 FILE_URL_PREFIX: /home/hongshan
 

+ 3 - 3
slibra-system/src/main/java/com/slibra/business/service/impl/TCallRecordServiceImpl.java

@@ -59,11 +59,11 @@ public class TCallRecordServiceImpl implements ITCallRecordService
     @Value("${WS_URL}")
     private String wsUrl;
 
-    @Value("${DOMAIN}")
+    /*@Value("${DOMAIN}")
     private String domain;
 
     @Value("${URL_DISK_PREFIX}")
-    private String urlDiskPrefix;
+    private String urlDiskPrefix;*/
 
     @Value("${FILE_URL_PREFIX}")
     private String fileUrlPrefix;
@@ -264,7 +264,7 @@ public class TCallRecordServiceImpl implements ITCallRecordService
         String url = checkParamsAndGetUrl(tCallRecord);
 
         SpeechTranscriberDemo demo = new SpeechTranscriberDemo(appKey, accessKeyId, accessKeySecret, wsUrl);
-        demo.process(url.replace(domain, urlDiskPrefix));//假设是带http的,替换URL  示例:将https://pbx.fuxicarbon.com/voice/005cad2d-3626-477c-8b95-07b68f339630.wav 变化成 /root/aibot/dm/voice/005cad2d-3626-477c-8b95-07b68f339630.wav
+//        demo.process(url.replace(domain, urlDiskPrefix));//假设是带http的,替换URL  示例:将https://pbx.fuxicarbon.com/voice/005cad2d-3626-477c-8b95-07b68f339630.wav 变化成 /root/aibot/dm/voice/005cad2d-3626-477c-8b95-07b68f339630.wav
         demo.shutdown();
         //同时更新到数据库中去
         tCallRecord.setHasParsed(LONG_1);