[common]feature:use "apache.http.conn.util" replace "sun.net.util" fo…

…r upgrading java version (apache#299) Co-authored-by: Privauto <[email protected]>
wangli1994 · Sep 25, 2022 · 2503397 · 2503397
1 parent 70d830f
commit 2503397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -97,5  97,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
         <!-- 使用apache.http.conn.util代替sun.net.util -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/common/src/main/java/com/usthe/common/util/IpDomainUtil.java b/common/src/main/java/com/usthe/common/util/IpDomainUtil.java
@@ -18,8  18,7 @@
 package com.usthe.common.util;
 
 import lombok.extern.slf4j.Slf4j;
-import sun.net.util.IPAddressUtil;
-
 import org.apache.http.conn.util.InetAddressUtils;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -60,10  59,10 @@ public static boolean validateIpDomain(String ipDomain) {
         if (LOCALHOST.equalsIgnoreCase(ipDomain)) {
             return true;
         }
-        if (IPAddressUtil.isIPv4LiteralAddress(ipDomain)) {
         if (InetAddressUtils.isIPv4Address(ipDomain)) {
             return true;
         }
-        if (IPAddressUtil.isIPv6LiteralAddress(ipDomain)) {
         if (InetAddressUtils.isIPv6Address(ipDomain)) {
             return true;
         }
         return DOMAIN_PATTERN.matcher(ipDomain).matches();