From f9a39c7801904d1a1c5ee2eb2fae22490167d57a Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Thu, 10 Jan 2019 15:47:52 +0600
Subject: [PATCH] =?UTF-8?q?app=20block=E5=A2=9E=E5=8A=A0DKC=3D8=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=9F(userRegion4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/configuration/AppCfgService.java   |  4 ++--
 src/main/resources/nis.properties                  |  2 +-
 .../WEB-INF/views/cfg/app/appPolicyCfgForm.jsp     | 14 ++++++++++++--
 .../WEB-INF/views/cfg/app/appPolicyCfgList.jsp     | 13 +++++--------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index 32d8d0b49..bd5a497f1 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -1021,8 +1021,8 @@ public class AppCfgService extends BaseService {
 					userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3();
 				}
 			}
-			//VIGNORE=1
-			if(StringUtil.isEmpty(entity.getUserRegion4())){
+			//DKC=8
+			if(!StringUtil.isEmpty(entity.getUserRegion4())){
 				userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1";
 			}
 			userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId();
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index b551327a4..a667d00d1 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -557,7 +557,7 @@ max_allowed_packet=1048576
 http_max_connection=1000
 default_max_perroute=100
 poolcm_socket_timeout=3000
-app_vignore_user_region_key=VIGNORE
+app_vignore_user_region_key=DKC
 #policies\u83dc\u5355\u7684\u83dc\u5355ID
 policies_menu_id=86
 userCreate=UserCreate
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 2939d2381..edd647b53 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -8,6 +8,11 @@ $(function(){
 	$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
 		switchRateLimitType();
 	});
+	if($(".action:checked").val()==16){
+		$(".dnsIpSpoofing").removeClass("hidden");
+	}else{
+		$(".dnsIpSpoofing").addClass("hidden");
+	}
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
@@ -24,6 +29,11 @@ $(function(){
 		if($(this).val()==1){
 			$(".ipPortAdd").click();
 		}
+		if($(".action:checked").val()==16){
+			$(".dnsIpSpoofing").removeClass("hidden");
+		}else{
+			$(".dnsIpSpoofing").addClass("hidden");
+		}
 		switchAction($(this).val());
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -316,10 +326,10 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <div for="action"></div>
 										       </div>
 										   </div>
-										   <div class="col-md-6 hidden">
+										   <div class="col-md-6 dnsIpSpoofing hidden">
 										        <div class="form-group">
 										            <label class="control-label col-md-3">
-										            	<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%>   value="1">
+										            	<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if>   value="8">
 										            </label>
 										            <div class="col-md-6">
 										            	<label class="control-label">
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 e36d740c3..f8d94a82c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -384,7 +384,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.compile_id" style="display: none" column="cfg_id" ><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
- 								    <%-- <th><spring:message code="block_by_app_server_ip"/></th> --%>
+ 								    <th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th>
 									<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
 									<th column="ratelimit" ><spring:message code="ratelimit"/></th>
  									<th column="social_app" ><spring:message code="social_app"/></th>
@@ -415,14 +415,11 @@
 									</td>
 									<td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
-								   <%--  <td>
-								    	<c:if test="${cfg.userRegion4 eq '1'}">
-											<spring:message code="yes"/>
+								    <td>
+								    	<c:if test="${cfg.userRegion4 eq '8'}">
+											<spring:message code="block_by_app_server_ip"/>
 								    	</c:if>
-								    	<c:if test="${empty cfg.userRegion4}">
-											<spring:message code="no"/>
-								    	</c:if>
-								    </td> --%>
+								    </td>
 								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">