From ae7a741be3a59e2c8da17854531fcedf694e425f Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Wed, 28 Nov 2018 11:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BD=E5=AE=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E6=9B=BF=E6=8D=A2=E5=8A=A8=E4=BD=9C=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ConfigSynchronizationService.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index fa5a1009c..e6d87d488 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -251,7 +251,12 @@ public class ConfigSynchronizationService  extends BaseService{
 							for(int r=0;r<regionArray.length;r++){
 								Field field = aClass.getDeclaredField(regionArray[r]);
 								field.setAccessible(true);
-								value += "/"+replaceContentEscape(field.get(cfg)==null?"":field.get(cfg).toString());//自定义域以/分割时的处理
+								if(n.get("regionKey").equals("substitute")){
+									value += "/"+replaceContentEscape(field.get(cfg)==null?"":field.get(cfg).toString());//自定义域以/分割时的处理
+								}else{
+									value += replaceContentEscape(field.get(cfg)==null?"":field.get(cfg).toString());
+								}
+								
 							}
 							userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
 						}else{
@@ -425,7 +430,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			String json=gsonToJson(maatBean);
 //			logger.info(json);
 			//调用服务接口配置全量更新
-//			JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+			JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
 		}
 		return hasData;
 	}