1、为IP域配置和回调类配置添加addrType为4OVER、6OVER4三种IP类型;

2、redis.port改回6379;
This commit is contained in:
zhangdongxu
2018-07-20 17:56:31 +08:00
parent 75f136b567
commit 827338f7aa
7 changed files with 214 additions and 47 deletions

View File

@@ -2876,7 +2876,16 @@ public class ConfigSourcesService extends BaseService {
}
break;
case "IP":
if (!BasicProvingUtil.isIpOrIpMask(dstStr, ipType)) {
Boolean isSrcInfo = commonSourceFieldCfg.getIsSrcInfo();
Integer valAddrType = ipType;
if (ipType.intValue()==46) {
valAddrType=isSrcInfo?4:6;
}else if (ipType.intValue()==64) {
valAddrType=isSrcInfo?6:4;
}else if (ipType.intValue()==10) {
valAddrType=null;
}
if (!BasicProvingUtil.isIpOrIpMask(dstStr, valAddrType)) {
logger.error(commonSourceFieldCfg.getSrcName()
+ "参数格式不正确或与" + ipTypeName + "不一致");
thread.setExceptionInfo(commonSourceFieldCfg