diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp index 4d97964f7..2a7bca707 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp @@ -21,7 +21,7 @@
- +
- ip + IP <%-- --%> @@ -281,7 +281,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index e43fe8f52..1d16ea7b8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -314,7 +314,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp index ab728f1cf..fb99c5dc3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp @@ -322,7 +322,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp index 1d561ac65..2b3bad988 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp @@ -83,7 +83,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 8fad70e0b..d98497cdc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -288,7 +288,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index cbd956359..59f62cd6d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -107,7 +107,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 21c647834..b3b673464 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -281,7 +281,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index cd6d17173..3d414cbd5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -191,19 +191,23 @@ $(function(){
- - - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 3058e348f..668fe19f8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -276,7 +276,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp index 8a42a2e83..03e7c51b1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp @@ -83,7 +83,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index fdb2665f1..49b5b9dd8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -288,7 +288,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index 2e696437c..30efa7984 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -99,7 +99,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index aabedfe56..625bc12c1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -282,7 +282,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp index 92e4bf6bd..b3bff8f38 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp @@ -128,19 +128,23 @@ $(function(){
- - - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 74c1103e6..bc181d509 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -279,7 +279,7 @@ - + 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 ed54574e1..71a18fa98 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 @@ -136,7 +136,7 @@ var delContent=function(contentClassName,addBtnClassName){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 28d363446..db56ffb91 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -615,7 +615,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 71146328a..ecc037e64 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -278,7 +278,7 @@ <%-- --%> - IP + IP diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 54788a7b9..3e1e2efa2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -289,7 +289,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index feb9bdfce..23bbc51de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -292,7 +292,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index b267b1b62..021db0cab 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -96,7 +96,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index c8a88bbcd..2bdd08375 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -284,7 +284,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 5d05a7500..7c2dbd6a3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -93,7 +93,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 441915fd2..11593a8b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -268,7 +268,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 ae5b6543c..ae3699dcd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -154,7 +154,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 e18de190e..95bfb1c1f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -309,7 +309,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index 373dfed89..889cbc18e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -279,7 +279,7 @@ <%-- --%> - ip + IP @@ -301,7 +301,7 @@ - + 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 4b67f6235..5388623a7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -160,7 +160,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 04befb91b..84e37be61 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -309,7 +309,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 ce2bb9bdf..6ad9cb731 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 @@ -129,7 +129,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 ec00e5801..9798be73f 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 @@ -270,7 +270,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 0863d1622..7c56bd622 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 @@ -97,7 +97,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 6726cea05..d8d135674 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 @@ -272,7 +272,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp index b497839b8..de3dfcaad 100644 --- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp @@ -336,7 +336,7 @@ <%--IP --%> - ip + IP @@ -368,7 +368,7 @@ - ip + IP @@ -385,7 +385,7 @@ - + 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 a07f0f488..5a694ce19 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -153,7 +153,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 71b9f3a75..7e1a4120c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -310,7 +310,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp index 8d5d0778a..6b92610c4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp @@ -150,7 +150,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 7dfe07157..151b2ff4d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -309,7 +309,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 4920a0f70..338ee7c2c 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 @@ -230,7 +230,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 eeb2e81eb..f8e5ff899 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 @@ -468,7 +468,7 @@ - + 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 906598bbc..e00959d5f 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 @@ -105,7 +105,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 747c0aa1b..521fea4af 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 @@ -268,7 +268,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 4b5adfc2f..84b2407bd 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 @@ -105,7 +105,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 7beb78309..f639b64db 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 @@ -268,7 +268,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp index 669ccb059..1a6a4b446 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -275,7 +275,7 @@ - + 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 d649ea851..2d724d6b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -154,7 +154,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 ffa5cb2b0..ee63adb79 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -309,7 +309,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 4df0f6a8a..1b79cabc4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -221,7 +221,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 30d612f05..4296bad89 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -466,7 +466,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 6ca8d2161..732c990a9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -154,7 +154,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" value="${service.action }" class="required action" - checked> + checked> 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 683788385..48143e182 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -308,7 +308,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 698450939..4e531aa9e 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 @@ -179,6 +179,30 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { if(value.length==0||value.trim().length==0){return true;} var typeInt=$(element).parents(".row").parent(".row").find("select[name$='ipType']").val(); var ipPattern=$(element).parents(".row").parent(".row").find("select[name$='ipPattern']").val(); + var srcIpAddress=$(element).parents(".row").parent(".row").find("input[name$='srcIpAddress']").val(); + var destIpAddress=$(element).parents(".row").parent(".row").find("input[name$='destIpAddress']").val(); + var destIpIsHidden=$(element).parents(".row").parent(".row").find("input[name$='destIpAddress']").is(":hidden"); + if(ipPattern==1){//ip/掩码格式 + srcIpAddress=srcIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress; + destIpAddress=destIpAddress.indexOf("/") >-1 ?srcIpAddress.split("/")[0] : srcIpAddress; + }else if (ipPattern==2){ + srcIpAddress=srcIpAddress.indexOf("-") >-1 ?srcIpAddress.split("-")[0] : srcIpAddress; + destIpAddress=destIpAddress.indexOf("-") >-1 ?srcIpAddress.split("-")[0] : srcIpAddress; + } + if(destIpIsHidden){ + if((srcIpAddress == destIpAddress)){ + $.validator.messages.ipCheck=$.validator.messages.srcIpIsNotValue+destIpAddress; + return false; + } + }else{ + if((srcIpAddress == destIpAddress)){ + $.validator.messages.ipCheck=$.validator.messages.srcIpNotEqDestIp+srcIpAddress + +$.validator.messages.destIpNotEqDestIp+destIpAddress + +$.validator.messages.IpNotEqDestIp; + return false; + } + } + if(typeInt==4){ if(ipPattern){ if(ipPattern==1){//ip/掩码格式 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 0c0e53c14..a77235439 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 @@ -27,6 +27,10 @@ ipPart:"Invalid IP part", ipv6MaskPart:"Mask must be exponent of 2,not greater than 128", ipMaskRange:"IP mask must between 0 and 32", + srcIpNotEqDestIp:"Sourse IP ", + destIpNotEqDestIp:" and destination IP ", + IpNotEqDestIp:" can't the same", + srcIpIsNotValue:"Sourse IP can't be ", ipRange:"Wrong IP format or start IP and end IP in two subnet", ipRange1:"start IP should smaller than end IP", portCheck:"Please enter a correct port", 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 d59ae753a..c43d39468 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 @@ -26,10 +26,15 @@ ipPart:"Invalid IP part", ipv6MaskPart:"Mask must be exponent of 2,not greater than 128", ipMaskRange:"IP mask must between 0 and 32", + srcIpNotEqDestIp:"Sourse IP and destination IP can't the same", ipRange:"Wrong IP format or start IP and end IP in two subnet", ipRange1:"start IP should smaller than end IP", portCheck: " Пожалуйста, введите  правильный  порт.", portRange:"Port must between 0 and 65535", + srcIpNotEqDestIp:"Sourse IP ", + destIpNotEqDestIp:" and destination IP ", + srcIpIsNotValue:"Sourse IP can't be ", + IpNotEqDestIp:" can't the same", portMaskRange:"Port and mask must between 0 and 65535.The correct pattern is \"port/mask\".", chooseAreaOrIsp:"The region and the oprater must choose one", areaControl:"Action drop and loop do not need area control", 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 3df7651fc..6f9bc8c28 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 @@ -20,7 +20,6 @@ rangelength: $.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"), range: $.validator.format("请输入一个介于 {0} 和 {1} 之间的值"), max: $.validator.format("请输入一个最大为 {0} 的值"), - min: $.validator.format("请输入一个最小为 {0} 的值"), noBlankSpace:"不能为空格", ipCheck:"请填写正确的IP地址", @@ -30,9 +29,14 @@ portCheck:"请填写正确的端口", notStartZero:"请填写正确的数值", ipMaskRange:"掩码范围0到32", + srcIpNotEqDestIp:"源IP和目的IP不能相同", ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段", ipRange1:"起始IP值应小于结束IP值", portRange:"端口应小于65536,非0数字不能以0开头", + srcIpIsNotValue:"源IP不能为 ", + srcIpNotEqDestIp:"源IP ", + destIpNotEqDestIp:" 与目的IP ", + IpNotEqDestIp:" 不能相同", portMaskRange:"端口以及掩码范围0-65535,非0数字不能以0开头。格式为\"端口/掩码\"", chooseAreaOrIsp:"区域和运营商必选一个", areaControl:"丢弃和回流动作不能区域管控", diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 92a4ef90c..181626541 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -415,15 +415,26 @@ var switchIpInfo=function(obj){ var srcPort=row.find("input[name$='srcPort']"); var destPort=row.find("input[name$='destPort']"); - var ipV4Default=new Array(); - ipV4Default[0]="0.0.0.0/32"; //subnet - ipV4Default[1]="0.0.0.0-0.0.0.0";//ip_range - ipV4Default[2]="0.0.0.0"; //ip + var srcIpV4Default=new Array(); + srcIpV4Default[0]="0.0.0.0/32"; //subnet + srcIpV4Default[1]="0.0.0.0-0.0.0.0";//ip_range + srcIpV4Default[2]="0.0.0.0"; //ip - var ipV6Default=new Array(); - ipV6Default[0]="::/64"; //subnet - ipV6Default[1]="::-::";//ip_range - ipV6Default[2]="::"; //ip + var destIpV4Default=new Array(); + destIpV4Default[0]="0.0.0.0/32"; //subnet + destIpV4Default[1]="0.0.0.0-0.0.0.0";//ip_range + destIpV4Default[2]="0.0.0.0"; //ip + + + var srcIpV6Default=new Array(); + srcIpV6Default[0]="::/64"; //subnet + srcIpV6Default[1]="::-::";//ip_range + srcIpV6Default[2]="::"; //ip + + var destIpV6Default=new Array(); + destIpV6Default[0]="::/64"; //subnet + destIpV6Default[1]="::-::";//ip_range + destIpV6Default[2]="::"; //ip var portDefault=new Array(); portDefault[0]="0";//port @@ -433,39 +444,53 @@ var switchIpInfo=function(obj){ if(4==ipType){ if(!$(srcIp).val()){ if(ipPattern==1){ - $(srcIp).val(ipV4Default[0]); + $(srcIp).val(srcIpV4Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV4Default[1]); + $(srcIp).val(srcIpV4Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV4Default[2]); + $(srcIp).val(srcIpV4Default[2]); + }else{ + $(srcIp).val(srcIpV4Default[0]); } }else{ - if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV4的默认值其中一个 + if($.inArray($(srcIp).val(),srcIpV4Default) > -1 + || $.inArray($(srcIp).val(),destIpV4Default) > -1 + || $.inArray($(srcIp).val(),srcIpV6Default) > -1 + || $.inArray($(srcIp).val(),destIpV6Default) > -1){ //是ipV4的默认值其中一个 if(ipPattern==1){ - $(srcIp).val(ipV4Default[0]); + $(srcIp).val(srcIpV4Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV4Default[1]); + $(srcIp).val(srcIpV4Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV4Default[2]); + $(srcIp).val(srcIpV4Default[2]); + }else{ + $(srcIp).val(srcIpV4Default[0]); } } } if(!$(destIp).val()){ if(ipPattern==1){ - $(destIp).val(ipV4Default[0]); + $(destIp).val(destIpV4Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV4Default[1]); + $(destIp).val(destIpV4Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV4Default[2]); + $(destIp).val(destIpV4Default[2]); + }else{ + $(destIp).val(destIpV4Default[0]); } }else{ - if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV4的默认值其中一个 + if($.inArray($(destIp).val(),srcIpV4Default) > -1 + || $.inArray($(destIp).val(),destIpV4Default) > -1 + || $.inArray($(destIp).val(),srcIpV6Default) > -1 + || $.inArray($(destIp).val(),destIpV6Default) > -1){ if(ipPattern==1){ - $(destIp).val(ipV4Default[0]); + $(destIp).val(destIpV4Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV4Default[1]); + $(destIp).val(destIpV4Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV4Default[2]); + $(destIp).val(destIpV4Default[2]); + }else{ + $(destIp).val(destIpV4Default[0]); } } } @@ -473,39 +498,53 @@ var switchIpInfo=function(obj){ if(6==ipType){ if(!$(srcIp).val()){ if(ipPattern==1){ - $(srcIp).val(ipV6Default[0]); + $(srcIp).val(srcIpV6Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV6Default[1]); + $(srcIp).val(srcIpV6Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV6Default[2]); + $(srcIp).val(srcIpV6Default[2]); + }else{ + $(srcIp).val(srcIpV6Default[0]); } }else{ - if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(srcIp).val(),srcIpV4Default) > -1 + || $.inArray($(srcIp).val(),destIpV4Default) > -1 + || $.inArray($(srcIp).val(),srcIpV6Default) > -1 + || $.inArray($(srcIp).val(),destIpV6Default) > -1){ //是ipV6的默认值其中一个 if(ipPattern==1){ - $(srcIp).val(ipV6Default[0]); + $(srcIp).val(srcIpV6Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV6Default[1]); + $(srcIp).val(srcIpV6Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV6Default[2]); + $(srcIp).val(srcIpV6Default[2]); + }else{ + $(srcIp).val(srcIpV6Default[0]); } } } if(!$(destIp).val()){ if(ipPattern==1){ - $(destIp).val(ipV6Default[0]); + $(destIp).val(destIpV6Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV6Default[1]); + $(destIp).val(destIpV6Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV6Default[2]); + $(destIp).val(destIpV6Default[2]); + }else{ + $(destIp).val(srcIpV6Default[0]); } }else{ - if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(destIp).val(),srcIpV4Default) > -1 + || $.inArray($(destIp).val(),destIpV4Default) > -1 + || $.inArray($(destIp).val(),srcIpV6Default) > -1 + || $.inArray($(destIp).val(),destIpV6Default) > -1){ //是ipV6的默认值其中一个 if(ipPattern==1){ - $(destIp).val(ipV6Default[0]); + $(destIp).val(destIpV6Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV6Default[1]); + $(destIp).val(destIpV6Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV6Default[2]); + $(destIp).val(destIpV6Default[2]); + }else{ + $(destIp).val(srcIpV6Default[0]); } } } @@ -513,39 +552,45 @@ var switchIpInfo=function(obj){ if(46==ipType){ if(!$(srcIp).val()){ if(ipPattern==1){ - $(srcIp).val(ipV4Default[0]); + $(srcIp).val(srcIpV4Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV4Default[1]); + $(srcIp).val(srcIpV4Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV4Default[2]); + $(srcIp).val(srcIpV4Default[2]); } }else{ - if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(srcIp).val(),srcIpV4Default) > -1 + || $.inArray($(srcIp).val(),destIpV4Default) > -1 + || $.inArray($(srcIp).val(),srcIpV6Default) > -1 + || $.inArray($(srcIp).val(),destIpV6Default) > -1){ if(ipPattern==1){ - $(srcIp).val(ipV4Default[0]); + $(srcIp).val(srcIpV4Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV4Default[1]); + $(srcIp).val(srcIpV4Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV4Default[2]); + $(srcIp).val(srcIpV4Default[2]); } } } if(!$(destIp).val()){ if(ipPattern==1){ - $(destIp).val(ipV6Default[0]); + $(destIp).val(destIpV6Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV6Default[1]); + $(destIp).val(destIpV6Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV6Default[2]); + $(destIp).val(destIpV6Default[2]); } }else{ - if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(destIp).val(),srcIpV4Default) > -1 + || $.inArray($(destIp).val(),destIpV4Default) > -1 + || $.inArray($(destIp).val(),srcIpV6Default) > -1 + || $.inArray($(destIp).val(),destIpV6Default) > -1){ if(ipPattern==1){ - $(destIp).val(ipV6Default[0]); + $(destIp).val(destIpV6Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV6Default[1]); + $(destIp).val(destIpV6Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV6Default[2]); + $(destIp).val(destIpV6Default[2]); } } } @@ -553,39 +598,45 @@ var switchIpInfo=function(obj){ if(64==ipType){ if(!$(srcIp).val()){ if(ipPattern==1){ - $(srcIp).val(ipV6Default[0]); + $(srcIp).val(srcIpV6Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV6Default[1]); + $(srcIp).val(srcIpV6Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV6Default[2]); + $(srcIp).val(srcIpV6Default[2]); } }else{ - if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(srcIp).val(),srcIpV4Default) > -1 + || $.inArray($(srcIp).val(),destIpV4Default) > -1 + || $.inArray($(srcIp).val(),srcIpV6Default) > -1 + || $.inArray($(srcIp).val(),destIpV6Default) > -1){ if(ipPattern==1){ - $(srcIp).val(ipV6Default[0]); + $(srcIp).val(srcIpV6Default[0]); }else if(ipPattern==2){ - $(srcIp).val(ipV6Default[1]); + $(srcIp).val(srcIpV6Default[1]); }else if(ipPattern==3){ - $(srcIp).val(ipV6Default[2]); + $(srcIp).val(srcIpV6Default[2]); } } } if(!$(destIp).val()){ if(ipPattern==1){ - $(destIp).val(ipV4Default[0]); + $(destIp).val(srcIpV4Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV4Default[1]); + $(destIp).val(srcIpV4Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV4Default[2]); + $(destIp).val(srcIpV4Default[2]); } }else{ - if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个 + if($.inArray($(destIp).val(),srcIpV4Default) > -1 + || $.inArray($(destIp).val(),destIpV4Default) > -1 + || $.inArray($(destIp).val(),srcIpV6Default) > -1 + || $.inArray($(destIp).val(),destIpV6Default) > -1){ if(ipPattern==1){ - $(destIp).val(ipV4Default[0]); + $(destIp).val(destIpV4Default[0]); }else if(ipPattern==2){ - $(destIp).val(ipV4Default[1]); + $(destIp).val(destIpV4Default[1]); }else if(ipPattern==3){ - $(destIp).val(ipV4Default[2]); + $(destIp).val(destIpV4Default[2]); } } } @@ -596,6 +647,8 @@ var switchIpInfo=function(obj){ $(srcPort).val(portDefault[0]); }else if(portPattern==2){ $(srcPort).val(portDefault[1]); + }else{ + $(srcPort).val(portDefault[0]); } }else{ if($.inArray($(srcPort).val(),portDefault) > -1){ //是ipV4的默认值其中一个 @@ -603,6 +656,8 @@ var switchIpInfo=function(obj){ $(srcPort).val(portDefault[0]); }else if(portPattern==2){ $(srcPort).val(portDefault[1]); + }else{ + $(srcPort).val(portDefault[0]); } } } @@ -612,6 +667,8 @@ var switchIpInfo=function(obj){ $(destPort).val(portDefault[0]); }else if(portPattern==2){ $(destPort).val(portDefault[1]); + }else{ + $(destPort).val(portDefault[0]); } }else{ if($.inArray($(destPort).val(),portDefault) > -1){ //是port的默认值其中一个 @@ -619,6 +676,8 @@ var switchIpInfo=function(obj){ $(destPort).val(portDefault[0]); }else if(portPattern==2){ $(destPort).val(portDefault[1]); + }else{ + $(destPort).val(portDefault[0]); } } }