From 74bc7dc42f5c1bd7457ec34a045cd050c4a80fd3 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 26 Jul 2018 14:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=AD=96=E7=95=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9userregion=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA0=20DNS?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E7=AD=96=E7=95=A5=EF=BC=9A=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84=EF=BC=9A=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=20IP?=
 =?UTF-8?q?=E6=AC=BA=E9=AA=97=EF=BC=9A=E6=89=80=E5=B1=9E=E7=BB=84=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E7=BC=BA=E7=9C=81=E7=BB=84?=
 =?UTF-8?q?=20ip=E5=A4=8D=E7=94=A8=E5=9C=B0=E5=9D=80=E6=B1=A0=EF=BC=9A?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BB=84=EF=BC=9A=E9=9D=9E=E7=A9=BA=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=80=890=E7=BB=84=20Dns=EF=BC=9A=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E6=97=A0=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=20=E4=BF=AE=E6=94=B9HTTP=E7=AE=A1=E6=8E=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E9=80=89=E6=8B=A9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=86=85=E5=AE=B9=E5=8F=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/DnsIpCfgDao.xml |  6 +++---
 .../configuration/HttpRedirectCfgService.java | 15 ++++++++------
 .../resources/messages/message_en.properties  |  3 +++
 .../messages/message_zh_CN.properties         |  3 +++
 .../update_policy_group_auto_increment.sql    |  2 ++
 .../WEB-INF/views/cfg/actionRegionForm.jsp    | 20 ++++++++++---------
 .../cfg/maintenance/dnsResStrategy/form.jsp   |  2 +-
 .../cfg/maintenance/dnsResStrategy/list.jsp   |  4 ++--
 .../cfg/maintenance/ipMultiplexPool/form.jsp  |  8 +++++---
 .../cfg/proxy/control/httpRedirectForm.jsp    | 18 +++++++++++++++++
 .../WEB-INF/views/cfg/website/dnsForm.jsp     |  2 +-
 .../WEB-INF/views/cfg/website/dnsList.jsp     |  6 +++++-
 12 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 src/main/resources/sql/update_policy_group_auto_increment.sql

diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
index 3a9192d02..fff9301a9 100644
--- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
@@ -52,10 +52,10 @@
     		<include refid="columns"></include>
     		 <trim prefix="," prefixOverrides=",">
 				,s.name as creator_name,e.name as editor_name,u.name as auditor_name
-				,ri.request_title as requestName,dns.cfg_Desc as dns_strategy_name
+				,ri.request_title as requestName,dns.group_name as dns_strategy_name
 			</trim>
     	from dns_ip_cfg r
-    	left join dns_res_strategy dns on dns.cfg_Id=r.dns_strategy_id
+    	left join policy_group_info dns on dns.group_id=r.dns_strategy_id
     	left join sys_user s on r.creator_id=s.id
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
@@ -71,7 +71,7 @@
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="dnsStrategyName != null and dnsStrategyName != ''">
-	    		AND dns.cfg_desc like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%') 
+	    		AND dns.group_name like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfgRegionCode != null">
 	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
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 f5168b7ca..0d5c6aa6d 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -419,12 +419,13 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			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+";"+Constants.REDIRECT_CONTENT_KEY+"="+entity.getUserRegion2();
-				}else{
-					userRegion="";
-				}
+				
 			}
 			//HTTP redirect
 			if(entity.getAction().equals(48)){
@@ -460,7 +461,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 					userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
 				}
 			}
-			
+			if(StringUtil.isEmpty(userRegion)){
+				userRegion=Constants.USER_REGION_PLACEHOLDER;
+			}
 			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 7391f7335..bab1e8e04 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -770,6 +770,8 @@ replace_content=Replace Content
 all_types=All Type
 group_type=Group Type
 group_name=Group Name
+default_group=Default Group
+group=Group
 policy_group_manage=Policy Group Management
 #===========policy_group_manage end  =============
 #=============about manipulation=========
