Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
策略分组功能提交

src/main/java/com/nis/domain/basics/PolicyGroupInfo.java

@@ -0,0 +1,54 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+
+/**
+ * @ClassName: PolicyGroupInfo.java 
+ * @Description: 策略分组
+ * @version V1.0
+ */
+public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	
+	private Integer groupId;
+	private String groupName;
+	private Integer groupType;
+	
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+}

src/main/java/com/nis/domain/log/NtcDnsLog.java

@@ -0,0 +1,109 @@
+package com.nis.domain.log;
+
+public class NtcDnsLog extends BaseLogEntity<NtcDnsLog> {
+
+	private static final long serialVersionUID = -3763888115864065019L;
+
+	private Integer qr;
+	private Integer rd;
+	private Integer ra;
+	private String rr;
+	private Integer qType;
+	private Integer qClass;
+	private Integer opCode;
+	private String qName;
+	private String cName;
+	private Integer dnsSub;
+	
+	/*以下字段无需反馈到界面*/
+	private String cheatType;
+	private Integer cheatRcode;
+	private String cheatStrategy;
+	private String cheatRr;
+	
+	
+	public String getCheatType() {
+		return cheatType;
+	}
+	public void setCheatType(String cheatType) {
+		this.cheatType = cheatType;
+	}
+	public Integer getCheatRcode() {
+		return cheatRcode;
+	}
+	public void setCheatRcode(Integer cheatRcode) {
+		this.cheatRcode = cheatRcode;
+	}
+	public String getCheatStrategy() {
+		return cheatStrategy;
+	}
+	public void setCheatStrategy(String cheatStrategy) {
+		this.cheatStrategy = cheatStrategy;
+	}
+	public String getCheatRr() {
+		return cheatRr;
+	}
+	public void setCheatRr(String cheatRr) {
+		this.cheatRr = cheatRr;
+	}
+	public Integer getQr() {
+		return qr;
+	}
+	public void setQr(Integer qr) {
+		this.qr = qr;
+	}
+	public Integer getRd() {
+		return rd;
+	}
+	public void setRd(Integer rd) {
+		this.rd = rd;
+	}
+	public Integer getRa() {
+		return ra;
+	}
+	public void setRa(Integer ra) {
+		this.ra = ra;
+	}
+	public String getRr() {
+		return rr;
+	}
+	public void setRr(String rr) {
+		this.rr = rr;
+	}
+	public Integer getqType() {
+		return qType;
+	}
+	public void setqType(Integer qType) {
+		this.qType = qType;
+	}
+	public Integer getqClass() {
+		return qClass;
+	}
+	public void setqClass(Integer qClass) {
+		this.qClass = qClass;
+	}
+	public Integer getOpCode() {
+		return opCode;
+	}
+	public void setOpCode(Integer opCode) {
+		this.opCode = opCode;
+	}
+	public String getqName() {
+		return qName;
+	}
+	public void setqName(String qName) {
+		this.qName = qName;
+	}
+	public String getcName() {
+		return cName;
+	}
+	public void setcName(String cName) {
+		this.cName = cName;
+	}
+	public Integer getDnsSub() {
+		return dnsSub;
+	}
+	public void setDnsSub(Integer dnsSub) {
+		this.dnsSub = dnsSub;
+	}
+}

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

