1. 拆分voip业务id，原0x104拆分为0x104-voip ip阻断，0x10B voip account 阻断；0x184-voip

ip监测，0x 18B voip account 监测。
2.	公共日志字段增加s_asn,d_asn,subscribe_id
3.	NTC_HTTP_LOG 增加 website属性

src/main/java/com/nis/domain/LogEntity.java

@@ -72,12 +72,20 @@ public abstract class LogEntity<T> 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;//协议类型
@@ -452,4 +460,41 @@ public abstract class LogEntity<T> implements Serializable {
 		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;
+	}
+
 }

src/main/java/com/nis/domain/restful/NtcHttpLog.java

@@ -25,6 +25,8 @@ public class NtcHttpLog extends LogEntity {
     @ApiModelProperty(value="应答体转储文件", required=true)
     protected String resBodyFile;
 
+    @ApiModelProperty(value="网站域名", required=true)
+    protected String website;
     
     public String getUrl() {
         return url;
@@ -66,4 +68,18 @@ public class NtcHttpLog extends LogEntity {
 		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;
+	}
+
 }

src/main/java/com/nis/web/dao/DfLogSearchDao.xml

@@ -41,6 +41,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 	</resultMap>
 
 	<resultMap id="NtcHttpLogMap" type="com.nis.domain.restful.NtcHttpLog">
@@ -63,12 +66,16 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_hdr_file" jdbcType="VARCHAR" property="reqHdrFile" />
 		<result column="req_body_file" jdbcType="VARCHAR" property="reqBodyFile" />
 		<result column="res_hdr_file" jdbcType="VARCHAR" property="resHdrFile" />
 		<result column="res_body_file" jdbcType="VARCHAR" property="resBodyFile" />
+		<result column="website" jdbcType="VARCHAR" property="website" />
 	</resultMap>
 
 	<resultMap id="NtcDnsLogMap" type="com.nis.domain.restful.NtcDnsLog">
@@ -91,6 +98,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="rd" jdbcType="INTEGER" property="rd" />
 		<result column="qr" jdbcType="INTEGER" property="qr" />
@@ -127,6 +137,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="mail_proto" jdbcType="VARCHAR" property="mailProto" />
 		<result column="mail_from" jdbcType="VARCHAR" property="mailFrom" />
@@ -157,6 +170,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="sni" jdbcType="VARCHAR" property="sni" />
@@ -186,6 +202,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -213,6 +232,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="tunnel_type" jdbcType="INTEGER" property="tunnelType" />
 		<result column="encrypt_mode" jdbcType="INTEGER" property="encryptMode" />
@@ -239,6 +261,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="encrypt_mode" jdbcType="VARCHAR" property="encryptMode" />
@@ -267,6 +292,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="ex_protocol" jdbcType="INTEGER" property="exProtocol" />
 		<result column="isakmp_mode" jdbcType="INTEGER" property="isakmpMode" />
@@ -293,6 +321,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="version" jdbcType="VARCHAR" property="version" />
 		<result column="host_key" jdbcType="VARCHAR" property="hostKey" />
@@ -322,6 +353,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 
 		<result column="ftp_url" jdbcType="VARCHAR" property="ftpUrl" />
 		<result column="ftp_content" jdbcType="VARCHAR" property="ftpContent" />
@@ -347,6 +381,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 	</resultMap>
 	
 	<resultMap id="NtcDdosLogMap" type="com.nis.domain.restful.NtcDdosLog">
@@ -369,6 +406,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="attack_type" jdbcType="INTEGER" property="attackType" />
 		<result column="attack_start_time" jdbcType="TIMESTAMP" property="attackStartTime" />
@@ -399,6 +439,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="app_label" jdbcType="VARCHAR" property="appLabel" />
 		<result column="c2s_pkt_num" jdbcType="VARCHAR" property="c2sPktNum" />
@@ -426,6 +469,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -455,6 +501,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -484,6 +533,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -513,6 +565,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -543,6 +598,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -579,6 +637,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -616,6 +677,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -646,6 +710,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -675,6 +742,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -704,6 +774,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -733,6 +806,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="pid" jdbcType="VARCHAR" property="pid" />
 		<result column="url" jdbcType="VARCHAR" property="url" />
@@ -763,6 +839,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="duation" jdbcType="VARCHAR" property="duation" />
 		<result column="voip_protocol" jdbcType="VARCHAR" property="voipProtocol" />
@@ -799,6 +878,9 @@
 		<result column="user_region" jdbcType="VARCHAR" property="userRegion" />
 		<result column="server_locate" jdbcType="VARCHAR" property="serverLocate" />
 		<result column="client_locate" jdbcType="VARCHAR" property="clientLocate" />
+		<result column="s_asn" jdbcType="VARCHAR" property="sAsn" />
+		<result column="d_asn" jdbcType="VARCHAR" property="dAsn" />
+		<result column="subscribe_id" jdbcType="VARCHAR" property="subscribeId" />
 		
 		<result column="url" jdbcType="VARCHAR" property="url" />
 		<result column="req_line" jdbcType="VARCHAR" property="reqLine" />

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阻断
+#0x104	基于VOIP-IP阻断
-260=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE
+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监测
+#0x184	基于VOIP-IP监测
-388=10:MM_COMPILE;11:MM_GROUP;12:MM_VOIP_IP;14:MM_VOIP_ACCOUNT;18:NTC_IP_RANGE
+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