From 29c169452b293c27589ceedb3808dd38e26eada4 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 20 Jul 2018 10:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88userRegion=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/maat/MaatCfg.java | 2 +-
 src/main/resources/nis.properties              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java
index 752d95396..011bd4dca 100644
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -655,6 +655,6 @@ public class MaatCfg implements Serializable {
 		this.endTime=DateUtils.addYears(this.startTime, 2099-Integer.parseInt(DateUtils.getYear()));
 		this.fatherCfgId=0;
 		//初始化用户定义域占位符，对用户定义域有特殊格式的业务，根据分隔符拆分占位符，在相应位置填写相应参数值
-//		this.userRegion = Constants.USER_REGION_PLACEHOLDER;
+		this.userRegion = Constants.USER_REGION_PLACEHOLDER;
 	}
 }
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 0415510e2..fee4ee6b0 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -330,7 +330,7 @@ userregion_replace_req_key_value=http_req_body
 userregion_replace_res_key_value=http_res_body
 userregion_replace_regex_key=regex
 #用户自定义域占位符
-user_region_placeholder=
+user_region_placeholder=0
 #用户自定义域分隔符
 user_region_split=;
 #IP相关验证正则