From ad5b924a9dfb423ebbaffedf47e19103bc530ad1 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Mon, 13 Aug 2018 13:58:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=09=E6=8B=86=E5=88=86voip=E4=B8=9A=E5=8A=A1id?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F0x104=E6=8B=86=E5=88=86=E4=B8=BA0x104-voip=20?= =?UTF-8?q?ip=E9=98=BB=E6=96=AD=EF=BC=8C0x10B=20voip=20account=20=E9=98=BB?= =?UTF-8?q?=E6=96=AD=EF=BC=9B0x184-voip=20ip=E7=9B=91=E6=B5=8B=EF=BC=8C0x?= =?UTF-8?q?=2018B=20voip=20account=20=E7=9B=91=E6=B5=8B=E3=80=82=202.=09?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=97=A5=E5=BF=97=E5=AD=97=E6=AE=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0s=5Fasn,d=5Fasn,subscribe=5Fid=203.=09NTC=5FHTTP=5FLOG?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20website=E5=B1=9E=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