From 860d1ca82e6b82a8dfcc0f486f2d2ce291645148 Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Sun, 9 Dec 2018 14:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=96=B9=E6=B3=95=E7=9A=84us?=
 =?UTF-8?q?erRegion=E5=8F=98=E9=87=8F=E5=80=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ConfigSynchronizationService.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 46f9e67b4..cedbdf3eb 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -407,7 +407,7 @@ public class ConfigSynchronizationService  extends BaseService{
 				ipRegionList.addAll(ipRegionList);
 			}
 			//配置域转换
-			configCovert(ipList,strList,complexStrList,
+			userRegion = configCovert(ipList,strList,complexStrList,
 					numList,fileList,regionIds,groupIds,entity,cfg.getCompileId(),
 					StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime(),
 					groupRelationList,ipRegionList,strRegionList,numRegionList,digestRegionList,areaIpRegionList,userRegion);
@@ -811,7 +811,7 @@ public class ConfigSynchronizationService  extends BaseService{
 				//调用服务接口配置全量更新
 				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
+//				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -1784,7 +1784,7 @@ public class ConfigSynchronizationService  extends BaseService{
 	 * @param areaIpRegionList
 	 * @param userRegion
 	 */
-	public void configCovert(List<IpPortCfg> ipList,List<BaseStringCfg> strList,List<ComplexkeywordCfg> complexStrList,
+	public String configCovert(List<IpPortCfg> ipList,List<BaseStringCfg> strList,List<ComplexkeywordCfg> complexStrList,
 			List<com.nis.domain.configuration.NumBoundaryCfg > numList,
 			List<FileDigestCfg> fileList,List<Integer> regionIds,List<Integer> groupIds,BaseCfg entity,
 			Integer compileId,Date auditTime,List<GroupCfg> groupRelationList,
@@ -1910,5 +1910,6 @@ public class ConfigSynchronizationService  extends BaseService{
 			groupRelationList=map.get("groupList");
 			digestRegionList=map.get("dstList");
 		}
+		return userRegion;
 	}
 }