1、IP限流下发阀门只添加action和service;2、APP阻断、APP监测添加两个域表;IPSec监测IP类域表改为NTC_UNIVERSAL_IP;

2、添加service和action关系不存在的验证;
3、添加行为识别原始日志查询接口;
This commit is contained in:
zhangdongxu
2018-07-13 12:06:34 +08:00
parent d8e736d048
commit db4bdd7722
10 changed files with 175 additions and 19 deletions

View File

@@ -1246,6 +1246,7 @@ public class ConfigSourcesService extends BaseService {
if (!"ok".equals(msg)) {
logger1.error(msg);
thread.setExceptionInfo(msg + sb.toString());
thread.setBusinessCode(CompileVal.getBusinessCode());
throw new RestServiceException(thread,
System.currentTimeMillis() - start, msg
+ sb.toString(),
@@ -1550,7 +1551,7 @@ public class ConfigSourcesService extends BaseService {
} catch (Exception e) {
// TODO: handle exception
msgList.add(e);
CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue());
//CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue());
return "error";
}
try {
@@ -2950,7 +2951,7 @@ public class ConfigSourcesService extends BaseService {
Integer action = null;
for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
if (commonSourceFieldCfg.getDstName().equals("ip_type")) {
if (commonSourceFieldCfg.getDstName().equals("addr_type")) {
String dstVal = srcMap.get(
commonSourceFieldCfg.getSrcName()).toString();
ipTypeName = commonSourceFieldCfg.getSrcName();
@@ -2996,6 +2997,9 @@ public class ConfigSourcesService extends BaseService {
}
}
}
if (ipType==null) {
ipType = 4;
}
for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
// 是否必填
if (commonSourceFieldCfg.getIsRequired()
@@ -3055,7 +3059,7 @@ public class ConfigSourcesService extends BaseService {
RestBusinessCode.MastDate.getValue());
}
break;
case "Ip":
case "IP":
if (!BasicProvingUtil.isIpOrIpMask(dstStr, ipType)) {
logger1.error(commonSourceFieldCfg.getSrcName()
+ "参数格式不正确或与" + ipTypeName + "不一致");