gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1)端口验证修改，端口必须为数字，不再限制大小小于65535，同时加入限制，非0数字不能以0开头

Browse Source 
(2)Maat相关bean加入@Expose注解
This commit is contained in:
wangxin
2018-05-28 17:05:35 +08:00
parent da189660d8
commit 9cd93c1d6e
7 changed files with 109 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -27,44 +27,72 @@ import com.nis.domain.configuration.NumBoundaryCfg;
* @version V1.0
*/
public class MaatCfg implements Serializable {
private Integer compileId;
private Integer action;
@Expose
private Integer compileId;
@Expose
private Integer action;
@Expose
@SerializedName("service")
private Integer serviceId;
private Integer serviceId;
@Expose
@SerializedName("contType")
private String classify;//分类
private String classify;//分类
@Expose
@SerializedName("attrType")
private String attribute;//性质
private String attribute;//性质
@Expose
@SerializedName("contLabel")
private String lable;//标签
private String lable;//标签
@Expose
private Integer taskId;
@Expose
@SerializedName("guaranteeId")
private Integer functionId;
@Expose
@SerializedName("effectiveRange")
private String areaEffectiveIds ;
private Integer doBlackList;
private Integer doLog;
private Integer activeSys;
private Integer configPercent;
private Integer configOption;
private Date startTime;
private Date endTime;
private String userRegion;
private Integer groupNum;
private String areaEffectiveIds ;
@Expose
private Integer doBlackList;
@Expose
private Integer doLog;
@Expose
private Integer activeSys;
@Expose
private Integer configPercent;
@Expose
private Integer configOption;
@Expose
private Date startTime;
@Expose
private Date endTime;
@Expose
private String userRegion;
@Expose
private Integer groupNum;
@Expose
private Integer fatherCfgId;
@Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
private List<GroupCfg> groupRelationList;
private List<StringCfg> strRegionList;
private List<IpCfg> ipRegionList;
private List<NumBoundaryCfg> numRegionList;
@Expose
private List<StringCfg> strRegionList;
@Expose
private List<IpCfg> ipRegionList;
@Expose
private List<NumBoundaryCfg> numRegionList;
@Expose
private List<DigestCfg> digestRegionList;
public static class GroupCfg{
public static class GroupCfg{
@Expose
private Integer groupId;
@Expose
private Integer compileId;
@Expose
private Integer isValid;
@Expose
private Date opTime;
public Integer getGroupId() {
return groupId;
@@ -93,17 +121,27 @@ public class MaatCfg implements Serializable {
}
public static class StringCfg{
@Expose
private Integer regionId;
@Expose
private Integer groupId;
@Expose
@SerializedName("tableName")
private String cfgType;
@Expose
private String district;
@Expose
@SerializedName("keywords")
private String cfgKeywords;
@Expose
private Integer exprType;
@Expose
private Integer matchMethod;
@Expose
private Integer isHexbin;
@Expose
private Integer isValid;
@Expose
private Date opTime;
public Integer getRegionId() {
return regionId;
@@ -168,22 +206,38 @@ public class MaatCfg implements Serializable {
}
public static class IpCfg{
@Expose
private Integer regionId;
@Expose
private Integer groupId;
@Expose
@SerializedName("tableName")
private String cfgType;
@Expose
private Integer ipType;
@Expose
private String srcIp;
@Expose
private String srcIpMask ;
@Expose
private String srcPort ;
@Expose
private String srcPortMask ;
@Expose
private String dstIp ;
@Expose
private String dstIpMask ;
@Expose
private String dstPort ;
@Expose
private String dstPortMask ;
@Expose
private Integer direction ;
@Expose
private Integer protocol ;
@Expose
private Integer isValid;
@Expose
private Date opTime;
public Integer getRegionId() {
return regionId;
@@ -283,13 +337,20 @@ public class MaatCfg implements Serializable {
}
}
public static class NumBoundaryCfg{
@Expose
private Integer regionId;
@Expose
private Integer groupId;
@Expose
@SerializedName("tableName")
private String cfgType;
@Expose
private Integer lowBoundary;
@Expose
private Integer upBoundary;
@Expose
private Integer isValid;
@Expose
private Date opTime;
public Integer getRegionId() {
return regionId;
@@ -334,14 +395,22 @@ public class MaatCfg implements Serializable {
this.opTime = opTime;
}
}public static class DigestCfg{
@Expose
private Integer regionId;
@Expose
private Integer groupId;
@Expose
@SerializedName("tableName")
private String cfgType;
@Expose
private Integer rawLen;
@Expose
private String digest;
@Expose
private Integer cfdsLevel;
@Expose
private Integer isValid;
@Expose
private Date opTime;
public Integer getRegionId() {
return regionId;

5
src/main/java/com/nis/domain/maat/ToMaatBean.java
View File

@@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
/**
@@ -33,11 +34,15 @@ public class ToMaatBean implements Serializable{
*
* @since 1.0.0
*/
@Expose
private String version;
@Expose
@SerializedName("operator")
private String creatorName;
@Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
private List<MaatCfg> configCompileList;
public String getVersion() {