From 6c80e62a45bb1ae6f718f3d3e730304691980647 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 20 Aug 2018 22:27:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87IP=EF=BC=8CAPP=20IP=20IP?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=85=B3=E7=B3=BB=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/update_function_region_dict_data.sql  | 11 +++-
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp    | 18 +++---
 .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp  | 22 ++++---
 .../WEB-INF/views/cfg/whitelist/ipForm.jsp    | 59 ++++---------------
 4 files changed, 46 insertions(+), 64 deletions(-)

diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql
index 74ab782f2..b160a3ff3 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -14,4 +14,13 @@ UPDATE function_service_dict SET region_code=1 WHERE function_id=200 AND ACTION
 UPDATE function_region_dict SET config_service_type='ratelimit',config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=53;
 #音视频IP
 UPDATE function_service_dict SET region_code=2 WHERE function_id=20 AND ACTION IN(1,16);
-UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=17;
\ No newline at end of file
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=17;
+#图片IP
+UPDATE function_service_dict SET region_code=1 WHERE function_id=21 AND ACTION IN(1,16);
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=24;
+#APP IP
+UPDATE function_service_dict SET region_code=1 WHERE function_id=405 AND ACTION IN(1);
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=62;
+#IP白名单
+UPDATE function_service_dict SET region_code=1 WHERE function_id=3 AND ACTION IN(128);
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=7;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index 51a3797dc..5338c35b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -5,12 +5,7 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
-	$(".action").on("change", function() {
-		$("#serviceId").val($(this).attr("serviceId"));
-	});
+	initCommIpVal();
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#cfgFrom").validate({
 		errorPlacement: function(error,element){
@@ -59,7 +54,15 @@ $(function(){
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="cfgRegionCode"isMaat="${region.isMaat}"
+			                   		 serviceType="${region.configServiceType}"
+			                   		 ipPortShow="${region.configIpPortShow}"
+			                   		 ipType="${region.configIpType}"
+			                   		 ipPattern="${region.configIpPattern}"
+			                   		 portPattern="${region.configPortPattern}"
+			                   		 direction="${region.configDirection}"
+			                   		 protocol="${region.configProtocol}"
+			                   		 value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -189,6 +192,7 @@ $(function(){
 															<input type="radio" name="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
+																regionCode="${service.regionCode}"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
index 03e7c51b1..50a64b0fa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
@@ -5,13 +5,7 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
-	$(".action").on("change", function() {
-		$("#serviceId").val($(this).attr("serviceId"));
-		$("#protocolId").val($(this).attr("protocolId"));
-	});
+	initCommIpVal();
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
 	$("#cfgFrom").validate({
@@ -56,8 +50,18 @@ $(function(){
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+                   				<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType}">
+                   				<input type="hidden" id="cfgType${region.configRegionCode}" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" id="cfgRegionCode${region.configRegionCode}"
+                   					 isMaat="${region.isMaat}"
+			                   		 serviceType="${region.configServiceType}"
+			                   		 ipPortShow="${region.configIpPortShow}"
+			                   		 ipType="${region.configIpType}"
+			                   		 ipPattern="${region.configIpPattern}"
+			                   		 portPattern="${region.configPortPattern}"
+			                   		 direction="${region.configDirection}"
+			                   		 protocol="${region.configProtocol}"
+			                   		 value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 6c1e40468..19bcf95b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -6,51 +6,7 @@
 <script type="text/javascript">
 $(function(){
 	switchIpInfo($("select[name$='ipType']"),"ipType");
-	$("input[name='isAreaEffective']").on('change',function(){
-		var val=$(this).val();
-		if(val==1){
-			$(".areaType").removeClass("hidden");
-			if($("input[name='areaType']:checked").val()==1){//areaISP
-				$("#areaIsp").removeClass("hidden");
-			}else if($("input[name='areaType']:checked").val()==0){//areaIp
-				$("#areaIp").removeClass("hidden");	
-			}
-		}else{
-			$(".areaType").addClass("hidden");
-			$("#areaIp").addClass("hidden");
-			$("#areaIsp").addClass("hidden");
-		}
-	});
-	$("input[name='areaType']").on('change',function(){
-		var val=$(this).val();
-		if($(this).is(":visible")){
-			if(val==0){
-				$("#areaIp").removeClass("hidden");
-				$("#areaIsp").addClass("hidden");
-			}else{
-				$("#areaIsp").removeClass("hidden");
-				$("#areaIp").addClass("hidden");
-			}
-		}else{
-			$("#areaIsp").addClass("hidden");
-			$("#areaIp").addClass("hidden");
-		}
-	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
-	$("select[name$='ipType']").on("change",function(){
-		switchIpInfo(this,"ipType");
-	}); 
-	$("select[name$='ipPattern']").on("change",function(){
-		switchIpInfo(this,"ipPattern");
-	}); 
-	$("select[name$='portPattern']").on("change",function(){
-		switchIpInfo(this,"portPattern");
-	}); 
-	$(".action").on("change",function(){
-		$("#serviceId").val($(this).attr("serviceId"));
-	});
+	initCommIpVal();
 	$("#ipCfgFrom").validate({
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
@@ -93,7 +49,8 @@ $(function(){
 							<input type="hidden" name="isAreaEffective" value="0">
 							<c:if test="${fn:length(serviceList)==1}">
 			            	<c:forEach items="${serviceList}" var="service">
-                				<input type="hidden" name="action" value="${service.action }">
+			            		 <input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType}">
+                				<input type="hidden" name="action" protocolId="${service.protocolId}" regionCode="${service.regionCode}" value="${service.action }">
 			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
 			            	</c:forEach>
 							</c:if>
@@ -104,7 +61,15 @@ $(function(){
                    			<c:forEach items="${regionList}" var="region">
 	                   			<c:if test="${_cfg.functionId eq region.functionId}">
 	                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-	                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+	                   				<input type="hidden" name="cfgRegionCode" isMaat="${region.isMaat}"
+			                   		 serviceType="${region.configServiceType}"
+			                   		 ipPortShow="${region.configIpPortShow}"
+			                   		 ipType="${region.configIpType}"
+			                   		 ipPattern="${region.configIpPattern}"
+			                   		 portPattern="${region.configPortPattern}"
+			                   		 direction="${region.configDirection}"
+			                   		 protocol="${region.configProtocol}"
+			                   		 value="${region.configRegionCode}">
 	                   			</c:if>
                    			</c:forEach>
                    			<h3 class="form-section"><spring:message code="block_config"/></h3>