@@ -0,0 +1,137 @@
+package com.nis.domain.log;
+
+public class NtcHttpLog extends BaseLogEntity<NtcHttpLog> {
+
+	private static final long serialVersionUID = -7697668215327123848L;
+
+	private String url;
+	private String reqHdrFile;
+	private String reqBodyFile;
+	private String resHdrFile;
+	private String resBodyFile;
+	
+	/*以下字段无需反馈到界面*/
+	private Integer c2sIsn;
+	private Integer pxyFlag;
+	private Integer httpSeq;
+	private String reqLine;
+	private String resLine;
+	private String cookie;
+	private String refefer;
+	private String userAgent;
+	private String userDefineKey;
+	private String userDefineValue;
+	private String contentLen;
+	private String contentType;
+	private String setCookie;
+	
+	
+	public String getReqHdrFile() {
+		return reqHdrFile;
+	}
+	public void setReqHdrFile(String reqHdrFile) {
+		this.reqHdrFile = reqHdrFile;
+	}
+	public String getReqBodyFile() {
+		return reqBodyFile;
+	}
+	public void setReqBodyFile(String reqBodyFile) {
+		this.reqBodyFile = reqBodyFile;
+	}
+	public String getResHdrFile() {
+		return resHdrFile;
+	}
+	public void setResHdrFile(String resHdrFile) {
+		this.resHdrFile = resHdrFile;
+	}
+	public String getResBodyFile() {
+		return resBodyFile;
+	}
+	public void setResBodyFile(String resBodyFile) {
+		this.resBodyFile = resBodyFile;
+	}
+	public Integer getPxyFlag() {
+		return pxyFlag;
+	}
+	public void setPxyFlag(Integer pxyFlag) {
+		this.pxyFlag = pxyFlag;
+	}
+	public String getCookie() {
+		return cookie;
+	}
+	public void setCookie(String cookie) {
+		this.cookie = cookie;
+	}
+	public String getRefefer() {
+		return refefer;
+	}
+	public void setRefefer(String refefer) {
+		this.refefer = refefer;
+	}
+	public String getUserAgent() {
+		return userAgent;
+	}
+	public void setUserAgent(String userAgent) {
+		this.userAgent = userAgent;
+	}
+	public String getUserDefineKey() {
+		return userDefineKey;
+	}
+	public void setUserDefineKey(String userDefineKey) {
+		this.userDefineKey = userDefineKey;
+	}
+	public String getUserDefineValue() {
+		return userDefineValue;
+	}
+	public void setUserDefineValue(String userDefineValue) {
+		this.userDefineValue = userDefineValue;
+	}
+	public String getContentLen() {
+		return contentLen;
+	}
+	public void setContentLen(String contentLen) {
+		this.contentLen = contentLen;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getSetCookie() {
+		return setCookie;
+	}
+	public void setSetCookie(String setCookie) {
+		this.setCookie = setCookie;
+	}
+	public Integer getC2sIsn() {
+		return c2sIsn;
+	}
+	public void setC2sIsn(Integer c2sIsn) {
+		this.c2sIsn = c2sIsn;
+	}
+	public Integer getHttpSeq() {
+		return httpSeq;
+	}
+	public void setHttpSeq(Integer httpSeq) {
+		this.httpSeq = httpSeq;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getReqLine() {
+		return reqLine;
+	}
+	public void setReqLine(String reqLine) {
+		this.reqLine = reqLine;
+	}
+	public String getResLine() {
+		return resLine;
+	}
+	public void setResLine(String resLine) {
+		this.resLine = resLine;
+	}
+}

src/main/java/com/nis/domain/log/NtcL2tpLog.java

@@ -0,0 +1,30 @@
+package com.nis.domain.log;
+
+public class NtcL2tpLog extends BaseLogEntity<NtcL2tpLog> {
+	
+	private static final long serialVersionUID = -3547128625966615793L;
+	
+	private Integer tunnelType;// 通道类型
+	private Integer encryptMode;// 加密方式
+	private String chapName; // 用户名称
+	
+	public String getChapName() {
+		return chapName;
+	}
+	public void setChapName(String chapName) {
+		this.chapName = chapName;
+	}
+	public Integer getTunnelType() {
+		return tunnelType;
+	}
+	public void setTunnelType(Integer tunnelType) {
+		this.tunnelType = tunnelType;
+	}
+	public Integer getEncryptMode() {
+		return encryptMode;
+	}
+	public void setEncryptMode(Integer encryptMode) {
+		this.encryptMode = encryptMode;
+	}
+	
+}

src/main/java/com/nis/domain/log/NtcPptpLog.java

@@ -0,0 +1,23 @@
+package com.nis.domain.log;
+
+public class NtcPptpLog extends BaseLogEntity<NtcPptpLog> {
+	
+	private static final long serialVersionUID = 6527360739786343374L;
+	
+	private Integer tunnelType;// 通道类型
+	private Integer encryptMode;// 加密方式
+	
+	public Integer getTunnelType() {
+		return tunnelType;
+	}
+	public void setTunnelType(Integer tunnelType) {
+		this.tunnelType = tunnelType;
+	}
+	public Integer getEncryptMode() {
+		return encryptMode;
+	}
+	public void setEncryptMode(Integer encryptMode) {
+		this.encryptMode = encryptMode;
+	}
+	
+}

src/main/java/com/nis/domain/log/NtcSslLog.java

@@ -0,0 +1,37 @@
+package com.nis.domain.log;
+
+public class NtcSslLog extends BaseLogEntity<NtcSslLog>{
+	
+	private static final long serialVersionUID = 533266057780162781L;
+	
+	private String version;// 版本号
+	private String sni;// SNI 
+	private String san;// SAN 
+	private String ca;// CA
+	
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getSni() {
+		return sni;
+	}
+	public void setSni(String sni) {
+		this.sni = sni;
+	}
+	public String getSan() {
+		return san;
+	}
+	public void setSan(String san) {
+		this.san = san;
+	}
+	public String getCa() {
+		return ca;
+	}
+	public void setCa(String ca) {
+		this.ca = ca;
+	}
+}
+