修改

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

@@ -1,12 +1,11 @@
 server:
   port: 9000
-swagger: true
 
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.200:3306/midware?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.200:3306/hjzx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
     username: root
     password: 800100
 
@@ -30,17 +29,22 @@ spring:
     timeout: 20
 
 common:
+  gateway:
+    #注册网关
+    register:
+    #源号码
+    origination:
   tts:
     #modelscope/ekho
     type: modelscope
-    url: http://192.168.1.17:8000/call
+    url: http://192.168.1.81:8000/call
 
   ai:
-    llm: http://192.168.1.40:7861/chat/chat
-    zsk: http://192.168.1.40:7861/chat/kb_chat
-    sjk: http://192.168.1.40:7861/chat/db_chat
+    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.40:10095
+  funasr: ws://192.168.1.89:10095
   #funasr/mrcp
   asr: funasr

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

@@ -1,42 +1,50 @@
 server:
   port: 9000
-swagger: false
 
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.16.20.169:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-    username: kfyy
-    password: 29oBbf6rVhAc0xdk
+    url: jdbc:mysql://127.0.0.1:3306/xlrx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    username: root
+    password: Mb@DH1i{Y[cmH6[PW4TMziL}Y~f1+2(i
 
   redis:
     # 地址
-    host: 172.16.20.169
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 7
     # 密码
-    password: iVDOLix2bCC21ZEY
+    password: DZFs0EFzMORZfpNx5tb1lpEwGZjSWjB1
     # 连接超时时间
     timeout: 10s
 
   freeswitch:
     #不在一台服务器时修改为具体ip
-    host: 0.0.0.0
+    host: 127.0.0.1
     port: 8021
-    password: irFNj6snoWpxGIhF
+    password: 123456
     timeout: 20
 
 common:
+  gateway:
+    #注册网关
+    register:
+    #源号码
+    origination:
   tts:
     #modelscope/ekho
     type: modelscope
-    url: http://192.168.1.17:8000/call
+    url: http://192.168.1.81:8000/call
 
   ai:
-    zsk: http://192.168.1.40:7861/chat/kb_chat
-    sjk: http://192.168.1.40:7861/db_base/search_db
+    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.40:10095
+  funasr: ws://192.168.1.89:10095
+  #funasr/mrcp
+  asr: funasr

midware-service/src/main/java/midware/service/eslclient/EslEventListenerCustom.java

@@ -25,6 +25,8 @@ public class EslEventListenerCustom implements IEslEventListener {
     @Override
     public void eventReceived(EslEvent event) {
 
+        if(EslCommon.auth.isExpire()) return;
+        
         String eventname = event.getEventName();
 
         Map<String, String> header = event.getEventHeaders();

midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

@@ -36,6 +36,8 @@ public class EslEventListenerEvent implements IEslEventListener {
         //System.out.println(1 + "|" + JSON.toJSONString(event));
         //log.warn(1 + "|" + JSON.toJSONString(event));
 
+        if(EslCommon.auth.isExpire()) return;
+
         String eventname = event.getEventName();
 
         Map<String, String> header = event.getEventHeaders();
@@ -57,6 +59,8 @@ public class EslEventListenerEvent implements IEslEventListener {
                 String chanId = header.get("Unique-ID");
                 // 获取主叫
                 String callerNum = header.get("Caller-Caller-ID-Number");
+                String caller = header.get("variable_call_caller");
+                if (StringHelper.isNotEmpty(caller))  callerNum = caller;
                 // 获取被叫
                 String calleeNum = header.get("Caller-Callee-ID-Number");
                 if (StringHelper.isEmpty(calleeNum)) calleeNum = header.get("Caller-Destination-Number");
@@ -64,7 +68,7 @@ public class EslEventListenerEvent implements IEslEventListener {
                 String ccId = header.get("variable_cc_member_session_uuid");
                 if (StringHelper.isNotEmpty(ccId)) callId = ccId;
                 //代码呼叫时，create事件得到正确的被叫号码
-                String called = header.get("variable_call_called");
+                String called = header.get("variable_call_callee");
                 if (StringHelper.isNotEmpty(called)) {
                     calleeNum = called;
                     //会议打外线主叫和被叫改变了

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

@@ -295,13 +295,14 @@ public class EslClientService {
             String fix = action.substring(action.lastIndexOf("|") + 1);
             String command = EslCommandEnum.originate.name();
 //            String arg = " {instant_ringback=true,origination_caller_id_number=" + callerNum
-//                    + ",call_called=" + calleeNum.substring(fix.length()) + ",record_concat_video=true"
+//                    + ",call_callee=" + calleeNum.substring(fix.length()) + ",record_concat_video=true"
 //                    + ",transfer_ringback=local_stream://moh,ignore_early_media=true"
 //                    + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
-            String arg = " {origination_caller_id_number=" + callerNum + ",call_called=" + calleeNum.substring(fix.length())
+            String arg = " {origination_caller_id_number=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
                     + ",record_concat_video=true,transfer_ringback=local_stream://moh,ringback=${us-ring}"
-                    + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
+                    + "}user/" + callerNum + " &bridge({call_caller=" + callerNum + getOrigination(calleeNum) + "}"
+                    + getCallString(calleeNum) + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
@@ -316,8 +317,10 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
-            String arg = " {origination_caller_id_number=" + callerNum + ",call_called=" + calleeNum
-                    + ",call_type=2}" + getCallString(callerNum) + " &bridge(" + getCallString(calleeNum) + ")"
+            String arg = " {call_caller=" + callerNum + ",call_callee=" + calleeNum + ",call_type=2"
+                    + getOrigination(calleeNum) +"}"+ getCallString(callerNum)
+                    + " &bridge({call_caller=" + callerNum + getOrigination(calleeNum)
+                    + "}" + getCallString(calleeNum) + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
@@ -333,8 +336,8 @@ public class EslClientService {
         try {
             String fix = action.substring(action.lastIndexOf("|")+1);
             String command = EslCommandEnum.uuid_broadcast.name();
-            String arg = chanId + " att_xfer::{origination_caller_id_number=" + callerNum+",record_concat_video=true"
-                    + ",call_called=" + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum)
+            String arg = chanId + " att_xfer::{origination_caller_id_number=12356,record_concat_video=true"
+                    + ",call_caller=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum)
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
             
@@ -350,7 +353,7 @@ public class EslClientService {
         try {
             String command = EslCommandEnum.originate.name();
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
-                    + ",call_called=" + calleeNum + "}user/" + callerNum + " &three_way(" + sessionId + ")"
+                    + ",call_callee=" + calleeNum + "}user/" + callerNum + " &three_way(" + sessionId + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
@@ -366,7 +369,7 @@ public class EslClientService {
             Session session = EslCommon.getSessionById(sessionId);
             String command = EslCommandEnum.originate.name();
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
-                    + ",call_called=" + calleeNum + "}user/" + callerNum + " &intercept(" + chanId + ")"
+                    + ",call_callee=" + calleeNum + "}user/" + callerNum + " &intercept(" + chanId + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
@@ -382,7 +385,7 @@ public class EslClientService {
         try {
             String command = EslCommandEnum.originate.name();
             String arg = " {origination_caller_id_number=" + callerNum+ ",cc_member_session_uuid=" + sessionId
-                    + ",call_called=" + calleeNum+ "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
+                    + ",call_callee=" + calleeNum+ "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
             
@@ -587,8 +590,9 @@ public class EslClientService {
                 argstr = ",record_concat_video=true,conference_auto_record=" + path;
             }
 
-            String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + meetingId
-                    + ",call_called=" + calleeNum.substring(fix.length())
+            String arg = " {cc_member_session_uuid=" + meetingId
+                    + getOrigination(calleeNum)
+                    + ",call_callee=" + calleeNum.substring(fix.length())+",call_caller=" + callerNum
                     + ",transfer_ringback=local_stream://moh,ringback=${us-ring}"
                     + argstr + "}" + getCallString(calleeNum)
                     // + " " + meetingId + " xml ExtenMeeting";
@@ -639,7 +643,7 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_record.name();
-            String arg = chanId + (isRecord ? " start" : " stop") + filePath;
+            String arg = chanId + (isRecord ? " start " : " stop ") + filePath;
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
             String state = isRecord ? "开启" : "关闭";
@@ -688,13 +692,13 @@ public class EslClientService {
             //String arg = chanId + " " + calleeNum + " xml ForExten";
 //            String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
 //                    + "set:instant_ringback=true^set:transfer_ringback=local_stream://moh^"
-//                    + "bridge:{ignore_early_media=true,origination_caller_id_number=" + callerNum + ",call_called="
+//                    + "bridge:{ignore_early_media=true,origination_caller_id_number=" + callerNum + ",call_callee="
 //                    + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
                     + "set:transfer_ringback=local_stream://moh^set:ringback=${us-ring}^"
-                    + "bridge:{origination_caller_id_number=" + callerNum + ",call_called="
-                    + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
+                    + "bridge:{call_caller=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
+                    + getOrigination(calleeNum) + "}" + getCallString(calleeNum) + "' inline"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
@@ -765,7 +769,8 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
-            String arg = " {origination_caller_id_number=" + callerNum + ",task_id=" + taskId + ",phone_id=" + phoneId + ",call_type=3}"
+            String arg = " {task_id=" + taskId + ",phone_id=" + phoneId + ",call_type=3"
+                    + getOrigination(calleeNum) + "}"
                     + getCallString(calleeNum) + " &park()";
             result = client.sendAsyncApiCommand(command, arg);
 
@@ -799,20 +804,34 @@ public class EslClientService {
         return false;
     }
 
+    //源号码
+    private String getOrigination(String calleeNum) {
+        String str = "";
+        if (!EslCommon.existExten(calleeNum) && StringHelper.isNotEmpty(CommonConfig.gateway_origination)) {
+            str = ",origination_caller_id_number=" + CommonConfig.gateway_origination;
+        }
+        return str;
+    }
+
     //呼叫字符串
     private String getCallString(String calleeNum) {
         //呼叫内线分机号码
         String callStr = "user/" + calleeNum;
         //呼叫外线号码
         if (!EslCommon.existExten(calleeNum)) {
-            callStr = "sofia/gateway/hykj/" + calleeNum;
+            if (StringHelper.isNotEmpty(CommonConfig.gateway_register)) {
+                callStr = "sofia/internal/" + calleeNum + CommonConfig.gateway_register;
 
-//            //动态ip
-//            EslMessage message = client.sendSyncApiCommand("sofia_contact", "");
+//            //注册网关
+//            EslMessage message = client.sendSyncApiCommand("sofia_contact", "9400");
 //            if (message != null && message.getBodyLines().size() > 0) {
 //                String gwip = message.getBodyLines().get(0);
 //                callStr = "sofia/internal/" + calleeNum + gwip.substring(gwip.indexOf("@"));
 //            }
+
+            } else {
+                callStr = "sofia/gateway/hykj/" + calleeNum;
+            }
         }
         return callStr;
     }

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

@@ -7,6 +7,18 @@ 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) {