Merge branch 'master' of http://192.168.1.222:3000/jiayi/callcenter-api

hjzx-api/src/main/java/api/controller/call/IvrController.java

@@ -36,6 +36,7 @@ public class IvrController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getName()), Ivr::getName, input.getName());
         qw.like(!StringHelper.isEmpty(input.getVersion()), Ivr::getVersion, input.getVersion());
         qw.like(!StringHelper.isEmpty(input.getRemark()), Ivr::getRemark, input.getRemark());
+        qw.orderByDesc(Ivr::getIvrId);
         Page<Ivr> page = GetPage(pageInput);
         if (page != null) {
             IPage<Ivr> iPage = ivrService.getListPage(page, qw);

hjzx-api/src/main/resources/application-dev.yml

@@ -75,3 +75,4 @@ spring:
 
   isNote: 1
   pushUrl: 192.168.1.15:8320/Home/receiveCall
+  curlUrl: http://192.168.1.15:8320/

hjzx-api/src/main/resources/application-production.yml

@@ -41,3 +41,4 @@ spring:
 
   isNote: 1
   pushUrl: 192.168.1.15:8320/Home/receiveCall
+  curlUrl: http://192.168.1.15:8320/

hjzx-util/src/main/java/api/util/helper/TtsHelper.java

@@ -52,9 +52,10 @@ public class TtsHelper {
                 break;
         }
     }
-
+    public  static  final String curlUrl= SpringHelper.getRequiredProperty("spring.curlUrl");;
     public static String TextToSpeech(String word) {
-        return TextToSpeech(word, "");
+         String path=curlUrl+TextToSpeech(word, "");
+        return path;
     }
 
     public static String TextToSpeech(String word, String filename) {
@@ -71,7 +72,7 @@ public class TtsHelper {
 
         transfer(word,filePath);
 
-        return filePath;
+        return parentPath+ "/" + filename + ".wav";
     }
 
     public static String TextToSpeechAgent(String word, String filename) {