From b88bf5beca4b5b5640caa3df9455fe0286a6909d Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Tue, 20 Nov 2018 17:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D=E9=99=90?=
 =?UTF-8?q?=E9=80=9F=E6=B2=A1=E6=9C=89=E6=8B=A6=E6=88=AA=E9=99=90=E5=BA=A6?=
 =?UTF-8?q?bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/intercept/interceptForm.jsp     | 19 +++++++++++++++++++
 .../views/cfg/intercept/interceptList.jsp     |  2 --
 2 files changed, 19 insertions(+), 2 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 bec64f3b0..320ca1eee 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -563,6 +563,25 @@
 								            <div for="userRegion1"></div>
 								        </div>
 							   		 </div>
+							   		 <!-- 域名拦截增加拦截强度 -->
+									<c:if test="${_cfg.functionId eq 201}">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="intercept_intensity" />
+												</label>
+												<div class="col-md-6">
+													<select name="userRegion5"
+													class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+															<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="userRegion5"></div>
+											</div>
+										</div>
+									</c:if>
 							   		 <div class="col-md-6 droprate">
 								        <div class="form-group ">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 24bba97d8..0c4363538 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -449,7 +449,6 @@
 								    <td>
 								    	<c:if test="${indexCfg.action eq 1}">
 								    		<c:forEach items="${certificateList}" var="certificate">
-								    		${indexCfg.userRegion1}
 												<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
 											</c:forEach>
 										</c:if>
@@ -464,7 +463,6 @@
 								    <td>
 								    	<c:if test="${indexCfg.action eq 1}">
 								    		<c:forEach items="${certificateList}" var="certificate">
-								    		${indexCfg.userRegion1}
 												<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
 											</c:forEach>
 										</c:if>