From 3e78e019805686a9a1e6cb80eb49a33fcdc05d02 Mon Sep 17 00:00:00 2001
From: chengqf <584883665@139.com>
Date: Thu, 13 Apr 2023 15:06:40 +0800
Subject: [PATCH] outputStream.close()

---
 .../sale/admin/idc/service/impl/ConnectServiceImpl.java     | 6 +++++-
 .../glxp/sale/admin/idc/service/impl/IdcServiceImpl.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

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<String,Object> 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) {