From 21c279fa3def3e24bf40983a7c96573916670774 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Fri, 31 Aug 2018 14:31:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dxmpp=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B9=8B=E5=90=8E=E8=B7=B3=E8=BD=AC404=202=E3=80=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=99=BD=E5=90=8D=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?do=5Flog=E3=80=81=E5=8C=BA=E5=9F=9F=E7=AE=A1=E6=8E=A7=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E3=80=81=E6=9D=A5=E5=87=BD=E3=80=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E3=80=81=E6=80=A7=E8=B4=A8=E3=80=81=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp |  2 +-
 .../WEB-INF/views/cfg/whitelist/domainList.jsp       | 12 ++++++------
 .../webapp/WEB-INF/views/cfg/whitelist/ipList.jsp    | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 2412312ec..6aaa7a4c5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -155,7 +155,7 @@
 								 <div class="pull-right">
 							 		<shiro:hasPermission name="other:xmpp:config">
 							 			<sys:delRow url="${ctx}/ntc/other/xmppForm" id="contentTable" label="update"></sys:delRow>
-                                        <sys:delRow url="${ctx}/ntc/other/updatexmppCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/other/updateXmppCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="other:xmpp:confirm">
 	                                    <div class="btn-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 16df2b1a0..1c69a2d34 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -178,7 +178,7 @@
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
+								<%-- <div class="row">
 								
 									<div class="col-md-3">
 											
@@ -238,7 +238,7 @@
                                           
                                         </div>
 									
-								</div>
+								</div> --%>
 								
 								<div class="row">
 									<div class="col-md-2">
@@ -309,12 +309,12 @@
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
-									<th><spring:message code="do_log"/></th>
+								<%-- 	<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
+									<th><spring:message code="label"/></th> --%>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
@@ -342,7 +342,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
@@ -415,7 +415,7 @@
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${fns:abbr(lableInfo,20)}
 										</a>
-									</td>
+									</td> --%>
 								    <td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index bd5ea8fbe..f11d70c5c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -178,7 +178,7 @@
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
+								<%-- <div class="row">
 								
 									<div class="col-md-3">
 											
@@ -238,7 +238,7 @@
                                           
                                         </div>
 									
-								</div>
+								</div> --%>
 								
 								<div class="row">
 									<div class="col-md-2">
@@ -309,12 +309,12 @@
 									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
-									<th><spring:message code="do_log"/></th>
+									<%-- <th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
+									<th><spring:message code="label"/></th> --%>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
@@ -342,7 +342,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
@@ -415,7 +415,7 @@
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${fns:abbr(lableInfo,20)}
 										</a>
-									</td>
+									</td> --%>
 								    <td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>