From 693345b201eb1cedbb1d3b63524d347d4bf4c7d4 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Thu, 13 Sep 2018 17:28:48 +0800
Subject: [PATCH] =?UTF-8?q?P2P=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/NtcP2pLog.java | 17 +++++++++--------
 .../resources/messages/message_en.properties    |  6 +++++-
 .../resources/messages/message_zh_CN.properties |  6 +++++-
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp    | 10 ++++++++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/NtcP2pLog.java b/src/main/java/com/nis/domain/log/NtcP2pLog.java
index 1529e6009..9da477f46 100644
--- a/src/main/java/com/nis/domain/log/NtcP2pLog.java
+++ b/src/main/java/com/nis/domain/log/NtcP2pLog.java
@@ -6,20 +6,20 @@ public class NtcP2pLog extends BaseLogEntity<NtcP2pLog>{
 	 * 
 	 */
 	private static final long serialVersionUID = -826089417186930465L;
-	private Integer p2pProtoId;
-	private Integer p2pFileId;
+	private String p2pProto;
+	private String p2pFileId;
 	private String p2pKeyword;
 	
-	public Integer getP2pProtoId() {
-		return p2pProtoId;
+	public String getP2pProto() {
+		return p2pProto;
 	}
-	public void setP2pProtoId(Integer p2pProtoId) {
-		this.p2pProtoId = p2pProtoId;
+	public void setP2pProto(String p2pProto) {
+		this.p2pProto = p2pProto;
 	}
-	public Integer getP2pFileId() {
+	public String getP2pFileId() {
 		return p2pFileId;
 	}
-	public void setP2pFileId(Integer p2pFileId) {
+	public void setP2pFileId(String p2pFileId) {
 		this.p2pFileId = p2pFileId;
 	}
 	public String getP2pKeyword() {
@@ -28,4 +28,5 @@ public class NtcP2pLog extends BaseLogEntity<NtcP2pLog>{
 	public void setP2pKeyword(String p2pKeyword) {
 		this.p2pKeyword = p2pKeyword;
 	}
+		
 }
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index de3b7feac..727ac2fc8 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1148,4 +1148,8 @@ MM_FACE_RECOGNIZATION=Face Recognization
 preset=Preset
 ip_must_select=IP Configuration must select
 av_voip_account_reject=VoIP Account Control
-av_voip_account_monit=VoIP Account Monitoring
\ No newline at end of file
+av_voip_account_monit=VoIP Account Monitoring
+
+p2p_proto=P2P Protocol
+p2p_file_id=File Marking
+p2p_keyword=Emule Search Keyword
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 96dfd49df..1cf5a85b9 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1146,4 +1146,8 @@ MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B
 preset=\u9884\u7F6E
 ip_must_select=IP\u914D\u7F6E\u5FC5\u9009
 av_voip_account_reject=VoIP \u8D26\u53F7\u7BA1\u63A7
-av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B
\ No newline at end of file
+av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B
+
+p2p_proto=P2P\u534F\u8BAE
+p2p_file_id=\u6587\u4EF6\u6807\u8BC6
+p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index a8f9ef606..7862f67b8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -188,6 +188,11 @@
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
+								
+								<th><spring:message code="p2p_proto"/></th>
+								<th><spring:message code="p2p_file_id"/></th>
+								<th><spring:message code="p2p_keyword"/></th>
+								
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
@@ -229,6 +234,11 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									
+									<td>${log.p2pProto}</td>
+									<td>${log.p2pFileId}</td>
+									<td>${log.p2pKeyword}</td>
+									
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto }</td>
 									<td>