From ebbf999cf73229c469592cff7c960a6d0b878421 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 5 Dec 2018 09:28:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=82=AE=E4=BB=B6=E4=B8=8EIP?= =?UTF-8?q?=E6=88=96=E5=9F=9F=E5=90=8D=E6=8B=A6=E6=88=AA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E4=B8=9A=E5=8A=A1=E6=97=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=97=B6=E7=BB=9F=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E5=8F=91{}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/ConfigServiceUtil.java | 2 ++ .../configuration/ConfigSynchronizationService.java | 6 +++--- src/main/resources/service/service_config.xml | 13 +++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 4ac6a0320..c29b8b35f 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -717,6 +717,7 @@ public class ConfigServiceUtil { throw new MaatConvertException(":"+result); } } catch (Exception e) { + e.printStackTrace(); throw e; }finally { if (response != null) { @@ -781,6 +782,7 @@ public class ConfigServiceUtil { //创建连接 WebTarget wt = ClientUtil.getWebTarger(url); logger.info("sync_send url:"+url); + logger.info("Last-Completed-Tag:"+completeTag); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON) .header("Content-Type", MediaType.APPLICATION_JSON) 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 31243a972..d59e6ea03 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -136,12 +136,12 @@ public class ConfigSynchronizationService extends BaseService{ handleCallbackData(className,page,entity,request,response,false); } if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识 - String json = ""; - if("1".equals(serviceType)){ + String json = "{}"; + /*if("1".equals(serviceType)){ json="{}"; }else{ json="[]"; - } + }*/ JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED"); } } diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml index 8f5fafcf0..68288cb69 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -86,7 +86,7 @@ - + - + - + @@ -178,9 +178,9 @@ - + @@ -188,7 +188,8 @@ - + +