From b8d742e11ce0284da470cfa8d8ce02ab4b63ca9a Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 13 Aug 2018 17:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A1=8C=E4=B8=BA=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E5=8E=BB=E6=8E=89App=5Flabel=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=94=E4=B8=AA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=20LABEL=5FPROTO=5FID=20LABEL=5FOS=5FID=20LABEL=5FBS=5FID=20LAB?= =?UTF-8?q?EL=5FBEHAV=5FID=20LABEL=5FAPP=5FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/log/DkBehaviorLog.java | 42 ++++++++++++++++--- .../resources/messages/message_en.properties | 1 + .../resources/messages/message_ru.properties | 1 + .../messages/message_zh_CN.properties | 1 + src/main/webapp/WEB-INF/tlds/fns.tld | 8 ++++ .../views/log/manipulation/dkBehaviorList.jsp | 40 +++++++++++++++++- 6 files changed, 85 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/domain/log/DkBehaviorLog.java b/src/main/java/com/nis/domain/log/DkBehaviorLog.java index 4dd5be0b0..e5017979f 100644 --- a/src/main/java/com/nis/domain/log/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/log/DkBehaviorLog.java @@ -13,8 +13,13 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends BaseLogEntity { private static final long serialVersionUID = -589390375816690510L; - @ApiModelProperty(value = "协议标签", required = true) - protected String appLabel; + + protected Integer labelProtoId; //协议类型id + protected Integer labelOsId;//操作系统id + protected Integer labelBsId; //浏览器id + protected Integer labelBehavId; //行为id + protected Integer labelAppId; //应用id + @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -24,11 +29,36 @@ public class DkBehaviorLog extends BaseLogEntity { @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - public String getAppLabel() { - return appLabel; + + public Integer getLabelProtoId() { + return labelProtoId; } - public void setAppLabel(String appLabel) { - this.appLabel = appLabel; + public void setLabelProtoId(Integer labelProtoId) { + this.labelProtoId = labelProtoId; + } + public Integer getLabelOsId() { + return labelOsId; + } + public void setLabelOsId(Integer labelOsId) { + this.labelOsId = labelOsId; + } + public Integer getLabelBsId() { + return labelBsId; + } + public void setLabelBsId(Integer labelBsId) { + this.labelBsId = labelBsId; + } + public Integer getLabelBehavId() { + return labelBehavId; + } + public void setLabelBehavId(Integer labelBehavId) { + this.labelBehavId = labelBehavId; + } + public Integer getLabelAppId() { + return labelAppId; + } + public void setLabelAppId(Integer labelAppId) { + this.labelAppId = labelAppId; } public String getC2sPktNum() { return c2sPktNum; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 787fd7670..7b92f0eb8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -764,6 +764,7 @@ first_hit=First Hit search_error=Search Error data_format_error=Data Format Error server_internal_error=Server Internal Error +behavior_protocol=Behavior Protocol #===========log end ============= #=============about proxy========= intercept_policy=Intercept Policy diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index c6b221aa4..0dba20953 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -681,6 +681,7 @@ attack_total_pkt=Attack Total pkt attack_total_byte=Attack Total byte is_blcok=Is Blcok firstPage=First Page +behavior_protocol=Behavior Protocol #===========log end ============= #=============about proxy========= intercept_policy=intercept policy diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 3b5405168..2b88a76b9 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -765,6 +765,7 @@ first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D search_error=\u67E5\u8BE2\u9519\u8BEF data_format_error=\u6570\u636E\u683C\u5F0F\u9519\u8BEF server_internal_error=\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF +behavior_protocol=\u884C\u4E3A\u534F\u8BAE #===========log end ============= #=============about proxy========= intercept_policy=\u62E6\u622A\u7B56\u7565 diff --git a/src/main/webapp/WEB-INF/tlds/fns.tld b/src/main/webapp/WEB-INF/tlds/fns.tld index 95dabb261..111c8e4d5 100644 --- a/src/main/webapp/WEB-INF/tlds/fns.tld +++ b/src/main/webapp/WEB-INF/tlds/fns.tld @@ -361,5 +361,13 @@ java.lang.String stringFormat(java.lang.String, int) ${fns:stringFormat(str,len)} + + + 根据code的名称取出标签名 + getCodeList + com.nis.util.CodeDicUtils + java.util.List getCodeList(java.lang.String) + ${fns:getCodeList(str)} + 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 b3591c99f..27be00426 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -162,7 +162,11 @@ $(document).ready(function(){ - + + + + + @@ -204,7 +208,39 @@ $(document).ready(function(){ - ${log.appLabel} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${log.c2sPktNum} ${log.s2cPktNum}