From 4b104a9fa66d1cbcf8d510790d545ea01f978c7b Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 25 Jul 2018 09:58:30 +0800
Subject: [PATCH] =?UTF-8?q?HTTP=E6=9B=BF=E6=8D=A2=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=A9=BA=E6=A0=BC=E5=92=8C=E6=96=9C=E6=9D=A0?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9HTTP=20=E4=B8=9A=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4ip=E8=A1=A8sql=EF=BC=88=E5=8E=BB=E6=8E=89prot?=
 =?UTF-8?q?ocolId=E6=9D=A1=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/WebsiteCfgDao.xml   |  6 +-
 .../java/com/nis/web/service/BaseService.java |  9 +++
 .../configuration/HttpRedirectCfgService.java | 56 +++++++++++++++----
 .../resources/messages/message_en.properties  |  1 +
 .../messages/message_zh_CN.properties         |  1 +
 5 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index 424a50444..b0b6504c1 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -226,7 +226,9 @@
 	    	<if test="ipPort!=null">
 	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
 	    		<where>
-	    			and t.protocol_id=4
+	    			<if test="functionId != null">
+			    		AND t.function_id=#{functionId,jdbcType=INTEGER}
+			    	</if>
 	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
 	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
@@ -857,7 +859,7 @@
   </update>
   <!-- 删除http子配置 -->
   <delete id="deleteHttpIpCfg" >
-  	delete from ip_port_cfg where compile_id=#{compileId} and protocol_id=4 and function_id=#{functionId}
+  	delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId}
   </delete>
   <delete id="deleteHttpUrlCfg">
   	delete from http_url_cfg where compile_id=#{compileId} and function_id=#{functionId}
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 8c69a44be..4f5d05b17 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -593,4 +593,13 @@ public abstract class BaseService {
 		}
 		return cfgKeywords;
 	}
+	public static String replaceContentEscape(String replaceContent){
+		if(StringUtils.isNotEmpty(replaceContent)){
+			//不转译特殊字符
+			replaceContent = replaceContent.trim();//首先去掉首尾空格
+			replaceContent=replaceContent.replace("/", "\\/");
+			replaceContent=replaceContent.replace(" ", "\\b");
+		}
+		return replaceContent;
+	}
 }
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 f5e64f96f..f5168b7ca 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
@@ -414,21 +415,52 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 							 Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
 				}
 			}*/
-			if(!StringUtil.isEmpty(entity.getUserRegion1())){
-				userRegion=userRegion+"userRegion1="+entity.getUserRegion1();
+			//HTTP block
+			if(entity.getAction().equals(16)){
+				if(!StringUtil.isEmpty(entity.getUserRegion1())){
+					userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1();
+				}
+				if(!StringUtil.isEmpty(entity.getUserRegion2())){
+					userRegion=userRegion+";"+Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
+				}else{
+					userRegion="";
+				}
 			}
-			if(!StringUtil.isEmpty(entity.getUserRegion2())){
-				userRegion=userRegion+";userRegion2="+entity.getUserRegion2();
+			//HTTP redirect
+			if(entity.getAction().equals(48)){
+				if(!StringUtil.isEmpty(entity.getUserRegion1())){
+					userRegion=Constants.REDIRECT_RESPONSE_CODE_KEY+"="+entity.getUserRegion1();
+				}
+				if(!StringUtil.isEmpty(entity.getUserRegion2())){
+					userRegion=userRegion+";"+Constants.REDIRECT_URL_KEY+"="+entity.getUserRegion2();
+				}else{
+					userRegion="";
+				}
 			}
-			if(!StringUtil.isEmpty(entity.getUserRegion3())){
-				userRegion=userRegion+";userRegion3="+entity.getUserRegion3();
-			}
-			if(!StringUtil.isEmpty(entity.getUserRegion4())){
-				userRegion=userRegion+";userRegion4="+entity.getUserRegion4();
-			}
-			if(!StringUtil.isEmpty(entity.getUserRegion5())){
-				userRegion=userRegion+";userRegion5="+entity.getUserRegion5();
+			//HTTP replace
+			if(entity.getAction().equals(80)){
+				if(!StringUtil.isEmpty(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;
+				}
 			}
+			
 			maatCfg.setUserRegion(userRegion);
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 35b133e94..ee9bbfc0c 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -890,6 +890,7 @@ response_code=Response Code
 response_content=Response Content
 not_found=Not Found
 silent=Silent
+action_region=Action Region
 redirect_response_code=Redirect Response Code
 redirect_url=Redirect URL
 replace_zone=Replace Zone
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index b04de93f5..57f3906d1 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -892,6 +892,7 @@ response_code=\u5E94\u7B54\u7801
 response_content=\u54CD\u5E94\u5185\u5BB9
 not_found=\u4E0D\u5B58\u5728
 silent=\u5173\u95ED
+action_region=\u52A8\u4F5C\u89C4\u5219
 redirect_response_code=\u91CD\u5B9A\u5411\u5E94\u7B54\u7801
 redirect_url=\u91CD\u5B9A\u5411URL
 replace_zone=\u66FF\u6362\u533A\u57DF