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

1、增强字符串域未入redis问题处理;

Browse Source 
2、摘要文件上传后返回数据中key改为accessUrl;
3、删除回调类配置inline_ip_cb表protocol字段的验证
This commit is contained in:
zhangdongxu
2018-07-01 11:47:30 +08:00
parent b63147352e
commit cb784e560e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/util/ReadMaatXmlUtil.java
View File

@@ -120,10 +120,10 @@ public class ReadMaatXmlUtil {
maatXmlExpr.setType(12); maatXmlExpr.setType(12);
} else if (ele.getTextTrim().contains("num_region_table_name")) { } else if (ele.getTextTrim().contains("num_region_table_name")) {
maatXmlExpr.setType(13); maatXmlExpr.setType(13);
} else if (ele.getTextTrim().contains("str_region_table_name")) {
maatXmlExpr.setType(14);
} else if (ele.getTextTrim().contains("str_str_region_table_name")) { } else if (ele.getTextTrim().contains("str_str_region_table_name")) {
maatXmlExpr.setType(15); maatXmlExpr.setType(15);
} else if (ele.getTextTrim().contains("str_region_table_name")) {
maatXmlExpr.setType(14);
} else if (ele.getTextTrim().contains("file_digest_table_name")) { } else if (ele.getTextTrim().contains("file_digest_table_name")) {
maatXmlExpr.setType(16); maatXmlExpr.setType(16);
} else if (ele.getTextTrim().contains("file_like_table_name")) { } else if (ele.getTextTrim().contains("file_like_table_name")) {

2
src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
View File

@@ -678,7 +678,7 @@ public class ConfigSourcesController extends BaseRestController {
logger.info("-----------------调用接口上传文件---------------"); logger.info("-----------------调用接口上传文件---------------");
String filePath = FileManager.upload(fdsfile, null); String filePath = FileManager.upload(fdsfile, null);
// resultObject.put("path", filePath.substring(filePath.indexOf("group"))); // resultObject.put("path", filePath.substring(filePath.indexOf("group")));
resultObject.put("path", filePath); resultObject.put("accessUrl", filePath);
} }
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block

2
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -1218,7 +1218,7 @@ public class ConfigSourcesService extends BaseService {
maatConfig.setStrRegionMapList(dstMaplList); maatConfig.setStrRegionMapList(dstMaplList);
// 增强字符串域 // 增强字符串域
if (!StringUtil.isEmpty(strongMapList)&&strongMapList.size()>0) { if (!StringUtil.isEmpty(strongMapList)&&strongMapList.size()>0) {
maatConfig.setStrStrRegionMapList((dstMaplList)); maatConfig.setStrStrRegionMapList((strongMapList));
} }
//数值域 //数值域
dstMaplList = null; dstMaplList = null;

4
src/main/resources/commonSources/commonSources.xml
View File

@@ -15,7 +15,7 @@
<t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip" isRequired="true"/> <t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip" isRequired="true"/>
<t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/> <t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/> <t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true" regexp="[0|6|17]"/> <t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true" defaultVal="0"/>
<t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/> <t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/>
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/> <t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/> <t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
@@ -65,7 +65,7 @@
<t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip" isRequired="true"/> <t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip" isRequired="true"/>
<t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/> <t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/> <t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true" regexp="[0|6|17]"/> <t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true"/>
<t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/> <t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/>
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/> <t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/> <t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>