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

src/main/resources/messages/message_zh_CN.properties

@@ -612,6 +612,10 @@ action_replace=\u66FF\u6362
 action_whitelist=\u767D\u540D\u5355
 action_monit=\u76D1\u6D4B
 file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7
+raw_len=\u6587\u4EF6\u539F\u59CB\u957F\u5EA6
+digest=\u6587\u4EF6\u6458\u8981
+cfds_level=\u5339\u914D\u7F6E\u4FE1\u5EA6
+file_url=\u6587\u4EF6\u8DEF\u5F84
 bgp_control=BGP\u7BA1\u63A7
 bgp_ip=bgp Ip
 xmpp_control=XMPP\u7BA1\u63A7
@@ -752,4 +756,55 @@ are_the_same=%s\u548C%s\u4E0D\u80FD\u76F8\u7B49
 is_in_wrong_format=%s\u683C\u5F0F\u9519\u8BEF
 must_between=\u5FC5\u987B\u4ECB\u4E8E%s\u548C%s\u4E4B\u95F4
 not_number=%s\u5FC5\u987B\u4E3A\u6570\u5B57
-#=============some validation===========
+#=============some validation===========
+#=============region_value,config form title=================
+av_sample_audio=\u97F3\u9891\u6837\u4F8B
+av_sample_vedio=\u89C6\u9891\u6837\u4F8B
+av_sample_pitrue=\u56FE\u7247\u6837\u4F8B
+av_sample_voip=voip\u6837\u4F8B
+av_sample_audio_porn=\u97F3\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B
+av_sample_vedio_porn=\u89C6\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B
+WHITE_LIST_IP=IP\u767D\u540D\u5355
+av_voip_ip=voip ip\u914D\u7F6E
+NTC_HTTP_URL=URL\u914D\u7F6E
+NTC_HTTP_REQ_HDR=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E
+NTC_HTTP_RES_HDR=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E
+NTC_HTTP_REQ_BODY=\u8BF7\u6C42\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+NTC_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+NTC_UNIVERSAL_IP=IP\u914D\u7F6E
+NTC_DNS_REGION=\u5173\u952E\u5B57\u914D\u7F6E
+WHITE_LIST_DOMAIN=\u57DF\u540D\u767D\u540D\u5355
+av_voip_account=voip\u8D26\u53F7\u914D\u7F6E
+av_cont_ip=\u5185\u5BB9IP\u914D\u7F6E
+NTC_SSL_SNI=SNI\u5173\u952E\u5B57\u914D\u7F6E
+NTC_SSL_SAN=SAN\u5173\u952E\u5B57\u914D\u7F6E
+NTC_SSL_CA=CA\u5173\u952E\u5B57\u914D\u7F6E
+av_pic_ip=\u56FE\u7247IP\u914D\u7F6E
+av_cont_url=\u5185\u5BB9URL\u914D\u7F6E
+av_pic_url=\u56FE\u7247URL\u914D\u7F6E
+NTC_IP=IP\u914D\u7F6E
+file_transfer_digest=\u6587\u4EF6\u4F20\u8F93\u6458\u8981\u914D\u7F6E
+PXY_INTERCEPT_IP=IP\u62E6\u622A\u914D\u7F6E
+PXY_INTERCEPT_DOMAIN=\u57DF\u540D\u62E6\u622A\u914D\u7F6E
+PXY_CTRL_HTTP_REQ_BODY=\u8BF7\u6C42\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+PXY_CTRL_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+dns_fake_ip=DNS\u6B3A\u9A97IP\u914D\u7F6E
+APP_POLICY=APP\u7B56\u7565\u914D\u7F6E
+PXY_CTRL_IP=IP\u63A7\u5236\u914D\u7F6E
+APP_STATIC_SEV_IP=APP\u534F\u8BAEIP\u914D\u7F6E
+APP_HTTP=APP HTTP\u7279\u5F81\u914D\u7F6E
+APP_DOMAIN=APP\u57DF\u540D\u7279\u5F81\u914D\u7F6E
+APP_PKT_BIN=APP\u5B57\u8282\u7279\u5F81\u914D\u7F6E
+PXY_CTRL_HTTP_URL=URL\u914D\u7F6E
+LIMIT_IP=IP\u9650\u6D41\u914D\u7F6E
+IR_POLICY_IP=IP\u590D\u7528\u914D\u7F6E
+PXY_CTRL_HTTP_REQ_HDR=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E
+PXY_CTRL_HTTP_RES_HDR=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E
+DDOS_PROTECT_TARGET_IP_CB=\u76EE\u6807\u9632\u62A4IP\u914D\u7F6E
+IR_STATIC_IP_POOL_CB=IP\u590D\u7528\u5730\u5740\u6C60\u914D\u7F6E
+NTC_MAIL_HDR=\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E
+NTC_MAIL_BODY=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+NTC_FILE_DIGEST=\u6587\u4EF6\u6458\u8981\u914D\u7F6E
+NTC_FTP_URL=URL\u914D\u7F6E
+FTP_CONTENT=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
+#=============region_value,config form title=================

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

