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/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	excel导入提示信息补全，单个字典数据不需要导入
	去掉是否表达式的导入，根据关键词单个和多个区分
This commit is contained in:
duandongmei
2018-10-23 14:14:08 +08:00
parent 5af5a042ae a4ff9ae493
commit 3e1d14602e
84 changed files with 908 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
*/
private static final long serialVersionUID = -5679998383250783571L;
private static final String tableName="app_policy_cfg";
private String indexTable="app_policy_cfg";
@Expose
@ExcelField(title="cfg_id",sort=0)
private Integer compileId;
@@ -268,5 +269,13 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
public void setUserRegion5(String userRegion5) {
this.userRegion5 = userRegion5;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java
View File

@@ -9,6 +9,7 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
*
*/
private static final long serialVersionUID = -2356472662189941874L;
private String indexTable="av_file_sample_cfg";
@Expose
@SerializedName("srcFile")
@ExcelField(title="src_file",sort=2)
@@ -94,5 +95,11 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
public void setResultPath(String resultPath) {
this.resultPath = resultPath;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

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

@@ -139,6 +139,10 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* 来函id
*/
protected Integer requestId;
/**
* 取消审核来函id
*/
protected Integer cancelRequestId;
/**
* 来函
*/
@@ -884,5 +888,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
public void setUserRegion5(String userRegion5) {
this.userRegion5 = userRegion5;
}
public Integer getCancelRequestId() {
return cancelRequestId;
}
public void setCancelRequestId(Integer cancelRequestId) {
this.cancelRequestId = cancelRequestId;
}
}

7
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -37,6 +37,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
super();
// TODO Auto-generated constructor stub
}
private String indexTable="ip_port_cfg";
/**
* ip类型
*/
@@ -307,5 +308,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcsSubscribeIdCfg) {
this.ntcSubscribeIdCfg = ntcsSubscribeIdCfg;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

8
src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
View File

@@ -28,6 +28,7 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
*/
private static final long serialVersionUID = 2796500715438264119L;
private static final String tableName="cfg_index_info";
private String indexTable="cfg_index_info";
private List<AvVoipAccountCfg> voipAccounts;//Add表单使用
private List<AsnIpCfg> asnIpCfgs;//Add表单使用
private List<AvVoipIpCfg> voipIps; //Add表单使用
@@ -308,4 +309,11 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
public static String getTablename() {
return tableName;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/DdosIpCfg.java
View File

@@ -22,6 +22,7 @@ public class DdosIpCfg extends BaseIpCfg {
*
*/
private static final long serialVersionUID = -5446903784736960824L;
private String indexTable="ddos_ip_cfg";
@ExcelField(title="antiddos_protocol",sort=41)
private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
@ExcelField(title="bps_threadshold",sort=42)
@@ -47,6 +48,12 @@ public class DdosIpCfg extends BaseIpCfg {
public void setPpsThreadshold(Long ppsThreadshold) {
this.ppsThreadshold = ppsThreadshold;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/DnsIpCfg.java
View File

@@ -26,6 +26,7 @@ public class DnsIpCfg extends BaseIpCfg {
*
*/
private static final long serialVersionUID = 8149437730819674317L;
private String indexTable="dns_ip_cfg";
private String dnsStrategyName;
private Integer dnsStrategyId;
@@ -41,5 +42,11 @@ public class DnsIpCfg extends BaseIpCfg {
public void setDnsStrategyName(String dnsStrategyName) {
this.dnsStrategyName = dnsStrategyName;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

8
src/main/java/com/nis/domain/configuration/DnsResStrategy.java
View File

@@ -12,6 +12,7 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
*
*/
private static final long serialVersionUID = -2720862431960415564L;
private String indexTable="dns_res_strategy";
private Integer resGroup1Id;
private Integer resGroup1Num;
private Integer resGroup2Id;
@@ -114,4 +115,11 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
public void setGroup1Name(String group1Name) {
this.group1Name = group1Name;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/FileDigestCfg.java
View File

@@ -28,6 +28,7 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
*/
private static final long serialVersionUID = 2796500715438264119L;
private static final String tableName="file_digest_cfg";
private String indexTable="file_digest_cfg";
@ExcelField(title="raw_len",sort=3)
private Long rawLen;
@ExcelField(title="digest",sort=2)
@@ -82,5 +83,11 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
public void setNtcSubscribeIdCfgList(List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList) {
this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java
View File

@@ -17,6 +17,7 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
*
*/
private static final long serialVersionUID = -5902468971425910528L;
private String indexTable="ip_multiplex_pool_cfg";
@Expose
@SerializedName("cfgId")
private Integer compileId;
@@ -102,5 +103,11 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

7
src/main/java/com/nis/domain/configuration/IpPortCfg.java
View File

@@ -17,6 +17,7 @@ package com.nis.domain.configuration;
*/
public class IpPortCfg extends BaseIpCfg {
private static final String tableName="ip_port_cfg";
private String indexTable="ip_port_cfg";
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
*
@@ -53,6 +54,12 @@ public class IpPortCfg extends BaseIpCfg {
public static String getTablename() {
return tableName;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

8
src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
View File

@@ -13,7 +13,7 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
*
*/
private static final long serialVersionUID = -2720862431960415564L;
private String indexTable="pxy_obj_keyring";
private String keyringType;
private String privateKeyFile;
private String publicKeyFile;
@@ -84,6 +84,12 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
public void setSubject(String subject) {
this.subject = subject;
}
public String getIndexTable() {
return indexTable;
}
public void setIndexTable(String indexTable) {
this.indexTable = indexTable;
}
}

8
src/main/java/com/nis/domain/configuration/template/ComplexStringAllTemplate.java
View File

@@ -18,7 +18,6 @@ public class ComplexStringAllTemplate {
private String district;
private String cfgKeywords;
private Integer exprType ;
private Integer matchMethod ;
private Integer isHex;
private Integer isCaseInsenstive;
@@ -44,13 +43,6 @@ public class ComplexStringAllTemplate {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=13)
public Integer getExprType() {
return exprType;
}
public void setExprType(Integer exprType) {
this.exprType = exprType;
}
@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=14)
public Integer getMatchMethod() {
return matchMethod;

8
src/main/java/com/nis/domain/configuration/template/StringAllTemplate.java
View File

@@ -17,7 +17,6 @@ public class StringAllTemplate {
private String cfgDesc;
private String cfgKeywords;
private Integer exprType ;
private Integer matchMethod ;
private Integer isHex;
private Integer isCaseInsenstive;
@@ -36,13 +35,6 @@ public class StringAllTemplate {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=12)
public Integer getExprType() {
return exprType;
}
public void setExprType(Integer exprType) {
this.exprType = exprType;
}
@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=13)
public Integer getMatchMethod() {
return matchMethod;