Merge remote-tracking branch 'origin/v2.0.5_dev' into v2.0.5_dev
This commit is contained in:
commit
6ce7a6bdcd
|
@ -427,10 +427,16 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
|
||||||
|
|
||||||
// 将业务Ip根据IP地址类型进行拆分
|
// 将业务Ip根据IP地址类型进行拆分
|
||||||
for (String k : StringUtils.deleteWhitespace(v.getServiceIp()).split(DisposeConfigValue.SPLIT_CHAR)) {
|
for (String k : StringUtils.deleteWhitespace(v.getServiceIp()).split(DisposeConfigValue.SPLIT_CHAR)) {
|
||||||
|
String ipValue = k.replaceAll("\\d+_", "");
|
||||||
|
|
||||||
if (!k.contains(":")) {
|
if (!k.contains(":")) {
|
||||||
ipV4.add(ipV4Idx++ + "_" + k);
|
if (Pattern.matches(ConstValue.ipAddrSegmentReg(), ipValue)) {
|
||||||
|
ipV4.add(ipV4Idx++ + "_" + ipValue);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
ipV6.add(ipV6Idx++ + "_" + k);
|
if (Pattern.matches(ConstValue.ipAddrSegmentReg(), ipValue)) {
|
||||||
|
ipV6.add(ipV6Idx++ + "_" + ipValue);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue