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

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

Browse Source
This commit is contained in:
leijun
2018-10-17 10:26:56 +08:00
parent 2f5ec8ee12 263141ee5f
commit f7cbf39325
27 changed files with 410 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java
View File

@@ -8,6 +8,7 @@
*/
package com.nis.domain.configuration.template;
import com.google.gson.JsonObject;
import com.nis.util.excel.ExcelField;
/**
@@ -38,14 +39,14 @@ public class IpAllTemplate {
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
@ExcelField(title="client_ip",align=2,sort=2)
@ExcelField(title="client_ip",align=2,sort=11)
public String getSrcIpAddress() {
return srcIpAddress;
}
public void setSrcIpAddress(String srcIpAddress) {
this.srcIpAddress = srcIpAddress;
}
@ExcelField(title="server_ip",align=2,sort=3)
@ExcelField(title="server_ip",align=2,sort=12)
public String getDestIpAddress() {
return destIpAddress;
}
@@ -53,14 +54,14 @@ public class IpAllTemplate {
this.destIpAddress = destIpAddress;
}
@ExcelField(title="client_port",align=2,sort=4)
@ExcelField(title="client_port",align=2,sort=13)
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
@ExcelField(title="server_port",align=2,sort=5)
@ExcelField(title="server_port",align=2,sort=14)
public String getDestPort() {
return destPort;
}
@@ -68,18 +69,19 @@ public class IpAllTemplate {
this.destPort = destPort;
}
@ExcelField(title="protocol",align=2,sort=6)
@ExcelField(title="protocol",align=2,sort=15)
public Integer getProtocol() {
return protocol;
}
public void setProtocol(Integer protocol) {
this.protocol = protocol;
}
@ExcelField(title="direction",align=2,sort=7)
@ExcelField(title="direction",align=2,sort=16)
public Integer getDirection() {
return direction;
}
public void setDirection(Integer direction) {
this.direction = direction;
}
}

36
src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java Normal file
View File

@@ -0,0 +1,36 @@
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* EXCEL IPPayload导入替换模板
*
*/
public class IpPayloadTemplate extends IpAllTemplate {
private String userRegion1;
private String userRegion2;
private String userRegion3;
@ExcelField(title="replace_zone",dictType="INTERCEPT_REPLACE_ZONE",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}
public void setUserRegion1(String userRegion1) {
this.userRegion1 = userRegion1;
}
@ExcelField(title="replaced_content",align=2,sort=2)
public String getUserRegion2() {
return userRegion2;
}
public void setUserRegion2(String userRegion1) {
this.userRegion2 = userRegion2;
}
@ExcelField(title="replace_content",align=2,sort=2)
public String getUserRegion3() {
return userRegion3;
}
public void setUserRegion3(String userRegion1) {
this.userRegion3 = userRegion3;
}
}

25
src/main/java/com/nis/domain/configuration/template/IpRateLimitTemplate.java
View File

@@ -1,24 +1,19 @@
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* wx 将部分字段的标题改变，或者不需要的字段隐藏
* 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
* @author dell
* EXCEL IP导入限速模板
*
*/
public class IpRateLimitTemplate extends IpCfgTemplate {
public class IpRateLimitTemplate extends IpAllTemplate {
@Override
public Integer getIrType() {
// TODO Auto-generated method stub
return super.getIrType();
private String userRegion1;
@ExcelField(title="rate_limte",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}
@Override
public Integer getDnsStrategyId() {
// TODO Auto-generated method stub
return super.getDnsStrategyId();
public void setUserRegion1(String userRegion1) {
this.userRegion1 = userRegion1;
}
}

69
src/main/java/com/nis/domain/configuration/template/IpWhitelistTemplate.java Normal file
View File

@@ -0,0 +1,69 @@
/**
*@Title: BaseStringConfig.java
*@Package com.nis.domain.restful
*@Description TODO
*@author dell
*@date 2018年2月5日 下午5:26:02
*@version 版本号
*/
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* @Description: excel导入IP白名单配置模板
*/
public class IpWhitelistTemplate {
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
*
* @since 1.0.0
*/
private String cfgDesc;
private String srcIpAddress;
private String destIpAddress;
private String srcPort;
private String destPort;
@ExcelField(title="config_describe",align=2,sort=1)
public String getCfgDesc() {
return cfgDesc;
}
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
@ExcelField(title="client_ip",align=2,sort=11)
public String getSrcIpAddress() {
return srcIpAddress;
}
public void setSrcIpAddress(String srcIpAddress) {
this.srcIpAddress = srcIpAddress;
}
@ExcelField(title="server_ip",align=2,sort=12)
public String getDestIpAddress() {
return destIpAddress;
}
public void setDestIpAddress(String destIpAddress) {
this.destIpAddress = destIpAddress;
}
@ExcelField(title="client_port",align=2,sort=13)
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
@ExcelField(title="server_port",align=2,sort=14)
public String getDestPort() {
return destPort;
}
public void setDestPort(String destPort) {
this.destPort = destPort;
}
}

11
src/main/java/com/nis/domain/maat/GroupReuseCfg.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
@@ -13,7 +14,15 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
*
*/
public class GroupReuseCfg implements Serializable {
@Expose
@SerializedName("service")
private Integer serviceId;
public Integer getServiceId() {
return serviceId;
}
public void setServiceId(Integer serviceId) {
this.serviceId = serviceId;
}
/**
*
*/

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

@@ -258,6 +258,15 @@ public class MaatCfg implements Serializable {
@Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
private String userRegion;
public String getUserRegion() {
return userRegion;
}
public void setUserRegion(String userRegion) {
this.userRegion = userRegion;
}
public Integer getRegionId() {
return regionId;
}