From de34fd910328a52a8c4127a08aefa87f28faa9fe Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Wed, 21 Nov 2018 10:25:34 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=A2=9E=E5=8A=A0=E9=99=90=E9=80=9F?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/app/appPolicyCfgForm.jsp      |  9 +++++++--
 .../WEB-INF/views/cfg/app/appPolicyCfgList.jsp      | 13 +++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 1ee80e58d..a68bb7b2b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -293,10 +293,15 @@ var delContent = function(contentClassName, addBtnClassName) {
 										       </div>
 										   </div>
 										   <div class="col-md-6" id="ratelimit">
-										        <div class="form-group">
+												<div class="form-group ">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 										            <div class="col-md-6">
-										                <input class="form-control required digest" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
+										            	<select name="ratelimit" data-live-search="true" class="selectpicker form-control required">
+															<option value="" ><spring:message code="selected"/></option>
+															<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
+																<option value="${ratelimitC.itemCode}" <c:if test="${_cfg.ratelimit==ratelimitC.itemCode || (_cfg.ratelimit==null && ratelimitC.itemCode eq '0.1')}">selected</c:if>><spring:message code="${ratelimitC.itemValue}"/></option>
+															</c:forEach>
+														</select>
 										            </div>
 										            <div for="ratelimit"></div>
 										        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 5aa05a071..6002f45c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -371,8 +371,8 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
-<%-- 								    <th><spring:message code="ratelimit"/></th>
- --%>								<th class="sort-column r.action"><spring:message code="block_type"/></th>
+ 								    <th><spring:message code="ratelimit"/></th>
+									<th class="sort-column r.action"><spring:message code="block_type"/></th>
  									<th><spring:message code="social_app"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
 								    <th><spring:message code="is_audit"/></th>
@@ -401,6 +401,15 @@
 									</td>
 									<td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
+								    <td>
+								    	<c:if test="${cfg.action eq 64}">
+								    		<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
+												<c:if test="${cfg.ratelimit==ratelimitC.itemCode}">
+												<spring:message code="${ratelimitC.itemValue}"/>
+												</c:if>
+											</c:forEach>
+								    	</c:if>
+								    </td>
 								    <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">