From 0f64a1c10e5705d3c9a7372923a3f7ca75f4b0aa Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 21 Aug 2018 08:27:18 +0800
Subject: [PATCH] =?UTF-8?q?DDOS=20IP,PXY=E6=8E=A7=E5=88=B6=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5,FTP=E9=A1=B5=E9=9D=A2IP=E5=8A=A0=E5=85=A5function=5Fr?=
 =?UTF-8?q?egion=5Fdict=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  | 25 +++++++++++++++++++
 .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp  |  1 +
 .../WEB-INF/views/cfg/ddosIpCfgForm.jsp       | 18 ++++++++++---
 .../views/cfg/fileTransfer/ftpForm.jsp        |  6 +++--
 .../cfg/proxy/control/httpRedirectForm.jsp    |  6 +++--
 5 files changed, 49 insertions(+), 7 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 84e59ed68..bce43004c 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -33,4 +33,29 @@ UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,4
 # mail ip
 UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=35 AND ACTION IN(16,1);
 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=33;
+# ddos ip
+UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=301 AND ACTION IN(32);
+UPDATE function_region_dict SET config_ip_port_show='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=74;
+# ftp ip
+UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=51 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=38;
+# pxy control
+UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=207 AND ACTION IN(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',config_protocol='0' WHERE dict_id=84;
+#pxy redirect
+UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=208 AND ACTION IN(48);
+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',config_protocol='0' WHERE dict_id=90;
+#pxy replace
+UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=209 AND ACTION IN(80);
+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',config_protocol='0' WHERE dict_id=96;
+#pxy monit
+UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=210 AND ACTION IN(1);
+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',config_protocol='0' WHERE dict_id=105;
+#pxy whitelist
+UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=211 AND ACTION IN(128);
+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',config_protocol='0' WHERE dict_id=101;
+
+
+
+
 
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 d8d983023..25d6eaefe 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
@@ -87,6 +87,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/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
index bc8d554d0..ff60ed13f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -5,13 +5,14 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
+	initCommIpVal();
+	/* $("#cancel").on("click",function(){
 		window.history.back();
 	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
-	});
+	}); */
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
 	$("#cfgFrom").validate({
@@ -58,7 +59,17 @@ $(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}"
+			                   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
                    			</c:if>
                    		</c:forEach>
                           <div class="form-body">
@@ -83,6 +94,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>>
 															<spring:message code="${service.actionCode }" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index d9786aa8d..b9a35ae8b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -13,13 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
+						initCommIpVal();
+						/* $("#cancel").on("click", function() {
 							window.history.back();
 						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
-						});
+						}); */
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
 						$("#cfgFrom").validate(
@@ -174,6 +175,7 @@
 															<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/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index 3be799c7d..cb8639163 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,13 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
+						initCommIpVal();
+						/* $("#cancel").on("click", function() {
 							window.history.back();
 						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
-						});
+						}); */
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
 						
@@ -177,6 +178,7 @@
 															<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">