From e5e63af73857f7eab3613c7f8e704500303c4c2c Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 25 Jan 2019 14:27:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8A=A8=E6=80=81ip=E6=B1=A0=EF=BC=8C=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9cfgid=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/truncate_tables.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index 3e7935cdc..52c1a954d 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -70,4 +70,7 @@ DELETE FROM service_dict_info where item_type='5'; -- 由于DNS策略组的组号也需要大于100，所以策略分组的主键自增从101开始 ALTER TABLE policy_group_info auto_increment = 101; -- 清空asn号分组表 -DELETE FROM asn_group_info; \ No newline at end of file +DELETE FROM asn_group_info; +-- 默认动态IP地址池 +INSERT INTO `ip_reuse_addr_pool` (`cfg_id`, `addr_pool_name`, `ip_total`, `action`, `is_valid`, `is_audit`, `cfg_region_code`, `cfg_type`, `function_id`, `service_id`, `compile_id`, `is_area_effective`, `area_effective_ids`, `request_id`, `classify`, `attribute`, `lable`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `description`, `cancel_request_id`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`) VALUES ('0', 'dynamic_pool', '1', '96', '1', '1', '1', 'IR_STATIC_NOMINEE_IP', '633', '834', '0', '0', '', '0', '0', '0', '0', '0', '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', NULL, '', '', '', '', ''); +UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_nam= 'dynamic_pool'; From 3daab5e49d7cd5d526c280d8811e69442fb1e9f0 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 25 Jan 2019 14:31:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?add=5Fpool=5Fnam=E8=A1=A5=E5=85=85=E5=AE=8C?= =?UTF-8?q?=E6=95=B4add=5Fpool=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/truncate_tables.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index 52c1a954d..23ba1bf78 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -73,4 +73,4 @@ ALTER TABLE policy_group_info auto_increment = 101; DELETE FROM asn_group_info; -- 默认动态IP地址池 INSERT INTO `ip_reuse_addr_pool` (`cfg_id`, `addr_pool_name`, `ip_total`, `action`, `is_valid`, `is_audit`, `cfg_region_code`, `cfg_type`, `function_id`, `service_id`, `compile_id`, `is_area_effective`, `area_effective_ids`, `request_id`, `classify`, `attribute`, `lable`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `description`, `cancel_request_id`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`) VALUES ('0', 'dynamic_pool', '1', '96', '1', '1', '1', 'IR_STATIC_NOMINEE_IP', '633', '834', '0', '0', '', '0', '0', '0', '0', '0', '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', NULL, '', '', '', '', ''); -UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_nam= 'dynamic_pool'; +UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_name= 'dynamic_pool'; From e2e6ebfac18675f5f9aed2e7edb6892952da18b3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 25 Jan 2019 14:42:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=AF=B9=E9=BD=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/static/pages/css/data_text.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css index bd60caee7..a790046ba 100644 --- a/src/main/webapp/static/pages/css/data_text.css +++ b/src/main/webapp/static/pages/css/data_text.css @@ -257,7 +257,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_1 .fl_fc .numberRun1 .mt-number-unit{ @@ -266,7 +266,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_2 .fl_fc .mt-number-unit{ @@ -275,7 +275,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_1 .fl_fc .csNum{ From cb9cf1eac858a5e1a9851127c8bd04c14305ca5f Mon Sep 17 00:00:00 2001 From: zhangwei Date: Fri, 25 Jan 2019 13:54:39 +0600 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9doLog=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 7 ++++--- src/main/resources/messages/message_ru.properties | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7440c2c76..6020fa658 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1409,7 +1409,7 @@ unique_num=Unique IP import_limit_is=The maximum import size is upload_limit_is=The limitation of file uplaod is count=Count -do_blacklist=Blacklist Option +do_blacklist=Auto Blacklist l3_header_error=Only four attribute values are allowed to be entered at most IP_HEADER=IP Header ICMP_HEADER=ICMP Header @@ -1467,7 +1467,7 @@ not_exist=not exist real_time=Real Time history=History all_columns_hidden=All columns are hidden! -no_log=Disabled +no_log=None all_log=Metadata and Snapshot framework_log=Metadata block_drop=Block(Drop) @@ -1491,4 +1491,5 @@ single=Single everyDay=Every Day everyWeek=Every Week everyMonth=Every Month -validate_error=Unexpected error occurred while validating \ No newline at end of file +validate_error=Unexpected error occurred while validating +Is_schduler=Scheduler \ 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 e84fdad6e..93ea08751 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1471,9 +1471,9 @@ not_exist=\u041D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0 real_time=\u0412 \u0440\u0435\u0430\u043B\u044C\u043D\u043E\u043C \u0432\u0440\u0435\u043C\u0435\u043D\u0438 history=\u0418\u0441\u0442\u043E\u0440\u0438\u044F all_columns_hidden=\u0412\u0441\u0435 \u0441\u0442\u043E\u043B\u0431\u0446\u044B \u0441\u043A\u0440\u044B\u0442\u044B! -no_log=\u041d\u0435\u0442 \u0416\u0443\u0440\u043d\u0430\u043b\u043e\u0432 -all_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0416\u0443\u0440\u043d\u0430\u043b \u0438 \u0416\u0443\u0440\u043d\u0430\u043b-\u0444\u0430\u0439\u043b -framework_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0416\u0443\u0440\u043d\u0430\u043b +no_log=\u041D\u0435 +all_log=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 \u0438 \u0421\u043D\u0438\u043C\u043E\u043A +framework_log=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435) mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438 From 1cc0a4f2eaf6c7cb65f09f6fc70bf41e1bc87fbf Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Sat, 26 Jan 2019 10:27:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?ddos=E6=97=A5=E5=BF=97=E5=8E=BB=E6=8E=89cli?= =?UTF-8?q?ent=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=94=BB?= =?UTF-8?q?=E5=87=BB=E7=B1=BB=E5=9E=8B=E5=9C=A8=E5=AD=97=E5=85=B8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E7=BD=AE=E4=BF=9D=E7=95=99DNS=5FFlood?= =?UTF-8?q?=EF=BC=8CNTP=5FFlood=EF=BC=8CSYN=5FFlood?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index fe013ce79..3c37bbb7a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -192,12 +192,12 @@ $(document).ready(function(){ -
+ <%--
-
+
--%>
@@ -209,8 +209,6 @@ $(document).ready(function(){
- -
From 0cbe9c7ff71834badfde6664bc8a973afa4683b6 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Sat, 26 Jan 2019 11:56:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAPP=E7=89=B9=E5=BE=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/controller/BaseController.java | 11 +++++++++-- .../controller/configuration/ntc/IpController.java | 8 +++++++- src/main/java/com/nis/web/service/BaseService.java | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index a103b307a..522917bd7 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1537,7 +1537,8 @@ public class BaseController { }else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing BlockingQueue list = ei.getDataList(IpSpoofingTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,null, list); - }else if(regionDict.getFunctionId().equals(405)) { // APP IP + }else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565) + || regionDict.getFunctionId().equals(566)) { // APP Feature IP BlockingQueue list = ei.getDataList(IpAllNotDoLogTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,null, list); }else { @@ -1605,6 +1606,9 @@ public class BaseController { } else if(regionDict.getFunctionId().equals(563)){// APP Payload BlockingQueue list = ei.getDataList(AppPayloadTemplate.class); appComplexFeatureCfgs = this.checkAppComplexFeatureStringCfgMulity(errTip,serviceDict, regionDict, list); + } else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature StrPlus + BlockingQueue list = ei.getDataList(ComplexStringAllNotDoLogTemplate.class); + complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list); } else { BlockingQueue list = ei.getDataList(ComplexStringAllTemplate.class ); @@ -2470,7 +2474,8 @@ public class BaseController { ei.loadInitParams(IpWhitelistTemplate.class, msgProp, regionDict, serviceDict); } else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing ei.loadInitParams(IpSpoofingTemplate.class, msgProp, regionDict, serviceDict); - } else if(regionDict.getFunctionId().equals(405)) { // APP IP + } else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565) + || regionDict.getFunctionId().equals(566)) { // APP Feature IP ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict); } else { ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict); @@ -2516,6 +2521,8 @@ public class BaseController { ei.loadInitParams(ComplexStringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict); }else if(regionDict.getFunctionId().equals(563)) {// APP Payload ei.loadInitParams(AppPayloadTemplate.class, this.getMsgProp(), regionDict, serviceDict); + }else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature StrPlus + ei.loadInitParams(ComplexStringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict); } else { ei.loadInitParams(ComplexStringAllTemplate.class, msgProp, regionDict, serviceDict); } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index ffa9f17c5..fda97e046 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -423,7 +423,8 @@ public class IpController extends BaseController{ ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpSpoofingTemplate.class, 2); excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); - }else if(regionDict.getFunctionId().equals(405)) { // APP IP + }else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565) + || regionDict.getFunctionId().equals(566)) { // APP Feature IP List classList=new ArrayList(); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2); excel.setDataList(pro,classList,null). @@ -529,6 +530,11 @@ public class IpController extends BaseController{ ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AppPayloadTemplate.class, 2); excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); + }else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature + List classList=new ArrayList(); + ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, ComplexStringAllNotDoLogTemplate.class, 2); + excel.setDataList(pro,classList,null). + write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, ComplexStringAllTemplate.class, 2); diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index dea8de664..09b9c9ad8 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -2138,6 +2138,7 @@ public abstract class BaseService { long start=System.currentTimeMillis(); ConfigGroupInfo configGroupInfo=configGroupInfoDao.getConfigGroupInfoByGroupId(specificServiceCfg.getGroupId()); if(configGroupInfo==null) {//涓鑸壒瀹氭湇鍔＄殑缁勫彿鏄柊澧炰箣鍚庡氨鏈夌殑锛屼笉浼氳繘鍏ヨ繖涓姝ャ + Date date = new Date(); Integer groupId = ConfigServiceUtil.getId(2, 1).get(0); Integer compileId=ConfigServiceUtil.getId(1, 1).get(0); specificServiceCfg.setGroupId(groupId); @@ -2147,9 +2148,10 @@ public abstract class BaseService { configGroupInfo.setIsIssued(0); configGroupInfo.setGroupType(1); configGroupInfo.setCompileId(compileId); + configGroupInfo.setInsertTime(date); configGroupInfoDao.insertConfigGroupInfo(configGroupInfo); //鏇存柊group_id - specificServiceCfg.setOpTime(new Date()); + specificServiceCfg.setOpTime(date); specificServiceCfgDao.update(specificServiceCfg); } Integer compileId = configGroupInfo.getCompileId();