From 613071175934c85fcf079252ceaad5f8535dc820 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 12 Sep 2018 19:28:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E9=85=8D=E7=BD=AE=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/av/switchSignSample.jsp     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
index 7447e5022..188e0cc82 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -18,9 +18,9 @@ $(function(){
 	if($("#oldAction").val()==1){
 		$("#level").show();
 	}else{
-		$("input[name$='level']").val("");
+		$("#level").hide();
 	}
-	$(".action").on("change",function(){
+	$("input[name~=action]").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 		if($(".action:checked").val()==1){
 			$("#level").show();
@@ -30,6 +30,9 @@ $(function(){
 		if($("#level").is(":hidden")){
 			$("input[name$='level']").val("");
 		}
+		if($(".action:checked").attr("id")=="actionOff"){
+			$("#level").hide();
+			}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#save").click(function(){
@@ -148,7 +151,7 @@ $(function(){
 											</c:forEach>
 												<input id="actionOff" serviceId="${_cfg.serviceId }"
 															isValid="${_cfg.isValid}"
-															type="radio" name="action" class="radio-inline action radio-off" value="0" <c:if test="${_cfg.isValid == 0}">checked</c:if>>  <spring:message code="off"/>
+															type="radio" name="action" class="radio-inline action radio-off" value="${_cfg.action }" <c:if test="${_cfg.isValid == 0}">checked</c:if>>  <spring:message code="off"/>
 							            </div>
 							            <div for="action"></div>
 						            	

From 284a796bb043cecb1b5f934eaab5ae2df5fcddb2 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 12 Sep 2018 19:40:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?dns=5Fres=5Fstrategy=20=E8=A1=A8=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEid=E8=87=AA=E5=A2=9E=E9=95=BF=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=20101?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/truncate_tables.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql
index 5d4ca9848..f5dc00d66 100644
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -30,6 +30,7 @@ DELETE FROM ddos_ip_cfg;
 DELETE FROM dns_domain_cfg;
 DELETE FROM dns_ip_cfg;
 DELETE FROM dns_res_strategy WHERE cfg_id <> 0;
+ALTER  TABLE  dns_res_strategy  auto_increment = 101
 DELETE FROM file_digest_cfg;
 DELETE FROM ftp_keyword_cfg;
 DELETE FROM http_body_cfg;