From b87f99c8522b6db18c1ecd53f78ca6a37ee9adb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Tue, 5 Mar 2019 17:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4APP=20feature=E5=92=8CASN=20IP?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E4=B8=9A=E5=8A=A1=E5=A2=9E=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=85=8D=E7=BD=AE=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8Dddos=E6=96=B0=E5=A2=9Ebug;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/util/ConfigServiceUtil.java | 1 + .../nis/web/controller/BaseController.java | 3 +- .../nis/web/dao/configuration/DdosCfgDao.xml | 3 + .../java/com/nis/web/service/BaseService.java | 11 ++++ .../resources/messages/message_en.properties | 3 +- .../resources/messages/message_ru.properties | 3 +- .../messages/message_zh_CN.properties | 3 +- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 58 +++++++++++++++---- 8 files changed, 70 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index a5796b722..3e8a717f1 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -451,6 +451,7 @@ public class ConfigServiceUtil { JSONObject resObject = JSONObject.fromObject(result); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); }else{ + logger.info("获取文件摘要响应结果"+result); throw new MaatConvertException(":"+result); } } catch (Exception e) { diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index b8f863adb..5c5539cc5 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3276,6 +3276,7 @@ public class BaseController { || baseCfg.getFunctionId().equals(3)) { //IP WHITELIST pageResult=ipCfgService.getIpCfgList(searchPage,searchCfg); }else if(baseCfg.getFunctionId().equals(212) //IP Payload + || baseCfg.getFunctionId().equals(214) //IP Replace || baseCfg.getFunctionId().equals(7) //DNS || baseCfg.getFunctionId().equals(8)//HTTP ADVANCED || baseCfg.getFunctionId().equals(635) //HTTP 关键字 @@ -3393,7 +3394,7 @@ public class BaseController { cfg.setAuditTime(entity.getAuditTime()); newList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); ids.add(cfg.getCompileId()); - newList.add(cfg); + /*newList.add(cfg);*/ } }else if(className.equals("PxyObjTrustedCaCert")){ list = pxyObjKeyringService.findTrustedCertPage(page,searchTrustedCaCertCfg).getList(); diff --git a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml index 155f3921a..3ce97c1bc 100644 --- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml @@ -193,6 +193,9 @@ + + SELECT LAST_INSERT_ID() + insert into ddos_ip_cfg ( CFG_DESC, ACTION, diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index df92c4198..af2fed8a0 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -2636,6 +2636,8 @@ public abstract class BaseService { } } } + long start=System.currentTimeMillis(); + long end=System.currentTimeMillis(); if (send) { if(configCompileList.size() > 0) { ToMaatBean maatBean = new ToMaatBean(); @@ -2644,6 +2646,7 @@ public abstract class BaseService { maatBean.setCreatorName(UserUtils.getUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); + start=System.currentTimeMillis(); // 调用服务接口下发配置数据 String json = BaseService.gsonToJson(maatBean); if(configCompileList.size()>10) { @@ -2652,8 +2655,11 @@ public abstract class BaseService { logger.info("IP 配置下发配置参数：" + json); } // 调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); logger.info("IP 配置下发响应信息：" + result.getMsg()); + end=System.currentTimeMillis(); + logger.info("IP 配置下发配置耗时：" + (end-start)); }else { //调用服务接口下发配置数据 String json=gsonToJson(callbackIpList); @@ -2743,6 +2749,8 @@ public abstract class BaseService { } } + long start=System.currentTimeMillis(); + long end=System.currentTimeMillis(); if (send && configCompileList.size() > 0) { ToMaatBean maatBean = new ToMaatBean(); maatBean.setConfigCompileList(configCompileList); @@ -2750,6 +2758,7 @@ public abstract class BaseService { maatBean.setCreatorName(UserUtils.getUser().getName()); maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.INSERT_ACTION); + start=System.currentTimeMillis(); // 调用服务接口下发配置数据 String json = BaseService.gsonToJson(maatBean); if(configCompileList.size()>10) { @@ -2760,6 +2769,8 @@ public abstract class BaseService { // 调用服务接口下发配置 ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); logger.info("字符串配置下发响应信息：" + result.getMsg()); + end=System.currentTimeMillis(); + logger.info("字符串配置下发配置耗时：" + (end-start)); } batchSqlSession.commit(); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index b8898478b..d3a1a5cdb 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1498,4 +1498,5 @@ is_schduler=Scheduler v4_num=IPv4 Number v6_num=IPv6 Number always=Permanent -schedule=Scheduler \ No newline at end of file +schedule=Scheduler +cancel_all=Cancel all configurations! \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 11c33dd11..7d11a31e8 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1503,4 +1503,5 @@ validate_error=Unexpected error occurred while validating v4_num=IPv4 Number v6_num=IPv6 Number always=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E -schedule=Scheduler \ No newline at end of file +schedule=Scheduler +cancel_all=Cancel all configurations! \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index a19bce9c9..2a4e6ebb8 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1495,4 +1495,5 @@ validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF v4_num=IPv4 Number v6_num=IPv6 Number always=\u957F\u671F -schedule=Scheduler \ No newline at end of file +schedule=Scheduler +cancel_all=Cancel all configurations! \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 03f8c2e0f..931a867c2 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -247,19 +247,55 @@ function cancelPassOpt(url){ } }else{ + url=url+"&" //批量下发待测试 - if(url.indexOf("functionId=6") > -1 //http url - || url.indexOf("functionId=5") > -1 //dns - || url.indexOf("functionId=7") > -1 //dns - || url.indexOf("functionId=37") > -1 //mail address - || url.indexOf("functionId=35") > -1 //mail advanced - || url.indexOf("functionId=210") > -1 //https monitor - || url.indexOf("functionId=207") > -1 //mail block - || url.indexOf("functionId=208") > -1 //mail redirect - || url.indexOf("functionId=209") > -1 //mail replace - || url.indexOf("functionId=211") > -1 //mail whitelist + if( url.indexOf("functionId=3&") > -1 //ip whitelist + || url.indexOf("functionId=5&") > -1 //ip + || url.indexOf("functionId=212&") > -1 //ip + || url.indexOf("functionId=214&") > -1 //ip + || url.indexOf("functionId=6&") > -1 //http url + || url.indexOf("functionId=7&") > -1 //dns + || url.indexOf("functionId=37&") > -1 //mail address + || url.indexOf("functionId=35&") > -1 //mail advanced + || url.indexOf("functionId=210&") > -1 //https monitor + || url.indexOf("functionId=207&") > -1 //https block + || url.indexOf("functionId=208&") > -1 //https redirect + || url.indexOf("functionId=209&") > -1 //https replace + || url.indexOf("functionId=211&") > -1 //https whitelist + || url.indexOf("functionId=407&") > -1 //Protocol Identify + || url.indexOf("functionId=63&") > -1 //App Identify + || url.indexOf("functionId=408&") > -1 //Behavior Identify + || url.indexOf("functionId=61&") > -1 //BGP + || url.indexOf("functionId=34&") > -1 //SSL + || url.indexOf("functionId=635&") > -1 //Website Keyword + || url.indexOf("functionId=8&") > -1 //HTTP Advanced + || url.indexOf("functionId=51&") > -1 //FTP + || url.indexOf("functionId=510&") > -1 //P2P + || url.indexOf("functionId=22&") > -1 //Streaming media + || url.indexOf("functionId=24&") > -1 //VoIP + || url.indexOf("functionId=52&") > -1 //File Digest + || url.indexOf("functionId=28&") > -1 //Audio Sample + || url.indexOf("functionId=29&") > -1 //Video Sample + || url.indexOf("functionId=30&") > -1 //Picture Sample + || url.indexOf("functionId=31&") > -1 //VoIP Voice Sample + || url.indexOf("functionId=630&") > -1 //Speaker Recognization + || url.indexOf("functionId=631&") > -1 //Logo Detection + || url.indexOf("functionId=632&") > -1 //Face Recognization + || url.indexOf("functionId=301&") > -1 //DDOS + || url.indexOf("functionId=200&") > -1 //Intercept Policy + || url.indexOf("functionId=210&") > -1 //HTTPS monitor + || url.indexOf("functionId=207&") > -1 //HTTPS block + || url.indexOf("functionId=208&") > -1 //HTTPS Redirect + || url.indexOf("functionId=209&") > -1 //HTTPS Replace + || url.indexOf("functionId=211&") > -1 //whitelist + || url.indexOf("functionId=213&") > -1 //Cache + || url.indexOf("functionId=560&") > -1 //Focused Website + || url.indexOf("functionId=400&") > -1 //DNS Response Profiles + || url.indexOf("functionId=401&") > -1 //Spoofing IP + || url.indexOf("functionId=570&") > -1 //Key Ring + || url.indexOf("functionId=571&") > -1 //Trusted Certificate ){ - top.$.jBox.confirm("","",function(v,h,f){ + top.$.jBox.confirm("","",function(v,h,f){ if(v=="ok"){ $("#searchForm").attr("action",url); page();