1日志修改标题为配置中获取与菜单相同2.串联设备号改为字典中获取

2018-08-10 09:55:41 +08:00
parent 81936c44fa
commit b8b17f6f80
9 changed files with 54 additions and 25 deletions
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -222,7 +222,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		APP
+		<spring:message code="social_app_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -209,7 +209,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		DDOS
+		<spring:message code="dk_behavior"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -212,8 +212,11 @@ $(document).ready(function(){
 									<td>${log.attackMaxBps}</td>
 									<td>${log.attackTotalPkt}</td>
 									<td>${log.attackTotalByte}</td>
-									<td>${log.isBlcok}</td>
-									
+									<td>
+										<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
+											<c:if test="${dic.itemCode eq log.isBlcok}"><spring:message code="${dic.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto}</td>
 									<td>
@@ -225,7 +228,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		FTP
+		<spring:message code="ftp_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -225,7 +225,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -28,7 +28,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		IPSEC
+		<spring:message code="IPSEC"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -215,7 +215,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		VoIP ACCOUNT
+		<spring:message code="av_voip_account_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		VoIP IP
+	<spring:message code="av_voip_ip_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		OpenVPN
+	<spring:message code="openvpn_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -205,16 +205,14 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									
-									<td title="${fns:escapeHtml(log.version)}">
-										${fns:stringFormat(log.version,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.encryptMode)}">
-										${fns:stringFormat(log.encryptMode,30)}
-									</td>
+									<td>${log.version}</td>
+									<td>${log.encryptMode}</td>
 									<td>
-										<c:if test="${log.hmac==0}"><spring:message code="no"/></c:if>
-										<c:if test="${log.hmac==1}"><spring:message code="yes"/></c:if>
+										<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
+											<c:if test="${dic.itemCode eq log.hmac}"><spring:message code="${dic.itemValue}"/></c:if>
+					                	</c:forEach>
 									</td>
+									
 									<td>
 										<c:if test="${log.tunnelType==1}">TCP</c:if>
 										<c:if test="${log.tunnelType==2}">UDP</c:if>
@@ -231,7 +229,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){

 <div class="page-content">
 	<h3 class="page-title">
-		SSH
+		<spring:message code="SSH"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -229,7 +229,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>