From 6fd8894295d705164feeb6a2822d3fc867f14e8c Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 13 Jun 2023 16:10:59 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=BA=A2=E5=AD=97=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java   | 1 -
 dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java   | 1 -
 .../main/java/com/dxhy/oss/service/impl/FileServiceImpl.java  | 4 ++--
 dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java     | 1 +
 dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java
index de591237..2e842804 100644
--- a/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java
+++ b/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
-@Service
 public class FtpService {
 
     private final SftpPool pool;
diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java
index d1d63331..5f371227 100644
--- a/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java
+++ b/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java
@@ -15,7 +15,6 @@ import java.nio.file.Files;
  * @author jiaohongyang
  */
 @Slf4j
-@Service
 public class SshService {
 
     private final SshPool pool;
diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java
index fc6d6563..81b3b839 100644
--- a/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java
+++ b/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java
@@ -199,7 +199,7 @@ public class FileServiceImpl implements FileService {
             FileInputStream fis = null;
             FileOutputStream fos = null;
             try {
-                File download = new File(downloadFile.substring(0, downloadFile.lastIndexOf("/")));
+                File download = new File(downloadFile);
                 fis = new FileInputStream(download);
                 fos = new FileOutputStream(file);
                 //复制文件
@@ -210,7 +210,7 @@ public class FileServiceImpl implements FileService {
                 fos.flush();
                 b = true;
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("本地导出异常：{}",e);
             }finally {
                 try {
                     if(fis != null){fis.close();}
diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java
index 9dba4130..603752ca 100644
--- a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java
+++ b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java
@@ -1,6 +1,7 @@
 package com.dxhy.oss.utils;
 
 import com.dxhy.oss.service.FtpService;
+import com.dxhy.oss.service.SshService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java
index 912e9296..adafac69 100644
--- a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java
+++ b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java
@@ -1,6 +1,5 @@
 package com.dxhy.oss.utils;
 
-import com.jcraft.jsch.ChannelSftp;
 import lombok.Data;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;