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

Browse Source 
develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
	限速模板增加ratelimit字段，修改导出protocol注释信息
This commit is contained in:
duandongmei
2018-10-17 11:10:50 +08:00
parent 2b1192df3e aa690069bd
commit 94cb4fc9e4
20 changed files with 719 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,13 +32,16 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
private static final long serialVersionUID = -5679998383250783571L;
private static final String tableName="app_policy_cfg";
@Expose
@ExcelField(title="cfg_id",sort=0)
private Integer compileId;
@Expose
private String ratelimit;
private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
private Integer specServiceId;
@ExcelField(title="basic_protocol",sort=2)
private String appName;
@ExcelField(title="behaviour_type",sort=3)
private String behavName;
private String cfgKeywords;
private String userRegion1;
@@ -48,7 +51,29 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
private String userRegion5;
private String configType;
@ExcelField(title="encrypted_tunnel_behavior",sort=2)
private String behaviorName;
@ExcelField(title="social_app",sort=2)
private String socialName;
public String getBehaviorName() {
return behaviorName;
}
public void setBehaviorName(String behaviorName) {
this.behaviorName = behaviorName;
}
public String getSocialName() {
return socialName;
}
public void setSocialName(String socialName) {
this.socialName = socialName;
}
public String getConfigType() {
return configType;

30
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -72,18 +72,18 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* GK类型
*/
@Expose
@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
@ExcelField(title="action",dictType="SERVICE_ACTION",sort=20)
protected Integer action;
/**
* 有效标识
*/
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=9)
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90)
@Expose
protected Integer isValid;
/**
* 是否审核
*/
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=10)
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=100)
protected Integer isAudit;
/**
* 创建人员
@@ -92,12 +92,12 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 创建人员
*/
@ExcelField(title="creator",sort=11)
@ExcelField(title="creator",sort=110)
protected String creatorName;
/**
* 配置时间
*/
@ExcelField(title="config_time",sort=12)
@ExcelField(title="config_time",sort=120)
protected Date createTime;
/**
* 修改人员
@@ -106,12 +106,12 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 创建人员
*/
@ExcelField(title="editor",sort=13)
@ExcelField(title="editor",sort=130)
protected String editorName;
/**
* 修改时间
*/
@ExcelField(title="edit_time",sort=14)
@ExcelField(title="edit_time",sort=140)
protected Date editTime;
/**
* 审核人员
@@ -120,13 +120,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 审核人员
*/
@ExcelField(title="auditor",sort=15)
@ExcelField(title="auditor",sort=150)
protected String auditorName;
/**
* 审核时间
*/
@Expose
@ExcelField(title="audit_time",sort=16)
@ExcelField(title="audit_time",sort=160)
@SerializedName("opTime")
protected Date auditTime;
/**
@@ -142,27 +142,27 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* 来函
*/
@ExcelField(title="letter",sort=5)
@ExcelField(title="letter",sort=50)
protected String requestName;
/**
* 是否区域gk
*/
@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK",sort=4)
@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK",sort=40)
protected Integer isAreaEffective;
/**
* 分类
*/
@ExcelField(title="classification",dictType="type",sort=6)
@ExcelField(title="classification",dictType="type",sort=60)
protected String classify;
/**
* 性质
*/
@ExcelField(title="attribute",dictType="attribute",sort=7)
@ExcelField(title="attribute",dictType="attribute",sort=70)
protected String attribute;
/**
* 标签
*/
@ExcelField(title="label",dictType="label",sort=8)
@ExcelField(title="label",dictType="label",sort=80)
protected String lable;
/**
* 分类
@@ -213,7 +213,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* do_log属性在界面（do_log:0不需要1记录所有日志2只记录结构化日志。默认是2）
*/
@ExcelField(title="do_log",dictType="DO_LOG",sort=3)
@ExcelField(title="do_log",dictType="DO_LOG",sort=30)
protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;

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

@@ -9,7 +9,7 @@ import com.nis.util.excel.ExcelField;
public class IpRateLimitTemplate extends IpAllTemplate {
private String userRegion1;
@ExcelField(title="rate_limte",align=2,sort=2)
@ExcelField(title="ratelimit",dictType="RATE_LIMIT",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}