From ad5b924a9dfb423ebbaffedf47e19103bc530ad1 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Mon, 13 Aug 2018 13:58:38 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1.=09=E6=8B=86=E5=88=86voip=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1id=EF=BC=8C=E5=8E=9F0x104=E6=8B=86=E5=88=86=E4=B8=BA0x?= =?UTF-8?q?104-voip=20ip=E9=98=BB=E6=96=AD=EF=BC=8C0x10B=20voip=20account?= =?UTF-8?q?=20=E9=98=BB=E6=96=AD=EF=BC=9B0x184-voip=20ip=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C0x=2018B=20voip=20account=20=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E3=80=82=202.=09=E5=85=AC=E5=85=B1=E6=97=A5=E5=BF=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0s=5Fasn,d=5Fasn,subscribe=5Fid=203.?= =?UTF-8?q?=09NTC=5FHTTP=5FLOG=20=E5=A2=9E=E5=8A=A0=20website=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/LogEntity.java | 49 ++++++++++- .../com/nis/domain/restful/NtcHttpLog.java | 18 +++- .../java/com/nis/web/dao/DfLogSearchDao.xml | 82 +++++++++++++++++++ .../applicationConfig-rule.properties | 14 ++-- 4 files changed, 155 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java index ccde226..abbbe35 100644 --- a/src/main/java/com/nis/domain/LogEntity.java +++ b/src/main/java/com/nis/domain/LogEntity.java @@ -72,12 +72,20 @@ public abstract class LogEntity implements Serializable { protected String capIp; @ApiModelProperty(value = "嵌套地址列表", required = true) protected String addrList; + @ApiModelProperty(value = "客户端ASN", required = true) + protected String sAsn; + @ApiModelProperty(value = "服务端ASN", required = true) + protected String dAsn; + @ApiModelProperty(value = "用户名", required = true) + protected String subscribeId; + @ApiModelProperty(value = "用户自定义域", required = true) - private String userRegion; + protected String userRegion; @ApiModelProperty(value = "服务端地址定位信息", required = true) protected String serverLocate; @ApiModelProperty(value = "客户端地址定位信息", required = true) - private String clientLocate; + protected String clientLocate; + protected String searchCfgId;//配置id protected String searchTransProto;//协议类型 @@ -451,5 +459,42 @@ public abstract class LogEntity implements Serializable { public void setClientLocate(String clientLocate) { this.clientLocate = clientLocate; } + + /** + * @param sAsn the sAsn to set + */ + public void setsAsn(String sAsn) { + this.sAsn = sAsn; + } + /** + * @return the sAsn + */ + public String getsAsn() { + return sAsn; + } + /** + * @param dAsn the dAsn to set + */ + public void setdAsn(String dAsn) { + this.dAsn = dAsn; + } + /** + * @return the dAsn + */ + public String getdAsn() { + return dAsn; + } + /** + * @param subscribeId the subscribeId to set + */ + public void setSubscribeId(String subscribeId) { + this.subscribeId = subscribeId; + } + /** + * @return the subscribeId + */ + public String getSubscribeId() { + return subscribeId; + } } diff --git a/src/main/java/com/nis/domain/restful/NtcHttpLog.java b/src/main/java/com/nis/domain/restful/NtcHttpLog.java index ed6c08f..756eb09 100644 --- a/src/main/java/com/nis/domain/restful/NtcHttpLog.java +++ b/src/main/java/com/nis/domain/restful/NtcHttpLog.java @@ -25,7 +25,9 @@ public class NtcHttpLog extends LogEntity { @ApiModelProperty(value="应答体转储文件", required=true) protected String resBodyFile; - + @ApiModelProperty(value="网站域名", required=true) + protected String website; + public String getUrl() { return url; } @@ -65,5 +67,19 @@ public class NtcHttpLog extends LogEntity { public void setResBodyFile(String resBodyFile) { this.resBodyFile = resBodyFile; } + + /** + * @param website the website to set + */ + public void setWebsite(String website) { + this.website = website; + } + + /** + * @return the website + */ + public String getWebsite() { + return website; + } } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 864e989..f28af09 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -41,6 +41,9 @@ + + + @@ -63,12 +66,16 @@ + + + + @@ -91,6 +98,9 @@ + + + @@ -127,6 +137,9 @@ + + + @@ -157,6 +170,9 @@ + + + @@ -186,6 +202,9 @@ + + + @@ -213,6 +232,9 @@ + + + @@ -239,6 +261,9 @@ + + + @@ -267,6 +292,9 @@ + + + @@ -293,6 +321,9 @@ + + + @@ -322,6 +353,9 @@ + + + @@ -347,6 +381,9 @@ + + + @@ -369,6 +406,9 @@ + + + @@ -399,6 +439,9 @@ + + + @@ -426,6 +469,9 @@ + + + @@ -455,6 +501,9 @@ + + + @@ -484,6 +533,9 @@ + + + @@ -513,6 +565,9 @@ + + + @@ -543,6 +598,9 @@ + + + @@ -579,6 +637,9 @@ + + + @@ -616,6 +677,9 @@ + + + @@ -646,6 +710,9 @@ + + + @@ -675,6 +742,9 @@ + + + @@ -704,6 +774,9 @@ + + + @@ -733,6 +806,9 @@ + + + @@ -763,6 +839,9 @@ + + + @@ -799,6 +878,9 @@ + + + diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties index 9af2180..537de71 100644 --- a/src/main/resources/applicationConfig-rule.properties +++ b/src/main/resources/applicationConfig-rule.properties @@ -20,7 +20,7 @@ ##回流 0x60 96 loop ##白名单 0x80 128 whitelist -service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;521:128;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; +service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;267:16;384:1;385:1;386:1;387:1;388:1;395:1;512:1;513:1;521:128;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; #0x1E 0x8E 有问题:14:NTC_XMPP_REGION,NTC_XMPP_CONT 无表结构 不确定表是不是字符串类 @@ -110,8 +110,10 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16; 258=10:MM_COMPILE;11:MM_GROUP;12:MM_PIC_IP;18:NTC_IP_RANGE #0x103 基于图片传输的URL阻断 259=10:MM_COMPILE;11:MM_GROUP;14:MM_PIC_URL;18:NTC_IP_RANGE -#0x104 基于VOIP阻断 -260=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE +#0x104 基于VOIP-IP阻断 +260=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;18:NTC_IP_RANGE +#0x10B 基于VOIP-ACCOUNT阻断 +267=10:MM_COMPILE;11:MM_GROUP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE #0x180 基于音视频传输的IP PORT监测 384=10:MM_COMPILE;11:MM_GROUP;12:MM_AV_IP;18:NTC_IP_RANGE @@ -121,8 +123,10 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16; 386=10:MM_COMPILE;11:MM_GROUP;12:MM_PIC_IP;18:NTC_IP_RANGE #0x183 基于图片传输的URL监测 387=10:MM_COMPILE;11:MM_GROUP;14:MM_PIC_URL;18:NTC_IP_RANGE -#0x184 基于VOIP监测 -388=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE +#0x184 基于VOIP-IP监测 +388=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;18:NTC_IP_RANGE +#0x18B 基于VOIP-ACCOUNT监测 +395=10:MM_COMPILE;11:MM_GROUP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE #0x200 PXY拦截IP 512=10:PXY_INTERCEPT_COMPILE;11:PXY_INTERCEPT_GROUP;12:PXY_INTERCEPT_IP;18:NTC_IP_RANGE From 0d564693bbd675641f7d23613a7641951764f728 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Mon, 13 Aug 2018 16:42:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?DK=5FBEHAVIOR=5FLOG=20app=5Flabel,=E6=8B=86?= =?UTF-8?q?=E5=88=865=E4=B8=AA=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/restful/DkBehaviorLog.java | 79 +++++++++++++++++-- .../java/com/nis/web/dao/DfLogSearchDao.xml | 6 +- 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java index 285e8a1..6c5c4c2 100644 --- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java @@ -12,8 +12,18 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends LogEntity { private static final long serialVersionUID = -589390375816690510L; - @ApiModelProperty(value = "协议标签", required = true) - protected String appLabel; + + @ApiModelProperty(value = "协议类型ID", required = true) + protected Integer labelProtoId; + @ApiModelProperty(value = "操作系统ID", required = true) + protected Integer labelOsId; + @ApiModelProperty(value = "浏览器ID", required = true) + protected Integer labelBsId; + @ApiModelProperty(value = "行为ID", required = true) + protected Integer labelBehavId; + @ApiModelProperty(value = "应用ID", required = true) + protected Integer labelAppId; + @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -22,12 +32,69 @@ public class DkBehaviorLog extends LogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - public String getAppLabel() { - return appLabel; + + /** + * @param labelAppId the labelAppId to set + */ + public void setLabelAppId(Integer labelAppId) { + this.labelAppId = labelAppId; } - public void setAppLabel(String appLabel) { - this.appLabel = appLabel; + /** + * @return the labelAppId + */ + public Integer getLabelAppId() { + return labelAppId; } + /** + * @param labelBehavId the labelBehavId to set + */ + public void setLabelBehavId(Integer labelBehavId) { + this.labelBehavId = labelBehavId; + } + /** + * @return the labelBehavId + */ + public Integer getLabelBehavId() { + return labelBehavId; + } + /** + * @param labelBsId the labelBsId to set + */ + public void setLabelBsId(Integer labelBsId) { + this.labelBsId = labelBsId; + } + /** + * @return the labelBsId + */ + public Integer getLabelBsId() { + return labelBsId; + } + /** + * @param labelOsId the labelOsId to set + */ + public void setLabelOsId(Integer labelOsId) { + this.labelOsId = labelOsId; + } + /** + * @return the labelOsId + */ + public Integer getLabelOsId() { + return labelOsId; + } + /** + * @param labelProtoId the labelProtoId to set + */ + public void setLabelProtoId(Integer labelProtoId) { + this.labelProtoId = labelProtoId; + } + + /** + * @return the labelProtoId + */ + public Integer getLabelProtoId() { + return labelProtoId; + } + public String getC2sPktNum() { return c2sPktNum; } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 864e989..58ec0bd 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -400,7 +400,11 @@ - + + + + + From 5efaaf2d0cc15762d017389c36e93e20fbf256db Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 14 Aug 2018 15:46:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20#0x185=09=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E6=A0=B7=E4=BE=8B=E7=9B=91=E6=B5=8B=20389=E5=88=B08?= =?UTF-8?q?=E5=8F=B7=E5=BA=93=20#0x186=09=E8=A7=86=E9=A2=91=E6=A0=B7?= =?UTF-8?q?=E4=BE=8B=E7=9B=91=E6=B5=8B=20390=E5=88=B09=E5=8F=B7=E5=BA=93?= =?UTF-8?q?=20#0x187=09=E5=9B=BE=E7=89=87=E6=A0=B7=E4=BE=8B=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=20391=E5=88=B010=E5=8F=B7=E5=BA=93=20#0x188=09VOIP?= =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E7=9B=91=E6=B5=8B=20392=E5=88=B011=E5=8F=B7?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/applicationConfig-rule.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties index 537de71..562cd52 100644 --- a/src/main/resources/applicationConfig-rule.properties +++ b/src/main/resources/applicationConfig-rule.properties @@ -245,7 +245,7 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;64:16;65:16;261:16;262:16;263:16;264:16 #0x19 IPSec丢弃 25:7; #0x340 IP复用地址池配置（回调）832:2,4,5,7 ########## -serviceDBIndex=1:2,3,4,6,7;2:2,3,4,6,7;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,6,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;142:2;143:2;144:2;145:2,6,7;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;521:4;528:4;544:4;560:4;576:4;592:4;750:4;768:5;1024:2,6,7;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:7;4:7;5:2;25:7;28:7;64:2;65:2;261:8;262:9;263:10;264:11;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:2,4,5,7 +serviceDBIndex=1:2,3,4,6,7;2:2,3,4,6,7;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,6,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;142:2;143:2;144:2;145:2,6,7;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;521:4;528:4;544:4;560:4;576:4;592:4;750:4;768:5;1024:2,6,7;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:7;4:7;5:2;25:7;28:7;64:2;65:2;261:8;262:9;263:10;264:11;265:3;266:3;389:8;390:9;391:10;392:11;393:3;394:3;832:2,4,5,7 ##maat配置入阀门需要将编译中的部分参数写到域配置中，目前最多包含ACTION，SERVICE，USER_REGION三个属性 From 818356db6acd0a3a70b4f76283faeb7f451ccb55 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 14 Aug 2018 16:44:47 +0800 Subject: [PATCH 4/9] =?UTF-8?q?Revert=20"DK=5FBEHAVIOR=5FLOG=20app=5Flabel?= =?UTF-8?q?,=E6=8B=86=E5=88=865=E4=B8=AA=E5=B1=9E=E6=80=A7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0d564693bbd675641f7d23613a7641951764f728. --- .../com/nis/domain/restful/DkBehaviorLog.java | 79 ++----------------- .../java/com/nis/web/dao/DfLogSearchDao.xml | 6 +- 2 files changed, 7 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java index 6c5c4c2..285e8a1 100644 --- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java @@ -12,18 +12,8 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends LogEntity { private static final long serialVersionUID = -589390375816690510L; - - @ApiModelProperty(value = "协议类型ID", required = true) - protected Integer labelProtoId; - @ApiModelProperty(value = "操作系统ID", required = true) - protected Integer labelOsId; - @ApiModelProperty(value = "浏览器ID", required = true) - protected Integer labelBsId; - @ApiModelProperty(value = "行为ID", required = true) - protected Integer labelBehavId; - @ApiModelProperty(value = "应用ID", required = true) - protected Integer labelAppId; - + @ApiModelProperty(value = "协议标签", required = true) + protected String appLabel; @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -32,69 +22,12 @@ public class DkBehaviorLog extends LogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - - /** - * @param labelAppId the labelAppId to set - */ - public void setLabelAppId(Integer labelAppId) { - this.labelAppId = labelAppId; + public String getAppLabel() { + return appLabel; } - /** - * @return the labelAppId - */ - public Integer getLabelAppId() { - return labelAppId; + public void setAppLabel(String appLabel) { + this.appLabel = appLabel; } - /** - * @param labelBehavId the labelBehavId to set - */ - public void setLabelBehavId(Integer labelBehavId) { - this.labelBehavId = labelBehavId; - } - /** - * @return the labelBehavId - */ - public Integer getLabelBehavId() { - return labelBehavId; - } - /** - * @param labelBsId the labelBsId to set - */ - public void setLabelBsId(Integer labelBsId) { - this.labelBsId = labelBsId; - } - /** - * @return the labelBsId - */ - public Integer getLabelBsId() { - return labelBsId; - } - /** - * @param labelOsId the labelOsId to set - */ - public void setLabelOsId(Integer labelOsId) { - this.labelOsId = labelOsId; - } - /** - * @return the labelOsId - */ - public Integer getLabelOsId() { - return labelOsId; - } - /** - * @param labelProtoId the labelProtoId to set - */ - public void setLabelProtoId(Integer labelProtoId) { - this.labelProtoId = labelProtoId; - } - - /** - * @return the labelProtoId - */ - public Integer getLabelProtoId() { - return labelProtoId; - } - public String getC2sPktNum() { return c2sPktNum; } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index fbf5027..f28af09 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -443,11 +443,7 @@ - - - - - + From 97ad29697259b172a2adf4770abfa1726cbbfa8d Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 14 Aug 2018 16:47:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?Revert=20"Revert=20"DK=5FBEHAVIOR=5FLOG=20a?= =?UTF-8?q?pp=5Flabel,=E6=8B=86=E5=88=865=E4=B8=AA=E5=B1=9E=E6=80=A7""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 818356db6acd0a3a70b4f76283faeb7f451ccb55. --- .../com/nis/domain/restful/DkBehaviorLog.java | 79 +++++++++++++++++-- .../java/com/nis/web/dao/DfLogSearchDao.xml | 6 +- 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java index 285e8a1..6c5c4c2 100644 --- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java @@ -12,8 +12,18 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends LogEntity { private static final long serialVersionUID = -589390375816690510L; - @ApiModelProperty(value = "协议标签", required = true) - protected String appLabel; + + @ApiModelProperty(value = "协议类型ID", required = true) + protected Integer labelProtoId; + @ApiModelProperty(value = "操作系统ID", required = true) + protected Integer labelOsId; + @ApiModelProperty(value = "浏览器ID", required = true) + protected Integer labelBsId; + @ApiModelProperty(value = "行为ID", required = true) + protected Integer labelBehavId; + @ApiModelProperty(value = "应用ID", required = true) + protected Integer labelAppId; + @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -22,12 +32,69 @@ public class DkBehaviorLog extends LogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - public String getAppLabel() { - return appLabel; + + /** + * @param labelAppId the labelAppId to set + */ + public void setLabelAppId(Integer labelAppId) { + this.labelAppId = labelAppId; } - public void setAppLabel(String appLabel) { - this.appLabel = appLabel; + /** + * @return the labelAppId + */ + public Integer getLabelAppId() { + return labelAppId; } + /** + * @param labelBehavId the labelBehavId to set + */ + public void setLabelBehavId(Integer labelBehavId) { + this.labelBehavId = labelBehavId; + } + /** + * @return the labelBehavId + */ + public Integer getLabelBehavId() { + return labelBehavId; + } + /** + * @param labelBsId the labelBsId to set + */ + public void setLabelBsId(Integer labelBsId) { + this.labelBsId = labelBsId; + } + /** + * @return the labelBsId + */ + public Integer getLabelBsId() { + return labelBsId; + } + /** + * @param labelOsId the labelOsId to set + */ + public void setLabelOsId(Integer labelOsId) { + this.labelOsId = labelOsId; + } + /** + * @return the labelOsId + */ + public Integer getLabelOsId() { + return labelOsId; + } + /** + * @param labelProtoId the labelProtoId to set + */ + public void setLabelProtoId(Integer labelProtoId) { + this.labelProtoId = labelProtoId; + } + + /** + * @return the labelProtoId + */ + public Integer getLabelProtoId() { + return labelProtoId; + } + public String getC2sPktNum() { return c2sPktNum; } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index f28af09..fbf5027 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -443,7 +443,11 @@ - + + + + + From ebef1d32f126675aeb1a0659240d6e574e533308 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 14 Aug 2018 16:47:49 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Revert=20"Revert=20"Revert=20"DK=5FBEHAVIOR?= =?UTF-8?q?=5FLOG=20app=5Flabel,=E6=8B=86=E5=88=865=E4=B8=AA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7"""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 97ad29697259b172a2adf4770abfa1726cbbfa8d. --- .../com/nis/domain/restful/DkBehaviorLog.java | 79 ++----------------- .../java/com/nis/web/dao/DfLogSearchDao.xml | 6 +- 2 files changed, 7 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java index 6c5c4c2..285e8a1 100644 --- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java @@ -12,18 +12,8 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends LogEntity { private static final long serialVersionUID = -589390375816690510L; - - @ApiModelProperty(value = "协议类型ID", required = true) - protected Integer labelProtoId; - @ApiModelProperty(value = "操作系统ID", required = true) - protected Integer labelOsId; - @ApiModelProperty(value = "浏览器ID", required = true) - protected Integer labelBsId; - @ApiModelProperty(value = "行为ID", required = true) - protected Integer labelBehavId; - @ApiModelProperty(value = "应用ID", required = true) - protected Integer labelAppId; - + @ApiModelProperty(value = "协议标签", required = true) + protected String appLabel; @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -32,69 +22,12 @@ public class DkBehaviorLog extends LogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - - /** - * @param labelAppId the labelAppId to set - */ - public void setLabelAppId(Integer labelAppId) { - this.labelAppId = labelAppId; + public String getAppLabel() { + return appLabel; } - /** - * @return the labelAppId - */ - public Integer getLabelAppId() { - return labelAppId; + public void setAppLabel(String appLabel) { + this.appLabel = appLabel; } - /** - * @param labelBehavId the labelBehavId to set - */ - public void setLabelBehavId(Integer labelBehavId) { - this.labelBehavId = labelBehavId; - } - /** - * @return the labelBehavId - */ - public Integer getLabelBehavId() { - return labelBehavId; - } - /** - * @param labelBsId the labelBsId to set - */ - public void setLabelBsId(Integer labelBsId) { - this.labelBsId = labelBsId; - } - /** - * @return the labelBsId - */ - public Integer getLabelBsId() { - return labelBsId; - } - /** - * @param labelOsId the labelOsId to set - */ - public void setLabelOsId(Integer labelOsId) { - this.labelOsId = labelOsId; - } - /** - * @return the labelOsId - */ - public Integer getLabelOsId() { - return labelOsId; - } - /** - * @param labelProtoId the labelProtoId to set - */ - public void setLabelProtoId(Integer labelProtoId) { - this.labelProtoId = labelProtoId; - } - - /** - * @return the labelProtoId - */ - public Integer getLabelProtoId() { - return labelProtoId; - } - public String getC2sPktNum() { return c2sPktNum; } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index fbf5027..f28af09 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -443,11 +443,7 @@ - - - - - + From b33fc1bb1b1578f46679c90f74a426382b46eda0 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Tue, 14 Aug 2018 16:48:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?Revert=20"Revert=20"Revert=20"Revert=20"DK?= =?UTF-8?q?=5FBEHAVIOR=5FLOG=20app=5Flabel,=E6=8B=86=E5=88=865=E4=B8=AA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7""""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ebef1d32f126675aeb1a0659240d6e574e533308. --- .../com/nis/domain/restful/DkBehaviorLog.java | 79 +++++++++++++++++-- .../java/com/nis/web/dao/DfLogSearchDao.xml | 6 +- 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java index 285e8a1..6c5c4c2 100644 --- a/src/main/java/com/nis/domain/restful/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/restful/DkBehaviorLog.java @@ -12,8 +12,18 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends LogEntity { private static final long serialVersionUID = -589390375816690510L; - @ApiModelProperty(value = "协议标签", required = true) - protected String appLabel; + + @ApiModelProperty(value = "协议类型ID", required = true) + protected Integer labelProtoId; + @ApiModelProperty(value = "操作系统ID", required = true) + protected Integer labelOsId; + @ApiModelProperty(value = "浏览器ID", required = true) + protected Integer labelBsId; + @ApiModelProperty(value = "行为ID", required = true) + protected Integer labelBehavId; + @ApiModelProperty(value = "应用ID", required = true) + protected Integer labelAppId; + @ApiModelProperty(value = "c2s包数", required = true) protected String c2sPktNum; @ApiModelProperty(value = "s2c包数", required = true) @@ -22,12 +32,69 @@ public class DkBehaviorLog extends LogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; - public String getAppLabel() { - return appLabel; + + /** + * @param labelAppId the labelAppId to set + */ + public void setLabelAppId(Integer labelAppId) { + this.labelAppId = labelAppId; } - public void setAppLabel(String appLabel) { - this.appLabel = appLabel; + /** + * @return the labelAppId + */ + public Integer getLabelAppId() { + return labelAppId; } + /** + * @param labelBehavId the labelBehavId to set + */ + public void setLabelBehavId(Integer labelBehavId) { + this.labelBehavId = labelBehavId; + } + /** + * @return the labelBehavId + */ + public Integer getLabelBehavId() { + return labelBehavId; + } + /** + * @param labelBsId the labelBsId to set + */ + public void setLabelBsId(Integer labelBsId) { + this.labelBsId = labelBsId; + } + /** + * @return the labelBsId + */ + public Integer getLabelBsId() { + return labelBsId; + } + /** + * @param labelOsId the labelOsId to set + */ + public void setLabelOsId(Integer labelOsId) { + this.labelOsId = labelOsId; + } + /** + * @return the labelOsId + */ + public Integer getLabelOsId() { + return labelOsId; + } + /** + * @param labelProtoId the labelProtoId to set + */ + public void setLabelProtoId(Integer labelProtoId) { + this.labelProtoId = labelProtoId; + } + + /** + * @return the labelProtoId + */ + public Integer getLabelProtoId() { + return labelProtoId; + } + public String getC2sPktNum() { return c2sPktNum; } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index f28af09..fbf5027 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -443,7 +443,11 @@ - + + + + + From b2f05129d938e4486656c0d5288c57ad89733786 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Tue, 14 Aug 2018 16:51:50 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Revert=20"1.=09=E6=8B=86=E5=88=86voip?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1id=EF=BC=8C=E5=8E=9F0x104=E6=8B=86=E5=88=86?= =?UTF-8?q?=E4=B8=BA0x104-voip=20ip=E9=98=BB=E6=96=AD=EF=BC=8C0x10B=20voip?= =?UTF-8?q?=20account=20=E9=98=BB=E6=96=AD=EF=BC=9B0x184-voip=20ip?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=EF=BC=8C0x=2018B=20voip=20account=20?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E3=80=82=202.=09=E5=85=AC=E5=85=B1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0s=5Fasn,d=5Fasn,su?= =?UTF-8?q?bscribe=5Fid=203.=09NTC=5FHTTP=5FLOG=20=E5=A2=9E=E5=8A=A0=20web?= =?UTF-8?q?site=E5=B1=9E=E6=80=A7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ad5b924a9dfb423ebbaffedf47e19103bc530ad1. --- src/main/java/com/nis/domain/LogEntity.java | 49 +---------- .../com/nis/domain/restful/NtcHttpLog.java | 18 +--- .../java/com/nis/web/dao/DfLogSearchDao.xml | 84 +------------------ .../applicationConfig-rule.properties | 14 ++-- 4 files changed, 9 insertions(+), 156 deletions(-) diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java index abbbe35..ccde226 100644 --- a/src/main/java/com/nis/domain/LogEntity.java +++ b/src/main/java/com/nis/domain/LogEntity.java @@ -72,20 +72,12 @@ public abstract class LogEntity implements Serializable { protected String capIp; @ApiModelProperty(value = "嵌套地址列表", required = true) protected String addrList; - @ApiModelProperty(value = "客户端ASN", required = true) - protected String sAsn; - @ApiModelProperty(value = "服务端ASN", required = true) - protected String dAsn; - @ApiModelProperty(value = "用户名", required = true) - protected String subscribeId; - @ApiModelProperty(value = "用户自定义域", required = true) - protected String userRegion; + private String userRegion; @ApiModelProperty(value = "服务端地址定位信息", required = true) protected String serverLocate; @ApiModelProperty(value = "客户端地址定位信息", required = true) - protected String clientLocate; - + private String clientLocate; protected String searchCfgId;//配置id protected String searchTransProto;//协议类型 @@ -459,42 +451,5 @@ public abstract class LogEntity implements Serializable { public void setClientLocate(String clientLocate) { this.clientLocate = clientLocate; } - - /** - * @param sAsn the sAsn to set - */ - public void setsAsn(String sAsn) { - this.sAsn = sAsn; - } - /** - * @return the sAsn - */ - public String getsAsn() { - return sAsn; - } - /** - * @param dAsn the dAsn to set - */ - public void setdAsn(String dAsn) { - this.dAsn = dAsn; - } - /** - * @return the dAsn - */ - public String getdAsn() { - return dAsn; - } - /** - * @param subscribeId the subscribeId to set - */ - public void setSubscribeId(String subscribeId) { - this.subscribeId = subscribeId; - } - /** - * @return the subscribeId - */ - public String getSubscribeId() { - return subscribeId; - } } diff --git a/src/main/java/com/nis/domain/restful/NtcHttpLog.java b/src/main/java/com/nis/domain/restful/NtcHttpLog.java index 756eb09..ed6c08f 100644 --- a/src/main/java/com/nis/domain/restful/NtcHttpLog.java +++ b/src/main/java/com/nis/domain/restful/NtcHttpLog.java @@ -25,9 +25,7 @@ public class NtcHttpLog extends LogEntity { @ApiModelProperty(value="应答体转储文件", required=true) protected String resBodyFile; - @ApiModelProperty(value="网站域名", required=true) - protected String website; - + public String getUrl() { return url; } @@ -67,19 +65,5 @@ public class NtcHttpLog extends LogEntity { public void setResBodyFile(String resBodyFile) { this.resBodyFile = resBodyFile; } - - /** - * @param website the website to set - */ - public void setWebsite(String website) { - this.website = website; - } - - /** - * @return the website - */ - public String getWebsite() { - return website; - } } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index fbf5027..c8ae938 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -41,9 +41,6 @@ - - - @@ -66,16 +63,12 @@ - - - - @@ -98,9 +91,6 @@ - - - @@ -137,9 +127,6 @@ - - - @@ -170,9 +157,6 @@ - - - @@ -202,9 +186,6 @@ - - - @@ -232,9 +213,6 @@ - - - @@ -261,9 +239,6 @@ - - - @@ -292,9 +267,6 @@ - - - @@ -321,9 +293,6 @@ - - - @@ -353,9 +322,6 @@ - - - @@ -381,9 +347,6 @@ - - - @@ -406,9 +369,6 @@ - - - @@ -439,9 +399,6 @@ - - - @@ -473,9 +430,6 @@ - - - @@ -505,9 +459,6 @@ - - - @@ -537,9 +488,6 @@ - - - @@ -569,9 +517,6 @@ - - - @@ -602,9 +547,6 @@ - - - @@ -641,9 +583,6 @@ - - - @@ -681,9 +620,6 @@ - - - @@ -714,9 +650,6 @@ - - - @@ -746,9 +679,6 @@ - - - @@ -778,9 +708,6 @@ - - - @@ -810,9 +737,6 @@ - - - @@ -843,9 +767,6 @@ - - - @@ -882,9 +803,6 @@ - - - @@ -901,4 +819,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties index 562cd52..979a25b 100644 --- a/src/main/resources/applicationConfig-rule.properties +++ b/src/main/resources/applicationConfig-rule.properties @@ -20,7 +20,7 @@ ##回流 0x60 96 loop ##白名单 0x80 128 whitelist -service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;267:16;384:1;385:1;386:1;387:1;388:1;395:1;512:1;513:1;521:128;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; +service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;33:16;34:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;142:1;143:1;144:1;145:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;521:128;528:48;544:2;560:80;576:16;592:1;750:128;768:96;1024:1;1026:1;1027:1;1028:1;1040:32;1056:64;1057:64;1058:64; #0x1E 0x8E 有问题:14:NTC_XMPP_REGION,NTC_XMPP_CONT 无表结构 不确定表是不是字符串类 @@ -110,10 +110,8 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16; 258=10:MM_COMPILE;11:MM_GROUP;12:MM_PIC_IP;18:NTC_IP_RANGE #0x103 基于图片传输的URL阻断 259=10:MM_COMPILE;11:MM_GROUP;14:MM_PIC_URL;18:NTC_IP_RANGE -#0x104 基于VOIP-IP阻断 -260=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;18:NTC_IP_RANGE -#0x10B 基于VOIP-ACCOUNT阻断 -267=10:MM_COMPILE;11:MM_GROUP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE +#0x104 基于VOIP阻断 +260=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE #0x180 基于音视频传输的IP PORT监测 384=10:MM_COMPILE;11:MM_GROUP;12:MM_AV_IP;18:NTC_IP_RANGE @@ -123,10 +121,8 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16; 386=10:MM_COMPILE;11:MM_GROUP;12:MM_PIC_IP;18:NTC_IP_RANGE #0x183 基于图片传输的URL监测 387=10:MM_COMPILE;11:MM_GROUP;14:MM_PIC_URL;18:NTC_IP_RANGE -#0x184 基于VOIP-IP监测 -388=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;18:NTC_IP_RANGE -#0x18B 基于VOIP-ACCOUNT监测 -395=10:MM_COMPILE;11:MM_GROUP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE +#0x184 基于VOIP监测 +388=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE #0x200 PXY拦截IP 512=10:PXY_INTERCEPT_COMPILE;11:PXY_INTERCEPT_GROUP;12:PXY_INTERCEPT_IP;18:NTC_IP_RANGE From 97617ef644cc43e6a7a4e5ffa562ad1d46a58cbd Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Fri, 17 Aug 2018 09:22:49 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9MM=5FAV=5FIP=5FLOG?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=BB=93=E6=9E=84=E7=9B=B8=E5=90=8C=E7=9A=84?= =?UTF-8?q?9=E5=BC=A0=E6=97=A5=E5=BF=97=E8=A1=A8=EF=BC=8C=E5=B0=86refer?= =?UTF-8?q?=E6=94=B9=E4=B8=BAreferer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/restful/MmAvIpLog.java | 10 +++++----- .../com/nis/domain/restful/MmAvUrlLog.java | 10 +++++----- .../com/nis/domain/restful/MmPicIpLog.java | 10 +++++----- .../com/nis/domain/restful/MmPicUrlLog.java | 10 +++++----- .../domain/restful/MmPornAudioLevelLog.java | 10 +++++----- .../domain/restful/MmPornVideoLevelLog.java | 10 +++++----- .../nis/domain/restful/MmSampleAudioLog.java | 10 +++++----- .../com/nis/domain/restful/MmSamplePicLog.java | 10 +++++----- .../nis/domain/restful/MmSampleVideoLog.java | 10 +++++----- .../java/com/nis/web/dao/DfLogSearchDao.xml | 18 +++++++++--------- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/MmAvIpLog.java b/src/main/java/com/nis/domain/restful/MmAvIpLog.java index f719336..c31ea26 100644 --- a/src/main/java/com/nis/domain/restful/MmAvIpLog.java +++ b/src/main/java/com/nis/domain/restful/MmAvIpLog.java @@ -20,7 +20,7 @@ public class MmAvIpLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -45,11 +45,11 @@ public class MmAvIpLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmAvUrlLog.java b/src/main/java/com/nis/domain/restful/MmAvUrlLog.java index 142b16e..667612e 100644 --- a/src/main/java/com/nis/domain/restful/MmAvUrlLog.java +++ b/src/main/java/com/nis/domain/restful/MmAvUrlLog.java @@ -20,7 +20,7 @@ public class MmAvUrlLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -45,11 +45,11 @@ public class MmAvUrlLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmPicIpLog.java b/src/main/java/com/nis/domain/restful/MmPicIpLog.java index 5f03e02..3291f95 100644 --- a/src/main/java/com/nis/domain/restful/MmPicIpLog.java +++ b/src/main/java/com/nis/domain/restful/MmPicIpLog.java @@ -20,7 +20,7 @@ public class MmPicIpLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -45,11 +45,11 @@ public class MmPicIpLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmPicUrlLog.java b/src/main/java/com/nis/domain/restful/MmPicUrlLog.java index 2593c98..7d8c73f 100644 --- a/src/main/java/com/nis/domain/restful/MmPicUrlLog.java +++ b/src/main/java/com/nis/domain/restful/MmPicUrlLog.java @@ -20,7 +20,7 @@ public class MmPicUrlLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -45,11 +45,11 @@ public class MmPicUrlLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmPornAudioLevelLog.java b/src/main/java/com/nis/domain/restful/MmPornAudioLevelLog.java index 561a0de..da5dfcf 100644 --- a/src/main/java/com/nis/domain/restful/MmPornAudioLevelLog.java +++ b/src/main/java/com/nis/domain/restful/MmPornAudioLevelLog.java @@ -19,7 +19,7 @@ public class MmPornAudioLevelLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -44,11 +44,11 @@ public class MmPornAudioLevelLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmPornVideoLevelLog.java b/src/main/java/com/nis/domain/restful/MmPornVideoLevelLog.java index 15f93b6..f027162 100644 --- a/src/main/java/com/nis/domain/restful/MmPornVideoLevelLog.java +++ b/src/main/java/com/nis/domain/restful/MmPornVideoLevelLog.java @@ -20,7 +20,7 @@ public class MmPornVideoLevelLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -45,11 +45,11 @@ public class MmPornVideoLevelLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmSampleAudioLog.java b/src/main/java/com/nis/domain/restful/MmSampleAudioLog.java index 152dbd4..5a5b852 100644 --- a/src/main/java/com/nis/domain/restful/MmSampleAudioLog.java +++ b/src/main/java/com/nis/domain/restful/MmSampleAudioLog.java @@ -19,7 +19,7 @@ public class MmSampleAudioLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -44,11 +44,11 @@ public class MmSampleAudioLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmSamplePicLog.java b/src/main/java/com/nis/domain/restful/MmSamplePicLog.java index 02dfc0f..472ffb5 100644 --- a/src/main/java/com/nis/domain/restful/MmSamplePicLog.java +++ b/src/main/java/com/nis/domain/restful/MmSamplePicLog.java @@ -19,7 +19,7 @@ public class MmSamplePicLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -44,11 +44,11 @@ public class MmSamplePicLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/domain/restful/MmSampleVideoLog.java b/src/main/java/com/nis/domain/restful/MmSampleVideoLog.java index 2237a52..1932907 100644 --- a/src/main/java/com/nis/domain/restful/MmSampleVideoLog.java +++ b/src/main/java/com/nis/domain/restful/MmSampleVideoLog.java @@ -19,7 +19,7 @@ public class MmSampleVideoLog extends LogEntity { @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="入口页面", required=true) - protected String refer; + protected String referer; @ApiModelProperty(value="有害级别", required=true) protected Integer level; @ApiModelProperty(value="封堵类型", required=true) @@ -44,11 +44,11 @@ public class MmSampleVideoLog extends LogEntity { public void setLogUri(String logUri) { this.logUri = logUri; } - public String getRefer() { - return refer; + public String getReferer() { + return referer; } - public void setRefer(String refer) { - this.refer = refer; + public void setReferer(String referer) { + this.referer = referer; } public Integer getLevel() { return level; diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index c8ae938..16b805c 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -434,7 +434,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -654,7 +654,7 @@ - + @@ -683,7 +683,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -741,7 +741,7 @@ - +