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