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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
chenjinsong
2018-03-26 16:08:21 +08:00
parent 1736858c4e 51b00dc3f2
commit 00b8bc9a3e
12 changed files with 125 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,47 @@ sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
specific_service_cfg=specific service cfg
features_area=features area
attribute_manage=attribute manage
isp_manage=isp manage
feature_scope_manage=feature scope manage
plaintext_manage=plaintext manage
ip_multiple_control=ip multiple control
ip_port_control=ip port control
website_multiple_control=website multiple control
mail_multiple_control=mail multiple control
request_header_control=request header control
plaintext_monitor=plaintext monitor
ip_address_monitor=ip address monitor
ip_port_monitor=ip port monitor
domain_monitor=domain monitor
dns_monitor=dns monitor
dns_response_monitor=dns response monitor
website_monite=website monite
host_monitor=host monitor
url_monitor=url monitor
website_keyword_monitor=website keyword monitor
mail_monitor=mail monitor
recipient_monitor=recipient monitor
sender_monitor=sender monitor
subject_monitor=subject monitor
mail_keyword_monitor=mail keyword monitor
mail_attachment_name_monitor=mail attachment name monitor
specific_service_cfg=specific service cfg
mail_attachment_content_monitor=mail attachment content monitor
file_transfer_monitor=file transfer monitor
ftp_address_monitor=ftp address monitor
encryption_monitor=encryption monitor
tunnel_protocol_monitor=tunnel protocol monitor
pptp_ip_monitor=pptp ip monitor
l2tp_ip_monitor=l2tp ip monitor
ssh_monitor=ssh monitor
ssl_monitor=ssl monitor
ssl_feature_monitor=ssl feature monitor
ssl_sni_monitor=ssl sni monitor
ssl_address_monitor=ssl address monitor
specific_service_host_cfg=specific service host cfg
#============menu end======================
#============yewu begin======================

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

@@ -96,6 +96,47 @@ sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
specific_service_cfg=specific service cfg
features_area=features area
attribute_manage=attribute manage
isp_manage=isp manage
feature_scope_manage=feature scope manage
plaintext_manage=plaintext manage
ip_multiple_control=ip multiple control
ip_port_control=ip port control
website_multiple_control=website multiple control
mail_multiple_control=mail multiple control
request_header_control=request header control
plaintext_monitor=plaintext monitor
ip_address_monitor=ip address monitor
ip_port_monitor=ip port monitor
domain_monitor=domain monitor
dns_monitor=dns monitor
dns_response_monitor=dns response monitor
website_monite=website monite
host_monitor=host monitor
url_monitor=url monitor
website_keyword_monitor=website keyword monitor
mail_monitor=mail monitor
recipient_monitor=recipient monitor
sender_monitor=sender monitor
subject_monitor=subject monitor
mail_keyword_monitor=mail keyword monitor
mail_attachment_name_monitor=mail attachment name monitor
specific_service_cfg=specific service cfg
mail_attachment_content_monitor=mail attachment content monitor
file_transfer_monitor=file transfer monitor
ftp_address_monitor=ftp address monitor
encryption_monitor=encryption monitor
tunnel_protocol_monitor=tunnel protocol monitor
pptp_ip_monitor=pptp ip monitor
l2tp_ip_monitor=l2tp ip monitor
ssh_monitor=ssh monitor
ssl_monitor=ssl monitor
ssl_feature_monitor=ssl feature monitor
ssl_sni_monitor=ssl sni monitor
ssl_address_monitor=ssl address monitor
specific_service_host_cfg=specific service host cfg
#============menu end======================
#============yewu begin======================

31
src/main/resources/messages/message_zh_CN.properties
View File

