diff options
| author | duandongmei <[email protected]> | 2019-05-03 10:26:51 +0800 |
|---|---|---|
| committer | 段冬梅 <[email protected]> | 2019-05-03 10:27:21 +0800 |
| commit | 35e491e20cd1a1c0ade7467a8aeef075ee8133b1 (patch) | |
| tree | fdbcc41bc68c7adc962433a538cc801586e680f0 | |
| parent | ce8c273aa4f5f94dcca24faa9ddd666d175064bc (diff) | |
代理的拦截和控制策略配置取消增加配置状态判断
| -rw-r--r-- | src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/nis/web/service/configuration/InterceptCfgService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index add578a70..b3a28f18f 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -554,7 +554,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("http配置下发响应信息："+result.getMsg());
- }else if(isAudit==3){
+ }else if(isAudit==3 && entity.getIsValid() == 1) {
maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index 694080a23..927d3f76a 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -410,7 +410,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> logger.error("欺骗IP池配置配置下发失败",e);
throw e;
}
- }else if(entity.getIsAudit()==3){
+ }else if(entity.getIsAudit()==3 && entity.getIsValid() == 1) {
PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool();
cfg.setIsValid(0);
cfg.setCompileId(pool.getCompileId());
@@ -592,7 +592,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg());
- }else if(isAudit==3){
+ }else if(isAudit==3 && entity.getIsValid() == 1) {
maatCfg.setCompileId(entity.getCompileId());
maatCfg.setServiceId(entity.getServiceId());
maatCfg.setIsValid(0);//无效
|