gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
duandongmei
2019-01-26 10:48:13 +06:00
parent 89f92e99fc 5786412116
commit 85633ee524
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -423,7 +423,8 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpSpoofingTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpSpoofingTemplate.class, 2);
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose(); 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<IpAllNotDoLogTemplate> classList=new ArrayList<IpAllNotDoLogTemplate>(); List<IpAllNotDoLogTemplate> classList=new ArrayList<IpAllNotDoLogTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null). 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); ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AppPayloadTemplate.class, 2);
excel.setDataList(pro,classList,null). excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose(); write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature
List<ComplexStringAllNotDoLogTemplate> classList=new ArrayList<ComplexStringAllNotDoLogTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, ComplexStringAllNotDoLogTemplate.class, 2);
excel.setDataList(pro,classList,null).
write(request,response, fileName).dispose();
}else{ }else{
List<ComplexStringAllTemplate> classList=new ArrayList<ComplexStringAllTemplate>(); List<ComplexStringAllTemplate> classList=new ArrayList<ComplexStringAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, ComplexStringAllTemplate.class, 2); ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, ComplexStringAllTemplate.class, 2);

7
src/main/resources/messages/message_en.properties
View File

@@ -1409,7 +1409,7 @@ unique_num=Unique IP
import_limit_is=The maximum import size is import_limit_is=The maximum import size is
upload_limit_is=The limitation of file uplaod is upload_limit_is=The limitation of file uplaod is
count=Count count=Count
do_blacklist=Blacklist Option do_blacklist=Auto Blacklist
l3_header_error=Only four attribute values are allowed to be entered at most l3_header_error=Only four attribute values are allowed to be entered at most
IP_HEADER=IP Header IP_HEADER=IP Header
ICMP_HEADER=ICMP Header ICMP_HEADER=ICMP Header
@@ -1467,7 +1467,7 @@ not_exist=not exist
real_time=Real Time real_time=Real Time
history=History history=History
all_columns_hidden=All columns are hidden! all_columns_hidden=All columns are hidden!
no_log=Disabled no_log=None
all_log=Metadata and Snapshot all_log=Metadata and Snapshot
framework_log=Metadata framework_log=Metadata
block_drop=Block(Drop) block_drop=Block(Drop)
@@ -1491,4 +1491,5 @@ single=Single
everyDay=Every Day everyDay=Every Day
everyWeek=Every Week everyWeek=Every Week
everyMonth=Every Month everyMonth=Every Month
validate_error=Unexpected error occurred while validating validate_error=Unexpected error occurred while validating
Is_schduler=Scheduler

6
src/main/resources/messages/message_ru.properties
View File

@@ -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 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 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! 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 no_log=\u041D\u0435
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 all_log=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 \u0438 \u0421\u043D\u0438\u043C\u043E\u043A
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 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) 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 mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b
ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438 ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438

5
src/main/resources/sql/truncate_tables.sql
View File

@@ -70,4 +70,7 @@ DELETE FROM service_dict_info where item_type='5';
-- <20><><EFBFBD><EFBFBD>DNS<4E><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD>Բ<EFBFBD><D4B2>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>101<30><31>ʼ -- <20><><EFBFBD><EFBFBD>DNS<4E><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD>Բ<EFBFBD><D4B2>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>101<30><31>ʼ
ALTER TABLE policy_group_info auto_increment = 101; ALTER TABLE policy_group_info auto_increment = 101;
-- <20><><EFBFBD><EFBFBD>asn<73>ŷ<EFBFBD><C5B7><EFBFBD><EFBFBD><EFBFBD> -- <20><><EFBFBD><EFBFBD>asn<73>ŷ<EFBFBD><C5B7><EFBFBD><EFBFBD><EFBFBD>
DELETE FROM asn_group_info; DELETE FROM asn_group_info;
-- Ĭ<>϶<EFBFBD>̬IP<49><50>ַ<EFBFBD><D6B7>
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';

6
src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
View File

@@ -192,12 +192,12 @@ $(document).ready(function(){
<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/> <input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
</div> </div>
</div> </div>
<div class="col-md-2"> <%-- <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label><spring:message code="clientip"/>：</label> <label><spring:message code="clientip"/>：</label>
<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/> <input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
</div> </div>
</div> </div> --%>
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label><spring:message code="attack_type"/>：</label> <label><spring:message code="attack_type"/>：</label>
@@ -209,8 +209,6 @@ $(document).ready(function(){
</form:select> </form:select>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label><spring:message code="cfg_id"></spring:message>：</label> <label><spring:message code="cfg_id"></spring:message>：</label>

6
src/main/webapp/static/pages/css/data_text.css
View File

@@ -257,7 +257,7 @@ p{
/*color:#288dce;*/ /*color:#288dce;*/
color:#ffffff; color:#ffffff;
margin-top: 0.3px; margin-top: 0.3px;
position: fixed; position:absolute;
} }
.data_content .data_info>div.info_1 .fl_fc .numberRun1 .mt-number-unit{ .data_content .data_info>div.info_1 .fl_fc .numberRun1 .mt-number-unit{
@@ -266,7 +266,7 @@ p{
/*color:#288dce;*/ /*color:#288dce;*/
color:#ffffff; color:#ffffff;
margin-top: 0.3px; margin-top: 0.3px;
position: fixed; position:absolute;
} }
.data_content .data_info>div.info_2 .fl_fc .mt-number-unit{ .data_content .data_info>div.info_2 .fl_fc .mt-number-unit{
@@ -275,7 +275,7 @@ p{
/*color:#288dce;*/ /*color:#288dce;*/
color:#ffffff; color:#ffffff;
margin-top: 0.3px; margin-top: 0.3px;
position: fixed; position:absolute;
} }
.data_content .data_info>div.info_1 .fl_fc .csNum{ .data_content .data_info>div.info_1 .fl_fc .csNum{