diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index 56db87813..e3badf8ac 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -656,8 +656,9 @@ public class MaatCfg implements Serializable { this.configPercent=100; this.configOption=1; this.startTime=new Date(); - this.endTime=DateUtils.addYears(new Date(), 81); + this.endTime=DateUtils.addYears(this.startTime, 2099-Integer.parseInt(DateUtils.getYear())); this.fatherCfgId=0; - + //初始化用户定义域占位符,对用户定义域有特殊格式的业务,根据分隔符拆分占位符,在相应位置填写相应参数值 + this.userRegion = Constants.USER_REGION_PLACEHOLDER; } } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 296e980e2..5aaf936d5 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -331,5 +331,9 @@ public final class Constants { public static final String SSL_CA_REGION = Configurations.getStringProperty("ssl_ca_region","ssl_ca"); public static final String PROTOCOL_NUM_REGION = Configurations.getStringProperty("protocol_num_region","protocol_num"); public static final String BGP_IP_REGION = Configurations.getStringProperty("bgp_ip_region","bgp_ip"); - public static final String KEYWORD_EXPR = Configurations.getStringProperty("keyword_expr","***and***"); + public static final String KEYWORD_EXPR = Configurations.getStringProperty("keyword_expr","***and***"); + //用户自定义域分隔符 + public static final String USER_REGION_SPLIT = Configurations.getStringProperty("user_region_split", ";"); + //用户自定义域占位符 + public static final String USER_REGION_PLACEHOLDER = Configurations.getStringProperty("user_region_placeholder", ";;"); }