From 7a0787081c5996945f4e44bf1717bdb638c7a9b2 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 12 Jul 2018 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=81=AE=E7=9B=96=E5=B1=82=E4=B8=8D=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84bug=20=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87url=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp   | 3 ---
 src/main/webapp/WEB-INF/views/sys/dictList.jsp               | 2 +-
 src/main/webapp/WEB-INF/views/sys/officeList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/sys/roleList.jsp               | 2 +-
 src/main/webapp/WEB-INF/views/sys/userList.jsp               | 2 +-
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 421a51273..3441a1699 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -271,7 +271,6 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
@@ -292,7 +291,6 @@
 									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"/></th>
 									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
-									<%-- <th><spring:message code="operation"></spring:message></th> --%>
 								</tr>
 							</thead>
 							<tbody>
@@ -402,7 +400,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index ee3fb7bdb..e91444d25 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -292,7 +292,6 @@
 									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
 									<th><spring:message code="auditor"/></th>
 									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
-									<%-- <th><spring:message code="operation"></spring:message></th> --%>
 								</tr>
 							</thead>
 							<tbody>
@@ -402,13 +401,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index b7aff263b..9da8ef43d 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -273,7 +273,7 @@
 	</form:form>
 	</div>
 	
-	<spring:message code="${message}"/>
+	<sys:message content="${message}"  />
 	
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
diff --git a/src/main/webapp/WEB-INF/views/sys/officeList.jsp b/src/main/webapp/WEB-INF/views/sys/officeList.jsp
index f14a486a5..bf915b76e 100644
--- a/src/main/webapp/WEB-INF/views/sys/officeList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeList.jsp
@@ -63,7 +63,7 @@
 <%-- 		<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission> --%>
 <!-- 	</ul> -->
 <div class="table-responsive">
-	<spring:message code="${message}"/>
+	<sys:message content="${message}"/>
 	<table id="treeTable" class="table table-striped table-bordered table-condensed">
 		<thead><tr><th><spring:message code="org_name"/></th><th><spring:message code="belong_area"/></th><th><spring:message code="org_coding"/></th><th><spring:message code="level"/></th><th><spring:message code="org_type"/></th><th><spring:message code="org_duty_type"/></th><th><spring:message code="remarks"/></th><shiro:hasPermission name="sys:office:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 		<tbody id="treeTableList"></tbody>
diff --git a/src/main/webapp/WEB-INF/views/sys/roleList.jsp b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
index de985c132..255a4ab28 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
@@ -38,7 +38,7 @@
 						   <div class="col-md-12">
 							
 							
-								<spring:message code="${message}"/>
+								<sys:message content="${message}"/>
 								<table id="contentTable" class="table table-striped table-bordered table-condensed">
 									<tr><th><spring:message code="role_name"/></th><th><spring:message code="data_range"/></th><th><spring:message code="describe"/></th><shiro:hasPermission name="sys:role:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr>
 									<c:forEach items="${list}" var="role">
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp
index bf9e7371f..f58004bf5 100644
--- a/src/main/webapp/WEB-INF/views/sys/userList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp
@@ -162,7 +162,7 @@
 
 			</div>
 		</div>
-		<spring:message code="${message}" />
+		<sys:message content="${message}"  />
 		<table id="contentTable"
 			class="table table-striped table-bordered table-condensed">
 			<thead>