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

代理的拦截和控制策略配置取消增加配置状态判断

Browse Source
This commit is contained in:
duandongmei
2019-05-03 10:26:51 +08:00
parent 9f4eb23b8c
commit 6af0b7b3b6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -554,7 +554,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("http配置下发响应信息："+result.getMsg()); logger.info("http配置下发响应信息："+result.getMsg());
}else if(isAudit==3){ }else if(isAudit==3 && entity.getIsValid() == 1) {
maatCfg.setCompileId(entity.getCompileId()); maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId()); maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效 maatCfg.setIsValid(0);//无效

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

@@ -410,7 +410,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
logger.error("欺骗IP池配置配置下发失败",e); logger.error("欺骗IP池配置配置下发失败",e);
throw e; throw e;
} }
}else if(entity.getIsAudit()==3){ }else if(entity.getIsAudit()==3 && entity.getIsValid() == 1) {
PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool(); PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
cfg.setIsValid(0); cfg.setIsValid(0);
cfg.setCompileId(pool.getCompileId()); cfg.setCompileId(pool.getCompileId());
@@ -592,7 +592,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg()); logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg());
}else if(isAudit==3){ }else if(isAudit==3 && entity.getIsValid() == 1) {
maatCfg.setCompileId(entity.getCompileId()); maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId()); maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效 maatCfg.setIsValid(0);//无效