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://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时，无预配置也可提交的bug
This commit is contained in:
duandongmei
2018-10-04 13:13:00 +08:00
parent e6c8e78134 4c1bcce61d
commit 6fb3d05a92
70 changed files with 216 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -266,9 +266,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
List<SysMenu> list = UserUtils.getMenuList();
if(!StringUtil.isEmpty(list)) {
for (SysMenu menu :list) {
if (!StringUtil.isEmpty(menu.getCode()) && !StringUtil.isEmpty(menu.getFunctionId()) &&menu.getFunctionId().equals(functionId)) {
if (!StringUtil.isEmpty(menu.getCode())
&& !StringUtil.isEmpty(menu.getFunctionId())
&& menu.getFunctionId().equals(functionId)
//&& menu.getFunctionId().equals(functionId)
) {
this.setMenuNameCode(menu.getCode());
break;
}
}

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

@@ -1179,7 +1179,7 @@ protocol_note=Note:Recognizable Protocols Include SIP,RTCP,RTP.
snat_multiplex=SNAT Address Pool
dnat_multiplex=DNAT Address Pool
asn_reject=ASN Reject
asn_monit=ASN Monit
asn_monit=ASN Monitoring
ip_payload=IP Payload
streaming_media=Streaming Media
access_policy=Access Policy
@@ -1194,4 +1194,4 @@ APP_DK_GL=APP DK GL Admin
dnat_ip_complex_loop=DNAT Complex Loop
snat_ip_complex_loop=SNAT Complex Loop
snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop

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

@@ -1175,7 +1175,7 @@ APP_SSL=APP SSL Feature
APP_IP_RANGE=APP IP RANGE
APP_DK=APP DK Feature
asn_reject=ASN Reject
asn_monit=ASN Monit
asn_monit=ASN Monitoring
MM_SUBSCRIBE_ID=Subscribe ID
mail_note=Note:Identifiable Protocols Include SMTP,POP3,IMAP.
av_content_url_note=Note:Identifiable Protocols Include RTSP,TRMP,MMS.
@@ -1196,4 +1196,4 @@ APP_DK_GL=APP DK GL Admin
dnat_ip_complex_loop=DNAT Complex Loop
snat_ip_complex_loop=SNAT Complex Loop
snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop

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

@@ -1188,4 +1188,4 @@ APP_DNS_ADMIN=APP DNS Admin
APP_SSL_ADMIN=APP SSL Admin
APP_DK_GL=APP\u591A\u7528\u9014\u6807\u7B7E
dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41

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

@@ -55,4 +55,8 @@ DELETE FROM pptp_url_cfg;
DELETE FROM proxy_file_strategy_cfg;
DELETE FROM ssl_keyword_cfg;
DELETE FROM pxy_obj_keyring;
DELETE FROM intercept_pkt_bin;
DELETE FROM intercept_pkt_bin;
DELETE FROM app_feature_index;
DELETE FROM app_complex_feature_cfg;
DELETE FROM app_ip_range_cfg;
DELETE FROM app_string_feature_cfg;

4
src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
View File

@@ -37,9 +37,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<h3 class="page-title">
<spring:message code="policy_group_manage"></spring:message>
</h3> --%>
</h3>
<div class="row">
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -153,7 +153,7 @@ label.errorShow {
</div>
<%-- <h3 class="page-title">
<h3 class="page-title">
<c:if test="${itType==1 }">
<spring:message code="classification"/>
<c:set var="title" value="classification"></c:set>
@@ -166,7 +166,7 @@ label.errorShow {
<spring:message code="label"/>
<c:set var="title" value="label"></c:set>
</c:if>
</h3> --%>
</h3>
<div class="row">
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -110,7 +110,7 @@
</div>
<%-- <h3 class="page-title">
<h3 class="page-title">
<c:if test="${itType==1 }">
<spring:message code="area"/>
<c:set var="title" value="area"></c:set>
@@ -119,7 +119,7 @@
<spring:message code="isp"/>
<c:set var="title" value="isp"></c:set>
</c:if>
</h3> --%>
</h3>
<div class="row">
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
View File

@@ -9,9 +9,9 @@
<div class="page-content">
<div class="row">
<%-- <h3 class="page-title">
<h3 class="page-title">
<spring:message code="special_task"/>
</h3> --%>
</h3>
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">

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

@@ -71,9 +71,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
View File

@@ -75,7 +75,7 @@
</div>
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
View File

@@ -16,7 +16,7 @@ $(function(){
<div class="page-content">
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">

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

@@ -28,9 +28,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ASN"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="ASN"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
View File

@@ -63,7 +63,7 @@ $(function(){
<div class="page-content">
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
<spring:message code="av_sample_video_porn_control"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -143,9 +143,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="av_voip_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="protocol_note"></spring:message></span>
<div class="row">
<div class="col-md-12">

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

@@ -64,7 +64,7 @@
</div>
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

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

@@ -32,9 +32,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="target_ip_protect"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
View File

@@ -68,7 +68,7 @@
</div>
<h3 class="page-title">
<spring:message code="target_ip_protect"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

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

@@ -32,9 +32,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ip_spoofing_configuration"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -65,7 +65,7 @@
</div>
<h3 class="page-title">
<spring:message code="ip_spoofing_configuration"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

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

@@ -99,9 +99,9 @@
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="file_digest_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -98,7 +98,7 @@
</div>
<h3 class="page-title">
<spring:message code="file_digest_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

12
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -39,8 +39,12 @@
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(($(".boxSolid").length-1) == ($(".boxSolid.hidden").length-subscribeId)){
if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
@@ -128,9 +132,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ftp_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
View File

@@ -99,7 +99,7 @@
</div>
<h3 class="page-title">
<spring:message code="ftp_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

12
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -33,8 +33,12 @@
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(($(".boxSolid").length-1) == ($(".boxSolid.hidden").length-subscribeId)){
if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
@@ -122,9 +126,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="p2p_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="p2p_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -79,9 +79,9 @@ var switchKeyringType=function(){
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="pxy_intercept_monit_keyring"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
View File

@@ -48,7 +48,7 @@
</div>
<h3 class="page-title">
<spring:message code="pxy_intercept_monit_keyring"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/cfg/ipBlockForm.jsp
View File

@@ -9,9 +9,9 @@
<div class="page-content">
<!-- <h3 class="page-title">
<h3 class="page-title">
Managed Datatables <small>managed datatable samples</small>
</h3> -->
</h3>
<div class="row">
<div class="col-md-12">

4
src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
View File

@@ -69,9 +69,9 @@
</head>
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<h3 class="page-title">
<spring:message code="ip address"></spring:message>
</h3> --%>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

12
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -160,7 +160,11 @@
subscribeId=1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
/* if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
/* var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
} */
@@ -373,9 +377,9 @@ var processAction=function(configType,obj){
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ip_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="ip_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

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

@@ -62,9 +62,9 @@ $(function(){
</head>
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

12
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -45,8 +45,12 @@
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
@@ -134,9 +138,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="mail_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="mail_note"></spring:message></span>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -96,7 +96,7 @@
</div>
<h3 class="page-title">
<spring:message code="mail_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
View File

@@ -72,9 +72,9 @@ $(function(){
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="dns_res_strategy"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
View File

@@ -51,7 +51,7 @@
</div>
<h3 class="page-title">
<spring:message code="dns_res_strategy"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
View File

@@ -32,9 +32,9 @@ $(function(){
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="snat_multiplex"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
View File

@@ -50,7 +50,7 @@
</div>
<h3 class="page-title">
<spring:message code="dnat_multiplex"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
View File

@@ -32,9 +32,9 @@ $(function(){
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="snat_multiplex"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
View File

@@ -50,7 +50,7 @@
</div>
<h3 class="page-title">
<spring:message code="snat_multiplex"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp
View File

@@ -30,9 +30,9 @@ $(function(){
</head>
<body>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

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

@@ -116,9 +116,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="bgp_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -97,7 +97,7 @@
</div>
<h3 class="page-title">
<spring:message code="bgp_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
View File

@@ -97,7 +97,7 @@
</div>
<h3 class="page-title">
<spring:message code="xmpp_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

10
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -123,13 +123,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<c:forEach items="${serviceList }" var="serviceDict">
<c:if test="${serviceDict.functionId== cfg.functionId}">
<spring:message code="${serviceDict.serviceName }"></spring:message>
</c:if>
</c:forEach>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

5
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -283,9 +283,8 @@
</div>
<h3 class="page-title">
<spring:message code="${serviceName1 }"></spring:message>
</h3>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
<div class="portlet">

6
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
View File

@@ -48,9 +48,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="http_req_replace"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
View File

@@ -48,7 +48,7 @@
</div>
<h3 class="page-title">
<spring:message code="http_req_replace"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
View File

@@ -48,9 +48,9 @@ $(function(){
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="http_res_replace"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
View File

@@ -49,7 +49,7 @@
</div>
<h3 class="page-title">
<spring:message code="http_res_replace"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

6
src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
View File

@@ -37,9 +37,9 @@
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="file_strategy"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
View File

@@ -60,7 +60,7 @@
</div>
<h3 class="page-title">
<spring:message code="file_strategy"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

3
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
View File

@@ -9,6 +9,9 @@
<div class="page-content">
<div class="row">
<h3 class="page-title">
<spring:message code="requestInfo"/>
</h3>
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">

12
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -37,8 +37,12 @@
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
@@ -126,9 +130,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="dns_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="dns_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

8
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -72,8 +72,6 @@
var flag = true;
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(!$(".httpReqCfg").hasClass("hidden")){
//console.log($(".httpReqCfg").find(".boxSolid").length);
//console.log($(".httpReqCfg").find(".boxSolid.hidden").length);
if($(".httpReqCfg").find(".boxSolid").length==$(".httpReqCfg").find(".boxSolid.hidden").length){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
@@ -169,9 +167,9 @@
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="http_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -253,7 +253,7 @@
</div>
<h3 class="page-title">
<spring:message code="http_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

14
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -41,10 +41,12 @@
if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1;
}
//console.log("boxSolid not sub:"+($(".boxSolid").length-1));
//console.log("hidden not sub:"+($(".boxSolid.hidden").length-subscribeId));
var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
@@ -132,9 +134,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ssl_control"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="ssl_control"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -109,7 +109,7 @@
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<h3 class="page-title">
<spring:message code="domain_whitelist"></spring:message>
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">

2
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="domain_whitelist"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

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

@@ -145,9 +145,9 @@
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<%-- <h3 class="page-title">
<spring:message code="ip_whitelist"></spring:message>
</h3> --%>
<h3 class="page-title">
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">

2
src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
View File

@@ -95,7 +95,7 @@
</div>
<h3 class="page-title">
<spring:message code="ip_whitelist"></spring:message>
<spring:message code="${cfg.menuNameCode }"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">

39
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -208,7 +208,44 @@ jQuery.validator.addMethod("httpCheck",function(value, element) {
}
return false;
});
/*协议端口校验
* 规则TCP,UDP协议端口可以不为0
* 其他协议端口必须为0
* 端口号不为0时必须选择协议
* */
jQuery.validator.addMethod("protocolPort",function(value, element) {
var tcp=6,udp=17,protocolVal,srcPortVal,destPortVal;
var name=$(element).attr('name');
if(name.indexOf("protocol")>-1){
protocolVal=value;
}
if(name.indexOf("srcPort")>-1){
srcPortVal=value;
}
if(name.indexOf("destPort")>-1){
destPortVal=value;
}
if(protocolVal){
var srcPortElement=$("[name='"+name.replace("protocol","srcPort")+"']");
srcPortVal=srcPortElement.val();
var destPortElement=$("[name='"+name.replace("protocol","destPort")+"']");
destPortVal=destPortElement.val();
}else if(srcPortVal){
var protocolElement=$("[name='"+name.replace("srcPort","protocol")+"']");
protocolVal=protocolElement.val();
}else if(destPortVal){
var protocolElement=$("[name='"+name.replace("destPort","protocol")+"']");
protocolVal=protocolElement.val();
}
if((protocolVal==0&&srcPortVal>0)||(protocolVal==0&&destPortVal>0)){
$.validator.messages.protocolPort=$.validator.messages.protocolPort;
}else if((protocolVal!=tcp&&protocolVal!=udp&&srcPortVal>0)||(protocolVal!=tcp&&protocolVal!=udp&&destPortVal>0)){
$.validator.messages.protocolPort=$.validator.messages.protocolPort1;
return false;
}else{
return true;
}
});
//ip地址校验
jQuery.validator.addMethod("ipCheck",function(value, element) {

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -72,6 +72,8 @@
go_back:"Go Back Policies",
log_5_minutes:"Log For The Last Five Minutes",
log_1_hour:"Log For The Last Hour",
input:"Please Enter "
input:"Please Enter ",
protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0"
});
}(jQuery));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -72,6 +72,8 @@
go_back:"Go Back Policies",
log_5_minutes:"Log For The Last Five Minutes",
log_1_hour:"Log For The Last Hour",
input:"Please Enter "
input:"Please Enter ",
protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0"
});
}(jQuery));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -72,6 +72,8 @@
go_back:"返回配置界面",
log_5_minutes:"5分钟日志量",
log_1_hour:"1小时日志量",
input:"请输入 "
input:"请输入 ",
protocolPort:"端口大于0时必须选择TCP协议或者UDP协议",
protocolPort1:"只有tcp,udp协议端口号可以不为0"
});
}(jQuery));

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -538,6 +538,10 @@ $(function(){
$("#messageBox .close").on("click",function(){
heightDiv(1);
})
//协议端口加入验证
$("input[name$='srcPort']").addClass("protocolPort");
$("input[name$='destPort']").addClass("protocolPort");
$("select[name$='protocol']").addClass("protocolPort");
});
window.onload=function(){
$("span[id^=open]").click(function(){