@@ -96,6 +96,37 @@ sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406
service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
specific_service_cfg=\u7279\u5b9a\u670d\u52a1\u7ba1\u7406
request_header_control=\u8bf7\u6c42\u5934\u57df\u7ba1\u63a7
plaintext_monitor=\u660e\u6587\u5185\u5bb9\u76d1\u6d4b
ip_address_monitor=IP\u5730\u5740\u76d1\u6d4b
ip_port_monitor=IP+\u7aef\u53e3\u76d1\u6d4b
domain_monitor=\u57df\u540d\u76d1\u6d4b
dns_monitor=DNS\u76d1\u6d4b
dns_response_monitor=DNS\u5e94\u7b54\u76d1\u6d4b
website_monite=\u7f51\u7ad9\u76d1\u6d4b
host_monitor=HOST\u76d1\u6d4b
url_monitor=URL\u76d1\u6d4b
website_keyword_monitor=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b
mail_monitor=\u90ae\u4ef6\u76d1\u6d4b
recipient_monitor=\u6536\u4ef6\u4eba\u76d1\u6d4b
sender_monitor=\u53d1\u4ef6\u4eba\u76d1\u6d4b
subject_monitor=\u4e3b\u9898\u76d1\u6d4b
mail_keyword_monitor=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b
mail_attachment_name_monitor=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u76d1\u6d4b
mail_attachment_content_monitor=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u76d1\u6d4b
file_transfer_monitor=\u6587\u4ef6\u4f20\u8f93\u76d1\u6d4b
ftp_address_monitor=FTP\u5730\u5740\u76d1\u6d4b
encryption_monitor=\u52a0\u5bc6\u5185\u5bb9\u76d1\u6d4b
tunnel_protocol_monitor=\u96a7\u9053\u534f\u8bae\u76d1\u6d4b
pptp_ip_monitor=PPTP\u534f\u8bae\u76d1\u6d4b
l2tp_ip_monitor=L2TP\u534f\u8bae\u76d1\u6d4b
ssh_monitor=SSH\u76d1\u6d4b
ssl_monitor=SSL\u76d1\u6d4b
ssl_feature_monitor=SSL\u8bc1\u4e66\u7279\u5f81\u76d1\u6d4b
ssl_sni_monitor=SSL\uff08SNI\uff09\u76d1\u6d4b
ssl_address_monitor=SSL\u5730\u5740\u76d1\u6d4b
specific_service_host_cfg=\u7279\u5b9a\u670d\u52a1\u670d\u52a1\u5668IP\u7ba1\u7406
#==========menu end=====================
#==========yewu zidian begin=====================

2
src/main/webapp/WEB-INF/include/form/complexInfo.jsp
View File

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

2
src/main/webapp/WEB-INF/include/form/ipInfo.jsp
View File

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

2
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

6
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -14,9 +14,6 @@ $(function(){
});
$("#cfgFrom").validate({
rules: {
'cfgDesc':{
required:true
},
'keywords':{
required:true
},
@@ -34,9 +31,6 @@ $(function(){
}
},
messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'keywords':{
required:'<spring:message code="required"/>'
},

6
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -109,7 +109,7 @@
</div> --%>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -248,7 +248,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
@@ -271,7 +271,7 @@
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td>
<%-- <td>${cfg.district }</td> --%>
<td>${cfg.keywords }</td>

6
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -62,9 +62,6 @@ $(function(){
});
$("#ipCfgFrom").validate({
rules: {
cfgDesc: {
required: true,
},
ipType: {
required: true,
},
@@ -114,9 +111,6 @@ $(function(){
},
messages: {
cfgDesc: {
required: '<spring:message code="required"/>',
},
ipType: {
required: '<spring:message code="required"/>',
},

6
src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
View File

@@ -153,7 +153,7 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -300,7 +300,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th>ip<spring:message code="type"/></th>
<th><spring:message code="client_ip"/></th>
@@ -343,7 +343,7 @@
<tbody>
<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
<tr pId="${status.index}">
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${ipCfg.cfgDesc }</td>
<td>V${ipCfg.ipType }</td>
<td>${ipCfg.srcIp }</td>

6
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -7,9 +7,6 @@
$(function(){
$("#cfgFrom").validate({
rules: {
'cfgDesc':{
required:true
},
'cfgKeywords':{
required:true
},
@@ -33,9 +30,6 @@ $(function(){
}
},
messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'cfgKeywords':{
required:'<spring:message code="required"/>'
},

6
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -110,7 +110,7 @@
</div> --%>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -257,7 +257,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
@@ -286,7 +286,7 @@
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>