From 52eace95a3d7caab28ad73c232f374ee046717b2 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Wed, 16 Jan 2019 12:53:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=8B=A6=E6=88=AA=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=97=B6doLog?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=EF=BC=9B2.DDOS=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=EF=BC=9B3.Porn=20detecction=E5=A2=9E=E5=8A=A0doLog=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20190116/update_function_dicts.sql    |  2 ++
 .../WEB-INF/views/cfg/av/switchSignSample.jsp | 26 +++++++++++++++++++
 .../cfg/proxy/control/httpRedirectForm.jsp    | 23 ++++++++--------
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/main/resources/sql/20190116/update_function_dicts.sql

diff --git a/src/main/resources/sql/20190116/update_function_dicts.sql b/src/main/resources/sql/20190116/update_function_dicts.sql
new file mode 100644
index 000000000..1ae3fb24b
--- /dev/null
+++ b/src/main/resources/sql/20190116/update_function_dicts.sql
@@ -0,0 +1,2 @@
+-- DDOS Monit Import
+UPDATE function_region_dict SET is_import = 1 WHERE dict_id = 157;
\ No newline at end of file
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 f924e40e9..f75be364f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -168,6 +168,7 @@ $(function(){
 																	<input type="radio" name="action"
 																		serviceId="${service.serviceId }"
 																		protocolId="${service.protocolId }"
+																		configDoLog="${service.configDoLog }"
 																		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">
@@ -183,6 +184,31 @@ $(function(){
 										        </div>
 										    </div>
 										</div>
+										
+										<!-- dolog begin-->
+										<div class="row doLog">
+											<div class="col-md-6">
+												<div class="form-group">
+													<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+													<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													</c:forEach>
+												</div>
+											</div>
+										</div>
+										<!-- dolog end-->
+										
 										<div class="row">
 											<div class="col-md-6">
 										        <div class="form-group ">
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 94678d4bf..98339270d 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
@@ -204,19 +204,18 @@
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-															<c:choose>
-																<c:when test="${dict.itemCode eq doLog}">
-																	<label class="radio-inline">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
 																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
-																	</label>
-																</c:when>
-																<c:otherwise>
-																	<label class="radio-inline">
-																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
-																	</label>
-																</c:otherwise>
-															</c:choose>
-														
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
 												</c:forEach>
 											</div>
 										</div>