From a763e92aaf8ed49e2c5c0b0e375ad34ab80a8595 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:50:36 +0800
Subject: [PATCH] =?UTF-8?q?app=E7=9A=84=E6=97=A5=E5=BF=97=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=94=B9=E4=B8=BA=E6=9F=A5ntcAppLogs=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=B1=9E=E6=80=A7=E6=9C=89=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  8 ++++-
 .../resources/messages/message_ru.properties  |  8 ++++-
 .../messages/message_zh_CN.properties         |  8 ++++-
 .../views/log/manipulation/dkBehaviorList.jsp | 30 +++++++++++++------
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 932c8a8bb..2a2ca1c3a 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1200,4 +1200,10 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=Message Type
 as=AS
-route=Route
\ No newline at end of file
+route=Route
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP Monit
+av_voip_reject=VoIP Reject
+label_proto_source=Protocol Source
+label_behav_source=Behavior Source
+label_app_source=APP Source
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index eeba48c6b..62e909d1f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1202,4 +1202,10 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
+label_proto_source=Protocol Source
+label_behav_source=Behavior Source
+label_app_source=APP Source
\ 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 bed04829f..4a4e23593 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1194,4 +1194,10 @@ dnat_policy=DNAT\u590D\u7528\u7B56\u7565
 report_total=\u5408\u8BA1
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
+label_proto_source=\u534F\u8BAE\u6765\u6E90
+label_behav_source=\u884C\u4E3A\u6765\u6E90
+label_app_source=\u5E94\u7528\u6765\u6E90
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 443517053..b90f2407b 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -111,7 +111,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
-										<label><spring:message code="protocol_type"/>：</label>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
 										<c:set var="select"><spring:message code='select'/></c:set>
                                             <form:select path="transProto" class="selectpicker form-control" >
 												<form:option value=""><spring:message code="select"/></form:option>
@@ -184,17 +184,20 @@ $(document).ready(function(){
 									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='basic_protocol'/></th>
-									<th><spring:message code='os_type'/></th>
-									<th><spring:message code='browser_type'/></th>
+									<th><spring:message code='label_proto_source'/></th>
+									<%-- <th><spring:message code='os_type'/></th>
+									<th><spring:message code='browser_type'/></th> --%>
 									<th><spring:message code='behaviour_type'/></th>
+									<th><spring:message code='label_behav_source'/></th>
 									<th><spring:message code='social_app'/></th>
-									<th><spring:message code='c2s_pkt_num'/></th>
+									<th><spring:message code='label_app_source'/></th>
+									<%-- <th><spring:message code='c2s_pkt_num'/></th>
 									<th><spring:message code='s2c_pkt_num'/></th>
 									<th><spring:message code='c2s_byte_num'/></th>
-									<th><spring:message code='s2c_byte_num'/></th>
+									<th><spring:message code='s2c_byte_num'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
@@ -241,6 +244,9 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									<td>
+												${log.labelProtoSource}
+									</td>
+									<%-- <td>
 										<c:forEach items="${osList}" var="dict">
 											<c:if test="${dict.code eq log.labelOsId}">
 												<spring:message code="${dict.item}"/>
@@ -253,7 +259,7 @@ $(document).ready(function(){
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${behaviorList}" var="dict">
 											<c:if test="${dict.code eq log.labelBehavId}">
@@ -261,6 +267,9 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+												${log.labelBehavSource}
+									</td>
 									<td>
 										<c:forEach items="${appList}" var="dict">
 											<c:if test="${dict.code eq log.labelAppId}">
@@ -268,10 +277,13 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>${log.c2sPktNum}</td>
+									<td>
+												${log.labelAppSource}
+									</td>
+									<%-- <td>${log.c2sPktNum}</td>
 									<td>${log.s2cPktNum}</td>
 									<td>${log.c2sByteNum}</td>
-									<td>${log.s2cByteNum}</td>
+									<td>${log.s2cByteNum}</td> --%>
 									
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto}</td>