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

ASN的自定义域增加AS前缀

Browse Source
This commit is contained in:
duandongmei
2019-01-19 11:07:20 +06:00
parent ca14bcb621
commit c23c0d738e
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/util/Constants.java
View File

@@ -498,6 +498,7 @@ public final class Constants {
public static final String VOIP_ACCOUNT_REGION = Configurations.getStringProperty("voip_account","av_voip_account"); public static final String VOIP_ACCOUNT_REGION = Configurations.getStringProperty("voip_account","av_voip_account");
public static final String NTC_ASN_NUMBER = Configurations.getStringProperty("ntc_asn_number","NTC_ASN_NUMBER"); public static final String NTC_ASN_NUMBER = Configurations.getStringProperty("ntc_asn_number","NTC_ASN_NUMBER");
public static final String ASN_KEY = Configurations.getStringProperty("asn_key","AS"); public static final String ASN_KEY = Configurations.getStringProperty("asn_key","AS");
public static final String ASN_REGION_KEY = Configurations.getStringProperty("asn_region_key","ASN_ID");
public static final String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0"); public static final String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0");
public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1); public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1);
public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2); public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2);

4
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -1556,7 +1556,7 @@ public abstract class BaseService {
BeanUtils.copyProperties(baseIpCfg, cfg); BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(asnIpCfg.getAsnIpGroup()); cfg.setGroupId(asnIpCfg.getAsnIpGroup());
cfg.setRegionId(asnIpCfg.getRegionId()); cfg.setRegionId(asnIpCfg.getRegionId());
String userRegion = "ASN_ID=" + asnIpCfg.getUserRegion1(); String userRegion = Constants.ASN_REGION_KEY+"=" +Constants.ASN_KEY+ asnIpCfg.getUserRegion1();
cfg.setUserRegion(userRegion); cfg.setUserRegion(userRegion);
cfg.setIsValid(isValid); cfg.setIsValid(isValid);
cfg.setAuditTime(opTime); cfg.setAuditTime(opTime);
@@ -1930,7 +1930,7 @@ public abstract class BaseService {
maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(info.getValue().get(0).getIsValid()); maatCfg.setIsValid(info.getValue().get(0).getIsValid());
// 设置自定义域 // 设置自定义域
String userRegion = "ASN_ID=" + info.getKey(); String userRegion = Constants.ASN_REGION_KEY+"=" +Constants.ASN_KEY+ info.getKey();
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg); configCompileList.add(maatCfg);

2
src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
View File

@@ -572,7 +572,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(isValid); maatCfg.setIsValid(isValid);
// 设置ASN自定义域 // 设置ASN自定义域
String userRegion = "ASN_ID=" + asnIpCfgs.get(0).getUserRegion1(); String userRegion = Constants.ASN_REGION_KEY+"=" +Constants.ASN_KEY+ asnIpCfgs.get(0).getUserRegion1();
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList); maatBean.setConfigCompileList(configCompileList);

1
src/main/resources/nis.properties
View File

@@ -623,3 +623,4 @@ deleteRegionToCommonGroup=v1/delCommonGroupRegion
asn_key=AS asn_key=AS
#Http\u6cdb\u6536 #Http\u6cdb\u6536
ntcHttpRecordLog=v1/ntcHttpRecordLogs ntcHttpRecordLog=v1/ntcHttpRecordLogs
asn_region_key=ASN_ID