From 2a15ab653f4fb7dca92e6c8b8f9ba9e927164606 Mon Sep 17 00:00:00 2001 From: minglipro Date: Wed, 9 Jul 2025 23:00:31 +0800 Subject: [PATCH] no message --- gradle.properties | 2 +- .../network/endpoint/NetworkAddress.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index b2180d8..f6761c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUPSID=com.mingliqiye ARTIFACTID=network-endpoint -VERSIONS=1.0.2 +VERSIONS=1.0.3 MAINCLASS=com.mingliqiye JDKVERSIONS=1.8 diff --git a/src/main/java/com/mingliqiye/network/endpoint/NetworkAddress.java b/src/main/java/com/mingliqiye/network/endpoint/NetworkAddress.java index 82c1f83..3c469ba 100644 --- a/src/main/java/com/mingliqiye/network/endpoint/NetworkAddress.java +++ b/src/main/java/com/mingliqiye/network/endpoint/NetworkAddress.java @@ -56,12 +56,14 @@ public class NetworkAddress implements Serializable { public static NetworkAddress of(String domip) { return new NetworkAddress(domip); } + public static NetworkAddress of(InetAddress inetAddress) { return new NetworkAddress(inetAddress.getHostAddress()); } - public InetAddress toInetAddress(){ + + public InetAddress toInetAddress() { try { - return InetAddress.getByName(domain); + return InetAddress.getByName(ip != null ? ip : domain); } catch (UnknownHostException e) { throw new RuntimeException(e); } @@ -74,7 +76,8 @@ public class NetworkAddress implements Serializable { * @return IP地址 * @throws UnknownHostException 没找到对应的IP */ - public static String getHostIp(@NotNull String domain) throws UnknownHostException { + public static String getHostIp(@NotNull String domain) + throws UnknownHostException { InetAddress[] addresses = InetAddress.getAllByName(domain.trim()); return addresses[0].getHostAddress(); } @@ -110,9 +113,10 @@ public class NetworkAddress implements Serializable { } public String toString() { - return isdom?StringUtil.format("NetworkAddress(IP='{}',type='{}'," + - "domain='{}')",ip,IPv,domain): - StringUtil.format("NetworkAddress(IP='{}',type='{}')",ip,IPv); + return isdom ? StringUtil.format( + "NetworkAddress(IP='{}',type='{}'," + "domain='{}')", ip, IPv, + domain) : + StringUtil.format("NetworkAddress(IP='{}',type='{}')", ip, IPv); } }