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/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 diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index 3e7935cdc..23ba1bf78 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_name= 'dynamic_pool'; 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(){
- -
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{