From 1060a5f85e845c42834852d680ee142120cd7d5f Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sun, 5 May 2019 11:02:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E4=B8=8D=E8=B5=B0=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96=E7=9A=84=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/service/configuration/HttpRedirectCfgService.java | 2 +- .../nis/web/service/configuration/InterceptCfgService.java | 4 ++-- .../java/com/nis/web/service/configuration/IpCfgService.java | 2 +- src/main/resources/messages/message_en.properties | 1 - 4 files changed, 4 insertions(+), 5 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 b3a28f18f..50bda8346 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 logger.error("欺骗IP池配置配置下发失败",e); throw e; } - }else if(entity.getIsAudit()==3 && entity.getIsValid() == 1) { + }else if(entity.getIsAudit()==3) { PxyObjSpoofingIpPool cfg = new PxyObjSpoofingIpPool(); cfg.setIsValid(0); cfg.setCompileId(pool.getCompileId()); @@ -592,7 +592,7 @@ public class InterceptCfgService extends CrudService ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); logger.info("intercept IP/DNS 配置下发响应信息："+result.getMsg()); - }else if(isAudit==3 && entity.getIsValid() == 1) { + }else if(isAudit==3) { maatCfg.setCompileId(entity.getCompileId()); maatCfg.setServiceId(entity.getServiceId()); maatCfg.setIsValid(0);//无效 diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 68cf773d4..cfd77810c 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -741,7 +741,7 @@ public class IpCfgService extends CrudService { throw new RuntimeException( ":" + props.getProperty("unknown_cfg_type")); } - } else if (isAudit == 3 && entity.getIsValid() == 1) { + } else if (isAudit == 3) { if (maatType == Constants.CALLBACK_TYPE) { List ipList = new ArrayList<>(); for (IpPortCfg cfg : entity.getIpPortList()) { diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b695181bd..5cac7cdbe 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1515,7 +1515,6 @@ src_ip_pattern=Client IP Pattern dest_ip_pattern=Server IP Pattern src_port_pattern=Client Port Pattern dest_port_pattern=Server Port Pattern -<<<<<<< develop_20190508_branch url_group_configuration=URL Group Configuration dns_keyword_group_configuration=DNS Keyword Group Configuration app_ip_correlation=APP IP Correlation