diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index d8e679dfe..52c16c1c8 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -266,9 +266,13 @@ public class BaseCfg extends BaseEntity implements Cloneable{ List 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; } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 2d95f509e..a3efb056b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -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 \ No newline at end of file +dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 74f97ed0e..9b12d3b99 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -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 \ No newline at end of file +dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index f5ada28d7..d347a5db6 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -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 \ No newline at end of file +ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41 diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index c068d896c..83ea0fd6b 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -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; \ No newline at end of file +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; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp index 306e5376e..3edce7495 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp @@ -37,9 +37,9 @@ $(function(){
-<%--

+

-

--%> +
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index e3b32bea6..c2859f844 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -153,7 +153,7 @@ label.errorShow {
-<%--

+

@@ -166,7 +166,7 @@ label.errorShow { -

--%> +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 703203db5..f8c2c39eb 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -110,7 +110,7 @@
-<%--

+

@@ -119,7 +119,7 @@ -

--%> +
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp index fc87b854c..f9b46e586 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -9,9 +9,9 @@
-<%--

+

-

--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp index df4bd98ec..0dc8f568f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp @@ -71,9 +71,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp index 49f2cd0a6..8b1307a52 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp @@ -75,7 +75,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp index 029463b9f..2fad4fb93 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp @@ -16,7 +16,7 @@ $(function(){

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp index 4384f3640..1ee2e6e63 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp @@ -28,9 +28,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index 20b1d7d98..6232a7630 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp index c52fcfb8d..2608e1f59 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp @@ -63,7 +63,7 @@ $(function(){

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index a8e6863fc..6b471a21c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -143,9 +143,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 89ddbe999..af0a60bd3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -64,7 +64,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index 079fdf248..b3165bca4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -32,9 +32,9 @@ $(function(){
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 4f16c5328..e0bb7d55f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -68,7 +68,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index e61bcf5eb..acfccc96c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -32,9 +32,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index d9cf24db1..4efc5650c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -65,7 +65,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index dad4ecf31..6dd1bf7d7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -99,9 +99,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index acbab3409..0c257815e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -98,7 +98,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index e3cf1fbcc..2f1698ad0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -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("", ""); return; } @@ -128,9 +132,9 @@
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index fc6f81c82..802724ea7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -99,7 +99,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index 264fcfb0e..7edadf09a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -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("", ""); return; } @@ -122,9 +126,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 1f61043eb..567a1edf7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index ef853382a..9a08cff0a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -79,9 +79,9 @@ var switchKeyringType=function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index 9ed82cca6..7511846b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -48,7 +48,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipBlockForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipBlockForm.jsp index fdcc734e6..0b63433c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipBlockForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipBlockForm.jsp @@ -9,9 +9,9 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp index b2696dd26..1d03f14e5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp @@ -69,9 +69,9 @@
- <%--

+

-

--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 9561367e0..ef33c596c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -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("", ""); return; } */ @@ -373,9 +377,9 @@ var processAction=function(configType,obj){
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index f53633168..4c191ec6f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp index e80887e0a..24b7866ea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp @@ -62,9 +62,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index 078e9201a..6755be4a1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -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("", ""); return; } @@ -134,9 +138,9 @@
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 006661914..b08572408 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -96,7 +96,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index bd5fe9d0d..fa60da3b1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -72,9 +72,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 7f4cda696..f379418b2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -51,7 +51,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp index b9ae7b36f..b1a0d8865 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp @@ -32,9 +32,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 9e3faa348..6a192ddfc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -50,7 +50,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp index 022d2b679..35adc225e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp @@ -32,9 +32,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp index 590a881bb..52933690c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -50,7 +50,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp index 04cd86dac..dd41278a1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp @@ -30,9 +30,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp index 4d8710c33..703d6b6f3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -116,9 +116,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 3347ac1fa..5b6197b83 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -97,7 +97,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 58d9c6efe..ed34092c1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -97,7 +97,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp index 78e1ded4b..7150dee52 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp @@ -123,13 +123,9 @@
- <%--

- - - - - -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index d48a7b55a..44f517280 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -283,9 +283,8 @@

- - -

+ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp index cce735bd0..516c3c943 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp @@ -48,9 +48,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index 93ab7df0d..4623b466d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -48,7 +48,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp index 8e537d822..c1b4ca866 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp @@ -48,9 +48,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index c2476973a..fe80e7827 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -49,7 +49,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp index e04ff401a..44da57b4a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp @@ -37,9 +37,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index 9937188df..38d574aac 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -60,7 +60,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 45d4cf998..d96238ae9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -9,6 +9,9 @@
+

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 99fb9d573..387186ba1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -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("", ""); return; } @@ -126,9 +130,9 @@
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index 58539f27b..4be2a026d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 7432216c4..3d8a34954 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -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("", ""); return; @@ -169,9 +167,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index eb482ae6c..f064da8c1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -253,7 +253,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 5bf49b0d3..a39eb30ec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -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("", ""); return; } @@ -132,9 +134,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 17cc4ddda..aea2f55f3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index 84f506691..a4ca327b2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -109,7 +109,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index d08ac0455..0639b44e4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 43d2a8c69..a5c2e5e5c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -145,9 +145,9 @@
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index 945d8e078..e10b507ed 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -95,7 +95,7 @@

- +

diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index d3501d636..fb95cefa0 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -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) { diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index ac543bf5c..47a04a579 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -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)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index 0705c405e..76fc2ca1b 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -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)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index 5c9ea8ada..9690dd0ea 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -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)); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 38ea8700b..7cd21481c 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -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(){