修改

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

@@ -34,17 +34,17 @@ common:
     register:
     #源号码
     origination:
-  tts:
-    #modelscope/ekho
-    type: modelscope
-    url: http://192.168.1.81:8000/call
+#  tts:
+#    #modelscope/ekho
+#    type: modelscope
+#    url: http://192.168.1.81:8000/call
 
-  ai:
-    llm: http://192.168.1.89:7861/chat/chat
-    zsk: http://192.168.1.89:7861/chat/kb_chat
-    sjk: http://192.168.1.89:7861/chat/db_chat
-    es: http://192.168.1.15:8800/km/doc/getLastInfo
-
-  funasr: ws://192.168.1.89:10095
-  #funasr/mrcp
-  asr: funasr
+#  ai:
+#    llm: http://192.168.1.89:7861/chat/chat
+#    zsk: http://192.168.1.89:7861/chat/kb_chat
+#    sjk: http://192.168.1.89:7861/chat/db_chat
+#    es: http://192.168.1.15:8800/km/doc/getLastInfo
+#
+#  funasr: ws://192.168.1.89:10095
+#  #funasr/mrcp
+#  asr: funasr

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

@@ -33,18 +33,4 @@ common:
     #注册网关
     register:
     #源号码
-    origination:
-  tts:
-    #modelscope/ekho
-    type: modelscope
-    url: http://192.168.1.81:8000/call
-
-  ai:
-    llm: http://192.168.1.89:7861/chat/chat
-    zsk: http://192.168.1.89:7861/chat/kb_chat
-    sjk: http://192.168.1.89:7861/chat/db_chat
-    es: http://192.168.1.15:8800/km/doc/getLastInfo
-
-  funasr: ws://192.168.1.89:10095
-  #funasr/mrcp
-  asr: funasr
+    origination:

midware-service/src/main/java/midware/service/init/EslClientService.java

@@ -6,12 +6,12 @@ import midware.service.eslclient.*;
 import midware.service.eslclient.entity.Agent;
 import midware.service.eslclient.entity.Channel;
 import midware.service.eslclient.entity.Session;
-import midware.util.config.CommonConfig;
 import midware.util.config.EslClientConfig;
 import midware.util.enums.EslAgentEnum;
 import midware.util.enums.EslCommandEnum;
 import midware.util.enums.EslEventEnum;
 import midware.util.helper.SecretHelper;
+import midware.util.helper.SpringHelper;
 import midware.util.helper.StringHelper;
 import midware.util.helper.TtsHelper;
 import org.freeswitch.esl.client.inbound.Client;
@@ -542,7 +542,8 @@ public class EslClientService {
             params.put("hotwords", null);
             String arg = "";
             if (isAsr) {
-                arg = chanId + " start " + CommonConfig.funasr + " mono 16k " + JSON.toJSONString(params);
+                String url=SpringHelper.getRequiredProperty("common.funasr");
+                arg = chanId + " start " + url + " mono 16k " + JSON.toJSONString(params);
             } else {
                 arg = chanId + " stop " + JSON.toJSONString(params);
             }
@@ -825,8 +826,9 @@ public class EslClientService {
     //源号码
     private String getOrigination(String calleeNum) {
         String str = "";
-        if (!EslCommon.existExten(calleeNum) && StringHelper.isNotEmpty(CommonConfig.gateway_origination)) {
-            str = ",origination_caller_id_number=" + CommonConfig.gateway_origination;
+        String origination= SpringHelper.getRequiredProperty("common.gateway.origination");
+        if (!EslCommon.existExten(calleeNum) && StringHelper.isNotEmpty(origination)) {
+            str = ",origination_caller_id_number=" + origination;
         }
         return str;
     }
@@ -837,8 +839,9 @@ public class EslClientService {
         String callStr = "user/" + calleeNum;
         //呼叫外线号码
         if (!EslCommon.existExten(calleeNum)) {
-            if (StringHelper.isNotEmpty(CommonConfig.gateway_register)) {
-                callStr = "sofia/internal/" + calleeNum + "@" + CommonConfig.gateway_register;
+            String register= SpringHelper.getRequiredProperty("common.gateway.register");
+            if (StringHelper.isNotEmpty(register)) {
+                callStr = "sofia/internal/" + calleeNum + "@" + register;
 
 //            //注册网关
 //            EslMessage message = client.sendSyncApiCommand("sofia_contact", "9400");

midware-util/src/main/java/midware/util/config/CommonConfig.java

@@ -1,70 +0,0 @@
-package midware.util.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-public class CommonConfig {
-    public static String gateway_register;
-    @Value("${common.gateway.register}")
-    private void setGatewayRegister(String register) {
-        CommonConfig.gateway_register = register;
-    }
-    public static String gateway_origination;
-    @Value("${common.gateway.origination}")
-    private void setGatewayOrigination(String origination) {
-        CommonConfig.gateway_origination = origination;
-    }
-
-
-    public static String tts_type;
-    @Value("${common.tts.type}")
-    private void setTtsType(String ttsType) {
-        CommonConfig.tts_type = ttsType;
-    }
-
-    public static String tts_url;
-    @Value("${common.tts.url}")
-    private void setTtsUrl(String ttsUrl) {
-        CommonConfig.tts_url = ttsUrl;
-    }
-
-
-    public static String ai_llm;
-    @Value("${common.ai.llm}")
-    private void setAiLlm(String aiLlm) {
-        CommonConfig.ai_llm = aiLlm;
-    }
-
-    public static String ai_zsk;
-    @Value("${common.ai.zsk}")
-    private void setAiZsk(String aiZsk) {
-        CommonConfig.ai_zsk = aiZsk;
-    }
-
-    public static String ai_sjk;
-    @Value("${common.ai.sjk}")
-    private void setAiSjk(String aiSjk) {
-        CommonConfig.ai_sjk = aiSjk;
-    }
-
-    public static String ai_es;
-    @Value("${common.ai.es}")
-    private void setAiEs(String aiEs) {
-        CommonConfig.ai_es = aiEs;
-    }
-
-    public static String funasr;
-    @Value("${common.funasr}")
-    private void setFunasr(String funasr) {
-        CommonConfig.funasr = funasr;
-    }
-
-    public static String asr;
-    @Value("${common.asr}")
-    private void setAsr(String asr) {
-        CommonConfig.asr = asr;
-    }
-}

midware-util/src/main/java/midware/util/helper/TtsHelper.java

@@ -2,7 +2,6 @@ package midware.util.helper;
 
 import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
-import midware.util.config.CommonConfig;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -17,7 +16,8 @@ import java.util.Map;
 public class TtsHelper {
 
     private static void transfer(String word, String filePath) {
-        switch (CommonConfig.tts_type) {
+        String type=SpringHelper.getRequiredProperty("common.tts.type");
+        switch (type) {
             case "ekho":
                 try {
                     String command = "ekho " + word + " -o " + filePath;
@@ -34,7 +34,8 @@ public class TtsHelper {
                 param1.put("voice", "zhitian_emo");
                 param.put("parameters", param1);
 
-                String result = HttpHelper.post(CommonConfig.tts_url, JSON.toJSONString(param));
+                String url=SpringHelper.getRequiredProperty("common.tts.url");
+                String result = HttpHelper.post(url, JSON.toJSONString(param));
                 if (StringHelper.isNotEmpty(result)) {
                     try {
                         Map map = JSON.parseObject(result, Map.class);