diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/ConnectServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/ConnectServiceImpl.java index ac44131..bc9e9d7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/ConnectServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/ConnectServiceImpl.java @@ -44,7 +44,11 @@ public class ConnectServiceImpl implements ConnectService { Map config = new HashMap<>(); try { - config = dbDao.get("select * from system_param_config where paramKey='upper_server_ip'"); + if(level==0) { + config = dbDao.get("select syncIp as paramValue from sync_data_set limit 1"); + } else { + config = dbDao.get("select * from system_param_config where paramKey='upper_server_ip'"); + } } catch (Exception ex) { } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java index 95cb809..f4eed66 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java @@ -1031,7 +1031,7 @@ public class IdcServiceImpl implements IdcService { } outputStream.flush(); - + outputStream.close(); } catch (Exception e) {