From 2706901ea218dcb0c417c2ad41b0e470069f468a Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Thu, 10 Jan 2019 13:30:19 +0600
Subject: [PATCH] =?UTF-8?q?pxy=E6=8B=A6=E6=88=AA=E4=B8=9A=E5=8A=A1doLog?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/intercept/interceptForm.jsp     | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index d8cabe053..e109e313b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -338,12 +338,26 @@
 			$(".whiteListAction").addClass("hidden");
 			$(".spoofingAction").addClass("hidden");
 			$(".intensity").addClass("hidden");//域名关联度
-			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){	
+			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				var selectedOp = $("select[name='"+protocolNamePrefix+"protocol']").find("option[selected]").val();
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
-				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>");
-				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6'>TCP</option>");
-				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>");
+				if((selectedOp == "0") || (typeof selectedOp == "undefined") || (!"${_cfg.cfgId}")){
+					var option1 = "<option value='0' selected>"+$.validator.messages.arbitrary+"</option>";
+					var option2 = "<option value='6'>TCP</option>";
+					var option3 = "<option value='17'>UDP</option>";
+				}else if(selectedOp == "6"){
+					var option1 = "<option value='0'>"+$.validator.messages.arbitrary+"</option>";
+					var option2 = "<option value='6' selected>TCP</option>";
+					var option3 = "<option value='17'>UDP</option>";
+				}else{
+					var option1 = "<option value='0'>"+$.validator.messages.arbitrary+"</option>";
+					var option2 = "<option value='6'>TCP</option>";
+					var option3 = "<option value='17' selected>UDP</option>";
+				}
+				$("select[name='"+protocolNamePrefix+"protocol']").append(option1);
+				$("select[name='"+protocolNamePrefix+"protocol']").append(option2);
+				$("select[name='"+protocolNamePrefix+"protocol']").append(option3);
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
 				switchRateLimitType();
 			}
@@ -378,11 +392,22 @@
 			$(".spoofingAction").addClass("hidden");
 			$(".intensity").addClass("hidden");//域名关联度
 			if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
+				var selectedOp = $("select[name='"+protocolNamePrefix+"protocol']").find("option[selected]").val();
 				$("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
 				//$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>")
-				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6' selected>TCP</option>")
-				$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>")
+				if((selectedOp == "6") || (typeof selectedOp == "undefined")){
+					var option1 = "<option value='6' selected>TCP</option>";
+					var option2 = "<option value='17'>UDP</option>";
+				}else if(selectedOp == "17"){
+					var option1 = "<option value='6'>TCP</option>";
+					var option2 = "<option value='17' selected>UDP</option>";
+				}else{
+					var option1 = "<option value='6' selected>TCP</option>";
+					var option2 = "<option value='17'>UDP</option>";
+				}
+				$("select[name='"+protocolNamePrefix+"protocol']").append(option1)
+				$("select[name='"+protocolNamePrefix+"protocol']").append(option2)
 				$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
 			}
 			if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
@@ -458,7 +483,7 @@
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
 							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
 							<input type="hidden" id="regionSize" name="regionSize" value="${fn:length(regionList)}">
-							<input type="hidden" id="doLog" name="doLog" value="1">
+							<input type="hidden" id="doLog" name="doLog" value="2">
 
 							<div class="form-body">