Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/java/com/nis/domain/callback/InlineIp.java

@@ -56,6 +56,16 @@ public class InlineIp {
 	private Date opTime;
 	@Expose
 	private Integer policyGroup;
+	@Expose
+	private String userRegion;//用于存储协议跟流量阀值
+	
+	
+	public String getUserRegion() {
+		return userRegion;
+	}
+	public void setUserRegion(String userRegion) {
+		this.userRegion = userRegion;
+	}
 	/**
 	 * action
 	 * @return  action

src/main/java/com/nis/domain/configuration/DdosIpCfg.java

@@ -22,6 +22,28 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 
+	private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
+	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
+	private Long ppsThreadshold;
+
+	public String getAntiddosProtocol() {
+		return antiddosProtocol;
+	}
+	public void setAntiddosProtocol(String antiddosProtocol) {
+		this.antiddosProtocol = antiddosProtocol;
+	}
+	public Long getBpsThreadshold() {
+		return bpsThreadshold;
+	}
+	public void setBpsThreadshold(Long bpsThreadshold) {
+		this.bpsThreadshold = bpsThreadshold;
+	}
+	public Long getPpsThreadshold() {
+		return ppsThreadshold;
+	}
+	public void setPpsThreadshold(Long ppsThreadshold) {
+		this.ppsThreadshold = ppsThreadshold;
+	}
 	
 	
 }