diff --git a/‎basicKnowledge/src/com/xdc/basic/commons/network/IpUtil.java‎
Lines changed: 45 additions & 0 deletions b/‎basicKnowledge/src/com/xdc/basic/commons/network/IpUtil.java‎
Lines changed: 45 additions & 0 deletions
diff --git a/‎basicKnowledge/src/com/xdc/basic/commons/network/MacUtil.java‎
Lines changed: 45 additions & 13 deletions b/‎basicKnowledge/src/com/xdc/basic/commons/network/MacUtil.java‎
Lines changed: 45 additions & 13 deletions
diff --git a/‎basicKnowledge/test/com/xdc/basic/commons/network/IpUtilTest.java‎
Lines changed: 2 additions & 0 deletions b/‎basicKnowledge/test/com/xdc/basic/commons/network/IpUtilTest.java‎
Lines changed: 2 additions & 0 deletions
@@ -1,5 +1,14 @@
 package com.xdc.basic.commons.network;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.TreeSet;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 
@@ -140,4 +149,40 @@ private static int ipToInt(String ipString)
 
         return ipInt;
     }
+
+    public static List<String> getIps() throws SocketException
+    {
+        // 使用TreeSet：保证唯一，保证升序。
+        TreeSet<String> ipTreeSet = new TreeSet<String>();
+
+        Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
+        while (networkInterfaces.hasMoreElements())
+        {
+            NetworkInterface networkInterface = networkInterfaces.nextElement();
+            if (networkInterface.isLoopback() || networkInterface.isVirtual() || !networkInterface.isUp())
+            {
+                continue;
+            }
+
+            Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
+            while (inetAddresses.hasMoreElements())
+            {
+                InetAddress inetAddress = inetAddresses.nextElement();
+                if (!(inetAddress instanceof Inet4Address))
+                {
+                    continue;
+                }
+
+                ipTreeSet.add(inetAddress.getHostAddress());
+            }
+        }
+
+        List<String> ipList = new ArrayList<String>();
+        for (String ip : ipTreeSet)
+        {
+            ipList.add(ip);
+        }
+
+        return ipList;
+    }
 }
@@ -5,8 +5,11 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.TreeSet;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import com.xdc.basic.commons.StringUtil;
 
 public class MacUtil
 {
@@ -32,40 +35,69 @@ public static boolean isMac(String mac)
 
     public static boolean isMac(String mac, boolean filterSpecialMac)
     {
-        if (StringUtils.isBlank(mac))
+        if (!StringUtil.matches(mac, macRegExp))
         {
             return false;
         }
 
-        if (filterSpecialMac)
+        if (filterSpecialMac && specialMacs.contains(mac))
         {
-            if (specialMacs.contains(mac))
-            {
-                return false;
-            }
+            return false;
         }
 
-        return mac.matches(macRegExp);
+        return true;
     }
 
     public static List<String> getMacs() throws SocketException
     {
         return getMacs(true);
     }
 
+    /**
+     * 参考：http://www.jb51.net/article/93343.htm
+     * 参考：http://www.cnblogs.com/KnowledgeShare/p/6184383.html
+     */
     public static List<String> getMacs(boolean filterSpecialMac) throws SocketException
     {
-        // TODO 待实现
-
-        List<String> macs = new ArrayList<String>();
+        // 使用TreeSet：保证唯一，保证升序。
+        TreeSet<String> macTreeSet = new TreeSet<String>();
 
         Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
         while (networkInterfaces.hasMoreElements())
         {
             NetworkInterface networkInterface = networkInterfaces.nextElement();
-            byte[] hardwareAddress = networkInterface.getHardwareAddress();
+            if (networkInterface.isLoopback() || networkInterface.isVirtual())
+            {
+                continue;
+            }
+
+            byte[] macBytes = networkInterface.getHardwareAddress();
+            if (ArrayUtils.isEmpty(macBytes))
+            {
+                continue;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < macBytes.length; i++)
+            {
+                sb.append(String.format("%02X%s", macBytes[i], (i < macBytes.length - 1) ? "-" : ""));
+            }
+            String mac = sb.toString();
+
+            if (filterSpecialMac && specialMacs.contains(mac))
+            {
+                continue;
+            }
+
+            macTreeSet.add(mac);
+        }
+
+        List<String> macList = new ArrayList<String>();
+        for (String mac : macTreeSet)
+        {
+            macList.add(mac);
         }
 
-        return macs;
+        return macList;
     }
 }
@@ -1,6 +1,7 @@
 package com.xdc.basic.commons.network;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class IpUtilTest
@@ -33,6 +34,7 @@ public void testIsIpv4Mask()
         Assert.assertEquals(false, IpUtil.isIpv4Ip("0.0.0.0hehe"));
     }
 
+    @Ignore("比较耗时，不执行了。")
     @Test
     public void testIsIpv4PortAndIsIpv4PortRegex()
     {
Original file line number	Diff line number	Diff line change
@@ -1,6 +1,7 @@
1	1	package com.xdc.basic.commons.network;
2	2
3	3	import org.junit.Assert;
	4	+ import org.junit.Ignore;
4	5	import org.junit.Test;
5	6
6	7	public class IpUtilTest
@@ -33,6 +34,7 @@ public void testIsIpv4Mask()
33	34	Assert.assertEquals(false, IpUtil.isIpv4Ip("0.0.0.0hehe"));
34	35	}
35	36
	37	+ @Ignore("比较耗时，不执行了。")
36	38	@Test
37	39	public void testIsIpv4PortAndIsIpv4PortRegex()
38	40	{