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

(1)修正app ip 配置新增的时候编译ID在config_group_info为空的情况下取编译ID的逻辑

Browse Source 
(2)app IP配置导入提交
This commit is contained in:
wangxin
2018-11-02 16:59:03 +08:00
parent ef7c3201f0
commit 857e8ecb85
8 changed files with 187 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,29 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
private NtcSubscribeIdCfg ntcSubscribeIdCfg;
private Integer asnIpGroup;//asn组号，仅用于copy属性使用
protected Integer asnIpGroup;//asn组号，仅用于copy属性使用
protected Integer appCode;//仅用于copy属性使用
protected Integer behavCode;//仅用于copy属性使用
protected Integer specServiceId;//仅用于copy属性使用
public Integer getAppCode() {
return appCode;
}
public void setAppCode(Integer appCode) {
this.appCode = appCode;
}
public Integer getBehavCode() {
return behavCode;
}
public void setBehavCode(Integer behavCode) {
this.behavCode = behavCode;
}
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public Integer getAsnIpGroup() {
return asnIpGroup;
}

21
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -40,7 +40,28 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
@ExcelField(title="key_word",sort=201)
protected String cfgKeywords;
protected String cfgKeywordsShowName;
protected Integer appCode;//仅用于copy属性使用
protected Integer behavCode;//仅用于copy属性使用
protected Integer specServiceId;//仅用于copy属性使用
public Integer getAppCode() {
return appCode;
}
public void setAppCode(Integer appCode) {
this.appCode = appCode;
}
public Integer getBehavCode() {
return behavCode;
}
public void setBehavCode(Integer behavCode) {
this.behavCode = behavCode;
}
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
/**
* @param cfgKeywords the cfgKeywords to set
*/

21
src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
View File

@@ -92,7 +92,28 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
* copy属性使用
*/
protected Long dnsStrategyId;
protected Integer appCode;//仅用于copy属性使用
protected Integer behavCode;//仅用于copy属性使用
protected Integer specServiceId;//仅用于copy属性使用
public Integer getAppCode() {
return appCode;
}
public void setAppCode(Integer appCode) {
this.appCode = appCode;
}
public Integer getBehavCode() {
return behavCode;
}
public void setBehavCode(Integer behavCode) {
this.behavCode = behavCode;
}
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public Long getDnsStrategyId() {
return dnsStrategyId;
}