gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 导入时源IP/目的IP为默认值时的提示语

Browse Source
This commit is contained in:
李皓宸
2019-05-14 18:39:40 +08:00
parent c81dd92aca
commit f6c37c7bda
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -602,10 +602,13 @@ public class CheckIpFormatThread implements Callable<String>{
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<String>{
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)
+ ";");
}
}