diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index 30d7765fa..fd6efb7d6 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -602,10 +602,13 @@ public class CheckIpFormatThread implements Callable{ Pattern ip6 = Constants.IPV6_IP_PATTERN; Matcher ip4Matcher = ip4.matcher(srcIpAddress); Matcher ip6Matcher = ip6.matcher(srcIpAddress); - if ((ip4Matcher.matches() && srcIpAddress.startsWith("0.0.0.0")) - || (ip6Matcher.matches() && srcIpAddress.startsWith("::"))) { + if (ip4Matcher.matches() && srcIpAddress.startsWith("0.0.0.0")) { errInfo.append(prop.getProperty("client_ip") - + String.format(prop.getProperty("can_not_be"), prop.getProperty("default_value")) + + String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + + ";"); + } else if (ip6Matcher.matches() && srcIpAddress.startsWith("::")) { + errInfo.append(prop.getProperty("client_ip") + + String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";"); } } @@ -627,10 +630,13 @@ public class CheckIpFormatThread implements Callable{ Pattern ip6 = Constants.IPV6_IP_PATTERN; Matcher ip4Matcher = ip4.matcher(destIpAddress); Matcher ip6Matcher = ip6.matcher(destIpAddress); - if ((ip4Matcher.matches() && destIpAddress.startsWith("0.0.0.0")) - || (ip6Matcher.matches() && destIpAddress.startsWith("::"))) { + if (ip4Matcher.matches() && destIpAddress.startsWith("0.0.0.0")) { errInfo.append(prop.getProperty("server_ip") - + String.format(prop.getProperty("can_not_be"), prop.getProperty("default_value")) + + String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + + ";"); + } else if (ip6Matcher.matches() && destIpAddress.startsWith("::")) { + errInfo.append(prop.getProperty("server_ip") + + String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";"); } }