@@ -781,6 +783,7 @@ domain_ratelimit=Domain Ratelimit
 ratelimit=Limit Rate
 ir_type=Reuse type
 dns_strategy_id=DNS Policy ID
+no_strategy=No Strategy
 #=============about manipulation=========
 #=============about app config===========
 domain=Domain
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index c11a591f0..dbf4537c2 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -772,6 +772,8 @@ replace_content=\u66FF\u6362\u5185\u5BB9
 all_types=\u6240\u6709\u7C7B\u578B
 group_type=\u5206\u7EC4\u7C7B\u578B
 group_name=\u5206\u7EC4\u540D\u79F0
+default_group=\u7F3A\u7701\u7EC4
+group=\u6240\u5C5E\u7EC4
 policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406
 #===========policy_group_manage end  =============
 #=============about manipulation=========
@@ -783,6 +785,7 @@ domain_ratelimit=\u57DF\u540D\u9650\u6D41
 ratelimit=\u9650\u901F\u6BD4\u4F8B
 ir_type=\u590D\u7528\u7C7B\u578B
 dns_strategy_id=dns\u7B56\u7565id
+no_strategy=\u65E0\u7B56\u7565
 #=============about manipulation=========
 #=============about app config===========
 domain=\u57DF\u540D
diff --git a/src/main/resources/sql/update_policy_group_auto_increment.sql b/src/main/resources/sql/update_policy_group_auto_increment.sql
new file mode 100644
index 000000000..fc75e73b7
--- /dev/null
+++ b/src/main/resources/sql/update_policy_group_auto_increment.sql
@@ -0,0 +1,2 @@
+--update policy_group_info auto_increament start with 101
+alter table policy_group_info auto_increment=101;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
index d1e633f3b..e897d781a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
@@ -16,14 +16,15 @@
 <div class="row">
 	<div class="col-md-6">
 		<div class="form-group">
-			<label class="control-label col-md-3"><font color="red">*</font>
+			<label class="control-label col-md-3">
 					<spring:message code="response_code" />
 			</label>
 			<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>><spring:message code="select"/></option>
 					<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
-						<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==responseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>><spring:message code="${responseCodeC.itemValue}"/></option>
+						<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>><spring:message code="${responseCodeC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>
@@ -32,10 +33,11 @@
 	</div>
 	<div class="col-md-6">
 		<div class="form-group ">
-			<label class="control-label col-md-3"><font color="red">*</font>
+			<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" type="text"
+				<input class="form-control required" type="text"
 					name="userRegion2"
 					value="${_cfg.userRegion2 }">
 			</div>
@@ -57,7 +59,7 @@
 			</label>
 			<div class="col-md-6">
 				<select name="userRegion1"
-				class="selectpicker show-tick form-control">
+				class="selectpicker show-tick form-control required">
 					<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="redirectResponseCodeC">
 						<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>><spring:message code="${redirectResponseCodeC.itemValue}"/></option>
 					</c:forEach>
@@ -71,7 +73,7 @@
 			<label class="control-label col-md-3"><font color="red">*</font>
 				<spring:message code="redirect_url" /></label>
 			<div class="col-md-6">
-				<input class="form-control url" type="text"
+				<input class="form-control url required" type="text"
 					name="userRegion2"
 					value="${_cfg.userRegion2 }">
 			</div>
@@ -93,7 +95,7 @@
 			</label>
 			<div class="col-md-6">
 				<select name="userRegion1"
-				class="selectpicker show-tick form-control">
+				class="selectpicker show-tick form-control required">
 					<c:forEach items="${fns:getDictList('REPLACE_ZONE')}" var="replaceZoneC">
 						<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
 					</c:forEach>
@@ -109,7 +111,7 @@
 			<label class="control-label col-md-3"><font color="red">*</font>
 				<spring:message code="replaced_content" /></label>
 			<div class="col-md-6">
-				<input class="form-control" type="text"
+				<input class="form-control required" type="text"
 					name="userRegion2"
 					value="${_cfg.userRegion2 }">
 			</div>
