From 9b1f4d30cc09bfc42082f3f54b9b14bd949c7ec9 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 9 Aug 2018 15:07:49 +0800
Subject: [PATCH] =?UTF-8?q?//HTTP=20block=EF=BC=9A=20response=20code=20is?=
 =?UTF-8?q?=20not=20null=20;response=20content=20null(userRegion=20is=20no?=
 =?UTF-8?q?t=20null)=20//HTTP=20redirect=EF=BC=9A=20response=20code=20is?=
 =?UTF-8?q?=20not=20null=20;response=20content=20is=20not=20null(userRegio?=
 =?UTF-8?q?n=20is=20not=20null)=20//HTTP=20replace=EF=BC=9A=20replace=20ty?=
 =?UTF-8?q?pe=20is=20not=20null=20;find=20is=20not=20null;replace=20with?=
 =?UTF-8?q?=20is=20not=20null(userRegion=20is=20not=20null)=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dproxy=20=E6=8E=92=E5=BA=8F=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/HttpRedirectCfgService.java | 36 ++++++++-----------
 .../resources/messages/message_en.properties  | 20 +++++------
 .../WEB-INF/views/cfg/actionRegionForm.jsp    |  6 ++--
 .../cfg/proxy/control/httpRedirectList.jsp    |  8 ++++-
 .../1.11.0/localization/messages_en.js        |  2 +-
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
index 6d1c36ba0..feda9f83a 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -404,42 +404,34 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			//判断http配置是否需要设置自定义域参数
 			String userRegion = "";
 			
-			//HTTP block
+			//HTTP block： response code is not null ;response content null(userRegion is not null)
 			if(entity.getAction().equals(16)){
 				String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
 				userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
 				String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
 				userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+userRegion2;
 			}
-			//HTTP redirect
+			//HTTP redirect： response code is not null ;response content is not null(userRegion is not null)
 			if(entity.getAction().equals(48)){
 				String userRegion1=StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1();
 				userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+userRegion1;
 				String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
 				userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+userRegion2;
 			}
