Browse Source

修改ip话机打不出去

zhoufan 10 months ago
parent
commit
bf1c1b2623

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

300
 //                    + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
300
 //                    + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
301
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
301
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
302
             String arg = " {origination_caller_id_number=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
302
             String arg = " {origination_caller_id_number=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
303
-                    + ",record_concat_video=true,transfer_ringback=local_stream://moh,ringback=${us-ring}"
303
+                    + ",record_concat_video=true,transfer_ringback=local_stream://moh,ringback=local_stream://moh,absolute_codec_string='PCMA,PCMU'"
304
                     + "}user/" + callerNum + " &bridge({call_caller=" + callerNum + getOrigination(calleeNum) + "}"
304
                     + "}user/" + callerNum + " &bridge({call_caller=" + callerNum + getOrigination(calleeNum) + "}"
305
                     + getCallString(calleeNum) + ")"
305
                     + getCallString(calleeNum) + ")"
306
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
306
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
353
         try {
353
         try {
354
             String command = EslCommandEnum.originate.name();
354
             String command = EslCommandEnum.originate.name();
355
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
355
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
356
-                    + ",call_callee=" + calleeNum + "}user/" + callerNum + " &three_way(" + sessionId + ")"
356
+                    + ",absolute_codec_string='PCMA,PCMU',call_callee=" + calleeNum + "}user/" + callerNum + " &three_way(" + sessionId + ")"
357
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
357
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
358
             result = client.sendAsyncApiCommand(command, arg);
358
             result = client.sendAsyncApiCommand(command, arg);
359
         } catch (Exception e) {
359
         } catch (Exception e) {
369
             Session session = EslCommon.getSessionById(sessionId);
369
             Session session = EslCommon.getSessionById(sessionId);
370
             String command = EslCommandEnum.originate.name();
370
             String command = EslCommandEnum.originate.name();
371
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
371
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
372
-                    + ",call_callee=" + calleeNum + "}user/" + callerNum + " &intercept(" + chanId + ")"
372
+                    + ",absolute_codec_string='PCMA,PCMU',call_callee=" + calleeNum + "}user/" + callerNum + " &intercept(" + chanId + ")"
373
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
373
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
374
             result = client.sendAsyncApiCommand(command, arg);
374
             result = client.sendAsyncApiCommand(command, arg);
375
 
375
 
385
         try {
385
         try {
386
             String command = EslCommandEnum.originate.name();
386
             String command = EslCommandEnum.originate.name();
387
             String arg = " {origination_caller_id_number=" + callerNum+ ",cc_member_session_uuid=" + sessionId
387
             String arg = " {origination_caller_id_number=" + callerNum+ ",cc_member_session_uuid=" + sessionId
388
-                    + ",call_callee=" + calleeNum+ "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
388
+                    + ",absolute_codec_string='PCMA,PCMU',call_callee=" + calleeNum+ "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
389
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
389
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
390
             result = client.sendAsyncApiCommand(command, arg);
390
             result = client.sendAsyncApiCommand(command, arg);
391
             
391
             
593
             String arg = " {cc_member_session_uuid=" + meetingId
593
             String arg = " {cc_member_session_uuid=" + meetingId
594
                     + getOrigination(calleeNum)
594
                     + getOrigination(calleeNum)
595
                     + ",call_callee=" + calleeNum.substring(fix.length())+",call_caller=" + callerNum
595
                     + ",call_callee=" + calleeNum.substring(fix.length())+",call_caller=" + callerNum
596
-                    + ",transfer_ringback=local_stream://moh,ringback=${us-ring}"
596
+                    + ",transfer_ringback=local_stream://moh,ringback=local_stream://moh"
597
                     + argstr + "}" + getCallString(calleeNum)
597
                     + argstr + "}" + getCallString(calleeNum)
598
                     // + " " + meetingId + " xml ExtenMeeting";
598
                     // + " " + meetingId + " xml ExtenMeeting";
599
                     + " &conference(" + meetingId + "@" + at + ")"
599
                     + " &conference(" + meetingId + "@" + at + ")"
696
 //                    + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
696
 //                    + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
697
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
697
 //                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
698
             String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
698
             String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
699
-                    + "set:transfer_ringback=local_stream://moh^set:ringback=${us-ring}^"
699
+                    + "set:transfer_ringback=local_stream://moh^set:ringback=local_stream://moh^"
700
                     + "bridge:{call_caller=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
700
                     + "bridge:{call_caller=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length())
701
                     + getOrigination(calleeNum) + "}" + getCallString(calleeNum) + "' inline"
701
                     + getOrigination(calleeNum) + "}" + getCallString(calleeNum) + "' inline"
702
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
702
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();