From c23c0d738ebcb60bdaf580f4530af92e2dafa24c Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sat, 19 Jan 2019 11:07:20 +0600 Subject: [PATCH] =?UTF-8?q?ASN=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=9F=9F=E5=A2=9E=E5=8A=A0AS=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 1 + src/main/java/com/nis/web/service/BaseService.java | 4 ++-- src/main/java/com/nis/web/service/basics/AsnIpCfgService.java | 2 +- src/main/resources/nis.properties | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 598857fa1..bf80aba40 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -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 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_REGION_KEY = Configurations.getStringProperty("asn_region_key","ASN_ID"); 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 UPDATE_ACTION = Configurations.getIntProperty("update_action",2); diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index e3f58962c..1be42a7e1 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -1556,7 +1556,7 @@ public abstract class BaseService { BeanUtils.copyProperties(baseIpCfg, cfg); cfg.setGroupId(asnIpCfg.getAsnIpGroup()); 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.setIsValid(isValid); cfg.setAuditTime(opTime); @@ -1930,7 +1930,7 @@ public abstract class BaseService { maatCfg.setAreaIpRegionList(areaIpRegionList); 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); configCompileList.add(maatCfg); diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index cdcf9befa..62c4f89a2 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -572,7 +572,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { maatCfg.setAreaIpRegionList(areaIpRegionList); maatCfg.setIsValid(isValid); // 设置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); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index e24131c73..c6723011f 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -623,3 +623,4 @@ deleteRegionToCommonGroup=v1/delCommonGroupRegion asn_key=AS #Http\u6cdb\u6536 ntcHttpRecordLog=v1/ntcHttpRecordLogs +asn_region_key=ASN_ID \ No newline at end of file