修改

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

@@ -48,6 +48,14 @@ public class EslClientService {
         new ScheduledThreadPoolExecutor(1).scheduleAtFixedRate(() -> {
             if (!client.canSend()) {
                 try {
+                    if (EslCommon.agents.size() > 0) {
+                        for (Agent a : EslCommon.agents) {
+                            logout(a.getAgent(), a.getGroup());
+                            a.setAgentState(EslAgentEnum.logout.ordinal());
+                        }
+                        EslCommon.agents=new ArrayList<>();
+                    }
+
                     client.connect(config.getHost(), config.getPort(), config.getPassword(), config.getTimeout());
                     //移除事件
                     client.cancelEventSubscriptions();
@@ -70,14 +78,6 @@ public class EslClientService {
                     } catch (Exception e1) {
                     }
                 }
-            }else {
-                if (EslCommon.agents.size() > 0) {
-                    for (Agent a : EslCommon.agents) {
-                        logout(a.getAgent(), a.getGroup());
-                        a.setAgentState(EslAgentEnum.logout.ordinal());
-                    }
-                    EslCommon.agents=new ArrayList<>();
-                }
             }
         }, 1, 5000, TimeUnit.MILLISECONDS);
 
@@ -379,6 +379,22 @@ public class EslClientService {
         return result;
     }
 
+    //放音收号
+    public String playAndGetDigits(String path, String chanId) {
+        String result = "";
+        try {
+            String command = EslCommandEnum.uuid_broadcast.name();
+            path = "/home/wav/8001.wav";
+
+            String arg = chanId + " 'play_and_get_digits::1 1 2 2000 # " + path + " silence_stream://250 res \\d+'";
+            result = client.sendAsyncApiCommand(command, arg);
+
+        } catch (Exception e) {
+            log.error(chanId + " 放音收号失败", e);
+        }
+        return result;
+    }
+
     //会话加入会议
     public String talkJoinMeeting(String sessionId) {
         String result = "";

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

@@ -27,26 +27,31 @@ public class IpHelper {
         return hostIP;
     }
 
-    public static String getMac(){
-        String mac="";
+    public static String getMac() {
+        String mac = "";
         try {
             Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
             while (networkInterfaces.hasMoreElements()) {
                 NetworkInterface ni = networkInterfaces.nextElement();
-                if (ni.isLoopback() || ni.isVirtual() || !ni.isUp()) {
-                    continue;
+                if (ni.isLoopback() || ni.isVirtual() || !ni.isUp()) continue;
+                boolean ip4 = false;
+                Enumeration<InetAddress> nias = ni.getInetAddresses();
+                while (nias.hasMoreElements()) {
+                    InetAddress ia = nias.nextElement();
+                    if (!ia.isLinkLocalAddress() && !ia.isLoopbackAddress() && ia instanceof Inet4Address) {
+                        ip4 = true;
+                    }
                 }
+                if (!ip4) continue;
                 byte[] macByte = ni.getHardwareAddress();
-                if (macByte == null) {
-                    continue;
-                }
+                if (macByte == null) continue;
                 StringBuilder buf = new StringBuilder();
                 for (byte aMac : macByte) {
                     buf.append(String.format("%02X-", aMac));
                 }
                 if (buf.length() > 0) {
                     buf.deleteCharAt(buf.length() - 1);
-                    mac=buf.toString();
+                    mac = buf.toString();
                     break;
                 }
             }