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/utils/SftpConfig.java b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java index 9dba4130..c1cc0a18 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; @@ -28,4 +29,22 @@ public class SftpConfig { return new FtpService(sftpPool); } + // 工厂 + @Bean + public SshFactory sshFactory(SshProperties properties) { + return new SshFactory(properties); + } + + // 连接池 + @Bean + public SshPool sshPool(SshFactory sshFactory) { + return new SshPool(sshFactory); + } + + // 辅助类 + @Bean + public SshService sshService(SshPool sftpPool) { + return new SshService(sftpPool); + } + } \ No newline at end of file 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;