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;//协议类型
@@ -451,5 +459,42 @@ public abstract class LogEntity<T> 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;
+	}
 
 }

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;
+	}
 
 }