@@ -121,7 +123,7 @@
 			<label class="control-label col-md-3"><font color="red">*</font>
 				<spring:message code="replace_content" /></label>
 			<div class="col-md-6">
-				<input class="form-control" type="text"
+				<input class="form-control required" type="text"
 					name="userRegion3"
 					value="${_cfg.userRegion3 }">
 			</div>
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 387a22c51..4412ca2b7 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
@@ -161,7 +161,7 @@ $(function(){
 								<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select name="resGroup1Id" class="selectpicker show-tick form-control required">
 													<option value=""><spring:message code="select"/></option>
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 bd622554f..30f2d0782 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
@@ -87,7 +87,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="policy_name"></spring:message></form:option>
-												<form:option value="group1Name"><spring:message code="group_name"></spring:message></form:option>
+												<form:option value="group1Name"><spring:message code="group"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -261,7 +261,7 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="policy_number"/></th>
 									<th><spring:message code="policy_name"/></th>
-									<th><spring:message code="group_name"/></th>
+									<th><spring:message code="group"/></th>
 			 						<th><spring:message code="res_group_num"/></th>
 									<th><spring:message code="min_ttl"/></th>
 									<th><spring:message code="max_ttl"/></th>
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 e527202bd..c44a8b6e1 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
@@ -76,16 +76,18 @@ $(function(){
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group"> 
-								            <label class="control-label col-md-3"><spring:message code="group_name"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="policyGroup" class="selectpicker show-tick form-control">
-													<option value="0"><spring:message code="select"/></option>
+								            	<select name="policyGroup" class="selectpicker show-tick form-control required">
+													<option value="" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
 								                </select>
 								            </div>
+								              <div for="policyGroup"></div>
 								        </div>
+								        
 								    </div>
 								    <div class="col-md-6 hidden">
 								        <div class="form-group"> 
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 c1712a8bb..cdc26593f 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
@@ -13,6 +13,13 @@
 	$(document)
 			.ready(
 					function() {
+						var action=$(".action").val();
+						if(action == 16){
+							userRegionSwitch($("select[name=userRegion1]").val());
+							$("select[name=userRegion1]").on("change", function() {
+								userRegionSwitch($(this).val());							
+							});
+						}
 						$("#cancel").on("click", function() {
 							window.history.back();
 						});
@@ -95,6 +102,17 @@
 		$("." + contentClassName).addClass("hidden").addClass("disabled");
 		$("." + addBtnClassName).removeClass("hidden");
 	}
+	function userRegionSwitch(userRegion1){
+		if(userRegion1 == null || userRegion1 == ''){
+			$("input[name=userRegion2]").removeClass("required");
+			$("font[class=userRegion2]").addClass("hidden");
+			$("div[for=userRegion2]").addClass("hidden");
+		}else{
+			$(".userRegion2").removeClass("hidden");
+			$("input[name=userRegion2]").addClass("required");
+			$("div[for=userRegion2]").removeClass("hidden");
+		}
+	}
 </script>
 </head>
 <body>
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 a40b0256a..a0d5ba238 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -175,7 +175,7 @@
 													code="policy_name" /></label>
 											<div class="col-md-6">
 												<select name="dnsStrategyId" class="selectpicker show-tick form-control">
-												<option value="0" ><spring:message code="select"/></option>
+												<option value="0" ><spring:message code="no_strategy"/></option>
 					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
 														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
 							              			</c:forEach>
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 ee63adb79..3e4eedf6d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -331,7 +331,11 @@
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
 								    <td>${indexCfg.cfgDesc }</td>
-								    <td>${indexCfg.dnsStrategyName }</td>
+								    <td>${indexCfg.dnsStrategyName }
+								    	<c:if test="${empty indexCfg.dnsStrategyName && indexCfg.action==16}">
+											<spring:message code="no_strategy"/>
+										</c:if>
+								    </td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.action }">