From 6d8b8194ca9545c03dfa8b69d0a05200369fd889 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Fri, 22 Jun 2018 15:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userRegion=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=9A=94=E7=AC=A6=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=8D=A0=E4=BD=8D?= =?UTF-8?q?=E7=AC=A6=E5=8F=82=E6=95=B0=EF=BC=8Cmaat=E7=BB=93=E6=9E=84json?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=9D=E5=A7=8B=E5=8C=96userRegion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/maat/MaatCfg.java | 5 +++-- src/main/java/com/nis/util/Constants.java | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) 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", ";;"); }