From 14301b43f3feaa9dd0a8624b8e4efc6423c1644c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 20 Aug 2018 21:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcommon.js=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B9=E6=B3=95=E8=B7=B3=E5=88=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84bug=20=E9=9F=B3=E8=A7=86=E9=A2=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E7=94=B1function=5Fregion=5Fdict?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/update_function_region_dict_data.sql  |  5 +++-
 .../views/cfg/av/contIp/contIpForm.jsp        | 23 +++++++++++--------
 .../WEB-INF/views/cfg/common/ipForm.jsp       | 11 +++------
 .../webapp/static/global/scripts/common.js    |  4 ++++
 4 files changed, 25 insertions(+), 18 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 bb874c7af..74ab782f2 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -11,4 +11,7 @@ UPDATE function_service_dict SET region_code=1 WHERE function_id=300 AND ACTION
 UPDATE function_region_dict SET config_service_type='ipmulitiplex',config_ip_port_show='1' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=68;
 #IP拦截
 UPDATE function_service_dict SET region_code=1 WHERE function_id=200 AND ACTION IN(1,128,64,80);
-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;
\ No newline at end of file
+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
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
index 2b3bad988..ff04ddeed 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.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">
@@ -82,6 +86,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/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index 40fae12dc..c6fd625a0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -72,8 +72,9 @@ $(function(){
                             <!-- 配置域类型 -->
                    			<c:forEach items="${regionList}" var="region">
 	                            <input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType}">
-	                            <input type="hidden" id="cfgType${region.configRegionCode}" value="${region.configRegionValue}">
-		                   		<input type="hidden" id="cfgRegionCode${region.configRegionCode}" isMaat="${region.isMaat}"
+	                            <input type="hidden" id="cfgType${region.configRegionCode}" name="cfgType" value="${region.configRegionValue}">
+		                   		<input type="hidden" id="cfgRegionCode${region.configRegionCode}" name="cfgRegionCode"
+		                   		 isMaat="${region.isMaat}"
 		                   		 serviceType="${region.configServiceType}"
 		                   		 ipPortShow="${region.configIpPortShow}"
 		                   		 ipType="${region.configIpType}"
@@ -123,12 +124,6 @@ $(function(){
 									   </div>
 								   </c:if>
 								</div>
-								<!-- desc and action -->
-								<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
-									<c:if test="${sfi.itemCode==_cfg.functionId}">
-									<c:set var="specialProtocol" value="${sfi.itemValue}"/>
-									</c:if>
-	               				</c:forEach>
 	               				<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
 	           			   		<div class="row ipmulitiplex hidden">
 								    <div class="col-md-6">
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 49954879f..3dfca5fc4 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -507,6 +507,7 @@ $(function(){
 								$(this).removeAttr("disabled");
 							}
 						});
+						$("select[name='protocol']").selectpicker("refresh");
 					}
 				
 				}
@@ -602,6 +603,7 @@ $(function(){
    $("input[name*='userRegion']").addClass("invisibleChar");
    $("#cancel").on("click",function(){
 		window.history.back();
+		return false;
    });
 });
 window.onload=function(){
@@ -1376,6 +1378,7 @@ var initCommIpVal=function(){
 					$(this).removeAttr("disabled");
 				}
 			});
+			$("select[name='protocol']").selectpicker("refresh");
 		}
 		if(serviceType&&serviceType.indexOf("ipaddr")>-1&&$("input[name='action']").val()==32){
 			$("select[name='protocol'] option").each(function(){
@@ -1383,6 +1386,7 @@ var initCommIpVal=function(){
 					$(this).removeAttr("disabled");
 				}
 			});
+			$("select[name='protocol']").selectpicker("refresh");
 		}
 		if(serviceType.indexOf("ipmulitiplex")>-1){
 			$(".ipmulitiplex").removeClass("hidden");