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

1.解决APP策略SubscribeId修改问题 2.APP特征dolog为0

Browse Source
This commit is contained in:
zhangwenqing
2018-08-24 12:15:19 +08:00
parent 0ea0db2369
commit 85e813a5d7
10 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -69,17 +69,17 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
@Expose
@ExcelField(title="expression_type")
@SerializedName("exprType")
private Integer exprType ;
protected Integer exprType ;
@Expose
@ExcelField(title="match_method")
@SerializedName("matchMethod")
private Integer matchMethod ;
protected Integer matchMethod ;
@Expose
@ExcelField(title="whether_hexbinary")
@SerializedName("isHexbin")
private Integer isHexbin;
protected Integer isHexbin;
private List<IpPortCfg> ipPortList;
private IpPortCfg ipPort;

1
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -246,6 +246,7 @@ public class FileTransferCfgController extends BaseController{
fileMap.put("checksum", md5);
result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));
if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) {
logger.info("文件摘要信息获取有误！");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+null);
}
logger.info("获取文件摘要响应信息："+result);

4
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -238,7 +238,7 @@ public class AppCfgService extends BaseService {
for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
entity.setCfgKeywords(cfg.getCfgKeywords());
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType","exprType","matchMethod","isHexbin"});
stringcfgDao.saveSubscribeIdCfg(cfg);
}
}
@@ -1410,7 +1410,7 @@ public class AppCfgService extends BaseService {
if(entity.getNtcSubscribeIdCfgList()!=null&&entity.getNtcSubscribeIdCfgList().size()>0){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[]{"cfgId"});
stringcfgDao.deleteSubscribeIdCfg(ntcSubscribeIdCfg);
stringcfgDao.updateSubscribeIdCfg(ntcSubscribeIdCfg);
}
//保存区域IP信息
if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){