-			//HTTP replace
+			//HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null)
 			if(entity.getAction().equals(80)){
-				if(!StringUtil.isEmpty(entity.getUserRegion1())){
-					userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1();
-				}
+				userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1();
 				String substitute="";
-				if(!StringUtil.isEmpty(entity.getUserRegion2())){
-					String userRegion2=entity.getUserRegion2();
-					substitute="/";
-					userRegion2 = BaseService.replaceContentEscape(userRegion2);
-					substitute=substitute+userRegion2;
-				}
-				if(!StringUtil.isEmpty(entity.getUserRegion3())){
-					String userRegion3=entity.getUserRegion3();
-					userRegion3 = BaseService.replaceContentEscape(userRegion3);
-					substitute=substitute+"/"+userRegion3;
-				}
-				if(StringUtil.isEmpty(substitute)){
-					userRegion="";
-				}else{
-					userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
-				}
+				String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
+				substitute="/";
+				userRegion2 = BaseService.replaceContentEscape(userRegion2);
+				substitute=substitute+userRegion2;
+				
+				String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();
+				userRegion3 = BaseService.replaceContentEscape(userRegion3);
+				substitute=substitute+"/"+userRegion3;
+				
+				userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
 			}
 			if(StringUtil.isEmpty(userRegion)){
 				userRegion=Constants.USER_REGION_PLACEHOLDER;
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index d78a7c419..7ee263784 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -557,7 +557,7 @@ http_req_body_control=HTTP Request Body Control
 http_res_control=HTTP Response Control
 http_res_hdr_control=HTTP Response Header Control
 http_res_body_control=HTTP Response Header Control
-av_control=Online Media
+av_control=Media Addr
 av_content_ip_control=Audio/Video IP
 av_picture_ip_control=Picture IP
 av_content_url_control=Audio/Video URL
@@ -569,8 +569,8 @@ av_sample_audio_control=Audio Sample
 av_sample_video_control=Video Sample
 av_sample_picture_control=Picture Sample
 av_sample_voip_control=VoIP Sample
-av_sample_audio_porn_control=Audio Sign Sample
-av_sample_video_porn_control=Video Sign Sample
+av_sample_audio_porn_control=Audio Scene Detection
+av_sample_video_porn_control=Video Scene Detection
 av_sample_control=Sample
 configure_statistics_info=Configure statistics info
 harm_level=Degree of harm
@@ -836,8 +836,8 @@ av_sample_audio=Audio Sample
 av_sample_video=Video Sample
 av_sample_picture=Picture Sample
 av_sample_voip=VoIP Sample
-av_sample_audio_porn=Audio Sign Sample
-av_sample_video_porn=Video Sgin Sample
+av_sample_audio_porn=Audio Scene Detection
+av_sample_video_porn=Video Scene Detection
 WHITE_LIST_IP=IP White List
 av_voip_ip=VoIP IP Configuration
 NTC_HTTP_URL=URL Configuration
@@ -933,10 +933,10 @@ pic_sample_reject=Picture Sample Control
 pic_sample_monit=Picture Sample Monitoring
 voip_sample_reject=VoIP Sample Control
 voip_sample_monit=VoIP Sample Monitoring
-audio_pornography_sample_reject=Audio Sign Control
-audio_pornography_sample_monit=Audio Sign Monitoring
-video_pornography_sample_reject=Video Sign Control
-video_pornography_sample_monit=Video Sign Monitoring
+audio_pornography_sample_reject=Audio Scene Detection Control
+audio_pornography_sample_monit=Audio Scene Detection Monitoring
+video_pornography_sample_reject=Video Scene Detection Control
+video_pornography_sample_monit=Video Scene Detection Monitoring
 ip_white_monit=IP Address White List Monitoring
 ip_white_reject=IP Address White List Control
 ip_white_whitelist=IP Address White List
@@ -1052,7 +1052,7 @@ traffic_website_type_chart=Website Type
 website=Website
 #===============dashboard end===================================
 ratelimit_limit=Limit Rate must between 0 and 100
-Maintenance=Policy Objects
+Maintenance=Advanced
 Proxy=Proxy
 selective=Selective
 ip_protocol=IP Protocol
diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
index efb1d5558..027450d77 100644
--- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
@@ -22,9 +22,8 @@
 			<div class="col-md-6">
 				<select name="userRegion1"
 				class="selectpicker show-tick form-control">
-					<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>>Silent</option>
 					<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
-						<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
+						<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode  || (empty _cfg.userRegion1 && responseCodeC.itemCode eq 404)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>
@@ -34,10 +33,9 @@
 	<div class="col-md-6">
 		<div class="form-group ">
 			<label class="control-label col-md-3">
-				<font color="red" class="userRegion2">*</font>
 				<spring:message code="response_content" /></label>
 			<div class="col-md-6">
-				<input class="form-control required" type="text"
+				<input class="form-control" type="text"
 					name="userRegion2"
 					value="${_cfg.userRegion2 }">
 			</div>
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 06993c734..7b2f3b023 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
@@ -237,22 +237,27 @@
 		<c:if test="${action eq 16 }">
 			<c:set var="configPermissionName" value="control:httpBlock:config"/>
 			<c:set var="confirmPermissionName" value="control:httpBlock:confirm"/>
+			<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpBlockList?functionId=${cfg.functionId}"></c:set>
 		</c:if>
 		<c:if test="${action eq 48 }">
 			<c:set var="configPermissionName" value="control:httpRedirect:config"/>
 			<c:set var="confirmPermissionName" value="control:httpRedirect:confirm"/>
+			<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpRedirectList?functionId=${cfg.functionId}"></c:set>
 		</c:if>
 		<c:if test="${action eq 80 }">
 			<c:set var="configPermissionName" value="control:httpReplace:config"/>
 			<c:set var="confirmPermissionName" value="control:httpReplace:confirm"/>
+			<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpReplaceList?functionId=${cfg.functionId}"></c:set>
 		</c:if>
 		<c:if test="${action eq 1 }">
 			<c:set var="configPermissionName" value="control:httpMonit:config"/>
 			<c:set var="confirmPermissionName" value="control:httpMonit:confirm"/>
+			<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpMonitList?functionId=${cfg.functionId}"></c:set>
 		</c:if>
 		<c:if test="${action eq 128 }">
 			<c:set var="configPermissionName" value="control:httpWhitelist:config"/>
 			<c:set var="confirmPermissionName" value="control:httpWhitelist:confirm"/>
+			<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpWhitelistList?functionId=${cfg.functionId}"></c:set>
 		</c:if>
 		<shiro:hasPermission name="${configPermissionName }">
 			<button type="button" class="btn btn-primary"
@@ -286,7 +291,8 @@
 				<div class="portlet-body">
 					<div class="row" >
 						<sys:message content="${message}"/>
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/control/httpRedirect/list?functionId=${cfg.functionId}" method="post" class="form-search">
+						
+						<form:form id="searchForm" modelAttribute="cfg" action="${actionPath }" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
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 ec09225bc..31b3c6ede 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
@@ -30,7 +30,7 @@
 		ipMaskRange:"IP mask must between 0 and 32",
 		srcIpNotEqDestIp:"Sourse IP ",
 		destIpNotEqDestIp:" and destination IP ",
-		IpNotEqDestIp:" can't the same",
+		IpNotEqDestIp:" can't be the same",
 		srcIpIsNotValue:"Sourse IP can't be ",
 		destIpIsNotValue:"Destination IP can't be ",
 		ipRange:"Wrong IP format or start IP and end IP in two subnet",