@@ -2,6 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <div class="row stringInfo">
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+<span id="urlError" style="display:none"><spring:message code="url_error"></spring:message></span>
 <span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="row"> 
 		<div class="col-md-6">
@@ -10,7 +11,7 @@
 	            <div class="col-md-6">
 	            	 <input class="form-control required tags" type="text" id="tags_cfgKeywords" name="cfgKeywords" value="${_cfg.cfgKeywords}">
 	            </div>
-	            <div for="cfgKeywords"></div>
+	            <div for="cfgKeywords" class="col-md-6"></div>
 	        </div>
 	    </div>
 	    <div class="col-md-6">

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

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

src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp

@@ -60,6 +60,7 @@
 	</div>
 
 	<h3 class="page-title">
+		<spring:message code="policy_group_manage"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp

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

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -64,6 +64,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="av_content_ip_control"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp

@@ -8,6 +8,7 @@ $(function(){
 	$("#cancel").on("click",function(){
 		window.history.back();
 	});
+	$("input[name='cfgKeywords']").addClass("url");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -30,7 +31,14 @@ $(function(){
 									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 					flag = false;
 					return;
-				}
+				}/* else if(!(/^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test($(this).val()))){
+					$(this).parents(".form-group").find(
+							"div[for='"
+									+ $(this).attr("name")
+									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#urlError").text()+"</label>");
+					flag = false;
+					return;
+				} */
 			})
 			if(flag){
 				loading('onloading...');
@@ -47,9 +55,10 @@ $(function(){
 
 <div class="page-content">
 
-	<%-- <h3 class="page-title">
+	<h3 class="page-title">
-		<spring:message code="${add}"></spring:message>
+		<spring:message code="av_content_url_control"></spring:message>
-	</h3> --%>
+	</h3>
+	
 	
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -62,6 +62,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="av_content_url_control"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp

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

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -64,6 +64,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="av_picture_ip_control"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp

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

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -62,6 +62,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="av_picture_url_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

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

@@ -78,7 +78,10 @@ var delContent=function(contentClassName,addBtnClassName){
 <body>
 
 <div class="page-content">
-
+<h3 class="page-title">
+		<spring:message code="av_voip_control"></spring:message>
+	</h3>
+	
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -400,6 +400,7 @@
 	</div>
 
 	<h3 class="page-title">
+		<spring:message code="av_voip_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -457,7 +458,7 @@
 							 			<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                                    <!--<sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>-->
+                                    <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>
                                		<shiro:hasPermission name="avVoip:audit">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

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

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

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

@@ -64,6 +64,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="ip_spoofing_configuration"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

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

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

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

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

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

@@ -49,6 +49,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="dns_res_strategy"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

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

@@ -99,6 +99,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>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">

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

@@ -42,7 +42,7 @@
 							$(".httpReqCfg").removeClass("hidden").removeClass(
 							"disabled");
 						}
-						$("li").on("click", function() {
+						$(".configType").on("click", function() {
 							var region = ($(this).find("a").attr("for"));
 							if(region=="httpReqCfg"){
 								$(".httpResCfg").addClass("hidden").addClass("disabled");
@@ -143,6 +143,17 @@
 	<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="http_redirect"></spring:message>
+			<small>
+				<c:if test="${empty _cfg.cfgId}">
+					<spring:message code="add"></spring:message>
+				</c:if>
+				<c:if test="${not empty _cfg.cfgId}">
+					<spring:message code="edit"></spring:message>
+				</c:if>
+			</small>
+		</h3> --%>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">
@@ -180,11 +191,11 @@
 												<!-- Only required for left/right tabs -->
 												<ul class="nav nav-tabs tabs-left">
 
-													<li class="active"><a href="#http_req_tab"
+													<li class="active configType"><a href="#http_req_tab"
 														data-toggle="tab" for="httpReqCfg"
 														data_dldk="<spring:message code="http_req_control"/>"><spring:message
 																code="http_req_control" /></a></li>
-													<li><a href="#http_res_tab" data-toggle="tab" for="httpResCfg"
+													<li class="configType"><a href="#http_res_tab" data-toggle="tab" for="httpResCfg"
 														data_dldk="<spring:message code="http_res_control"/>"><spring:message
 																code="http_res_control" /></a></li>
 

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

@@ -21,7 +21,6 @@ $(function(){
 			}
 		},
 		submitHandler: function(form){
-			loading('onloading...');
 			var flag = true;
 			$("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
@@ -48,7 +47,9 @@ $(function(){
 
 <div class="page-content">
 
-	
+	<h3 class="page-title">
+		<spring:message code="http_req_replace"></spring:message>
+	</h3>
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

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

@@ -49,6 +49,7 @@
 	</div>
 
 	<h3 class="page-title">
+		<spring:message code="http_req_replace"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

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

@@ -21,7 +21,6 @@ $(function(){
 			}
 		},
 		submitHandler: function(form){
-			loading('onloading...');
 			var flag = true;
 			$("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
@@ -48,7 +47,9 @@ $(function(){
 
 <div class="page-content">
 
-	
+	<h3 class="page-title">
+		<spring:message code="http_res_replace"></spring:message>
+	</h3>
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

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

@@ -49,6 +49,7 @@
 	</div>
 
 	<h3 class="page-title">
+	<spring:message code="http_res_replace"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>

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

@@ -42,7 +42,7 @@
 							$(".httpReqCfg").removeClass("hidden").removeClass(
 							"disabled");
 						}
-						$("li").on("click", function() {
+						$(".configType").on("click", function() {
 							var region = ($(this).find("a").attr("for"));
 							if(region=="httpReqCfg"){
 								$(".httpResCfg").addClass("hidden").addClass("disabled");
@@ -143,7 +143,19 @@
 <body>
 	<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="http_control"></spring:message>
+			<small>
+				<c:if test="${empty _cfg.cfgId}">
+					<spring:message code="add"></spring:message>
+				</c:if>
+				<c:if test="${not empty _cfg.cfgId}">
+					<spring:message code="edit"></spring:message>
+				</c:if>
+			</small>
+		</h3> --%>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">
@@ -181,11 +193,11 @@
 												<!-- Only required for left/right tabs -->
 												<ul class="nav nav-tabs tabs-left">
 
-													<li class="active"><a href="#http_req_tab"
+													<li class="active configType"><a href="#http_req_tab"
 														data-toggle="tab" for="httpReqCfg"
 														data_dldk="<spring:message code="http_req_control"/>"><spring:message
 																code="http_req_control" /></a></li>
-													<li><a href="#http_res_tab" data-toggle="tab" for="httpResCfg"
+													<li class="configType"><a href="#http_res_tab" data-toggle="tab" for="httpResCfg"
 														data_dldk="<spring:message code="http_res_control"/>"><spring:message
 																code="http_res_control" /></a></li>