From 034b4500fd46848b7391449c4f3db153df4351e2 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Thu, 25 Oct 2018 16:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=B7=E4=BE=8B=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=BA=A6=E8=B0=83=E6=95=B4=E4=B8=BA=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=A6=E6=88=AA=E7=95=8C=E9=9D=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  4 +-
 .../WEB-INF/views/cfg/av/switchSignSample.jsp | 42 ++++++++++++++-----
 .../views/cfg/intercept/interceptList.jsp     | 12 +++---
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 15e1e5ac6..df671021b 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -165,7 +165,7 @@ ssl_certificate_monitor=SSL Cert Monitor
 response_header_control=Response Header Control
 ip_website_text_control=IP+Website Keyword Control
 request_task=Letter and Task
-realtime_report=Log Report
+realtime_report=Statistics
 protocol_and_app=Protocol And App
 text_content_monitor=Plaintext
 multimedia=Multimedia
@@ -991,7 +991,7 @@ ip_multiplex_pool_config=IP Reuse Addr Pool
 letter=Official Letter
 show_more=Show More
 #===============dashboard begin===================================
-dashboard=Dashboard
+dashboard=Traffic Statistics
 traffic_chart=Traffic Chart
 os_type=OS Type
 browser_type=Browser Type
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 f2e12c7c3..b46b28cd5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -16,23 +16,37 @@ $(function(){
 		})
 	}); */
 	if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){
-		$("#level").show();
+		$(".level").removeClass("hidden");
+		$(".level").find("select[name='level']").find("option").eq(0).attr("value","");
+		$(".level").find("select[name='level']").val("100");
+		$(".level").find("select[name='level']").selectpicker("refresh");
 	}else{
-		$("#level").hide();
-		$("input[name$='level']").val(0);
+		$(".level").addClass("hidden");
+		$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+		$(".level").find("select[name$='level']").val("0");
+		$(".level").find("select[name$='level']").selectpicker("refresh");
 	}
 	$("input[name~=action]").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 		if($(".action:checked").val()==1){
-			$("#level").show();
-			}else{
-			$("#level").hide();
-			}
+			$(".level").removeClass("hidden");
+			$(".level").find("select[name$='level']").find("option").eq(0).attr("value","");
+			$(".level").find("select[name$='level']").val("100");
+			$(".level").find("select[name$='level']").selectpicker("refresh");
+		}else{
+			$(".level").addClass("hidden");
+			$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+			$(".level").find("select[name$='level']").val("0");
+			$(".level").find("select[name$='level']").selectpicker("refresh");
+		}
 		if($("#level").is(":hidden")){
 			$("input[name$='level']").val(0);
 		}
 		if($(".action:checked").attr("id")=="actionOff"){
-			$("#level").hide();
+				$(".level").addClass("hidden");
+				$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+				$(".level").find("select[name$='='level']").val("0");
+				$(".level").find("select[name$='level']").selectpicker("refresh");
 			}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -172,13 +186,19 @@ $(function(){
 										<div class="row">
 											<div class="col-md-6">
 										        <div class="form-group ">
-										            <div id="level" class="form-group" hidden="hidden">
+										           <div id="level" class="form-group level hidden" >
 											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 											            <div class="col-md-6">
-											            	 <input class="form-control required number" range="[0,100]" type="text" name="cfgs[${status.index }].level" value="${_cfg.level }">
+											            	 <select name="cfgs[${status.index }].level" data-live-search="true" class="selectpicker form-control required">
+																	<option value="0" ><spring:message code="selected"/></option>
+																	<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
+																		<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 100)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
+																	</c:forEach>
+																</select>
 											            </div>
 											        </div>
-										            <div for="cfgs[${status.index }].level"></div>
+											            
+											            <div for="cfgs[${status.index }].level"></div>
 										        </div>
 										    </div>
 										</div>
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 cef5c27ea..3b2d4f4fe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -94,7 +94,7 @@
 </c:if>
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
+		<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
 			<button type="button" class="btn btn-primary"
 				onClick="javascript:window.location='${ctx}/proxy/intercept/intercept${interceptType}Form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
@@ -116,7 +116,7 @@
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>
-		</customTag:hasAnyPermissions>
+		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
@@ -190,12 +190,12 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-							 		<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
+							 		<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
 							 			<sys:delRow url="${ctx}/proxy/intercept/intercept${interceptType}Form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/proxy/intercept/updateIntercept${interceptType}Valid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                    	    <sys:delRow url="${ctx}/proxy/intercept/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> 
-                                    </customTag:hasAnyPermissions>
-                                    <customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:confirm">
+                                    </shiro:hasPermission>
+                                    <shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -207,7 +207,7 @@
 												<li><sys:delRow url="${ctx}/proxy/intercept/auditIntercept${interceptType}Cfg?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
-                                    </customTag:hasAnyPermissions>
+                                    </shiro:hasPermission>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>