From 9b69739f28ddfa22c429189f2a7220196f197bc9 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 25 Oct 2023 13:46:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataRoom/dataroom-core/pom.xml | 2 +- ...{FtpConfig.java => DataRoomFtpConfig.java} | 2 +- ...ioConfig.java => DataRoomMinioConfig.java} | 2 +- ...ftpConfig.java => DataRoomSftpConfig.java} | 32 +++---------------- .../dataroom/core/config/bean/FileConfig.java | 6 ++-- .../impl/DataRoomMinioServiceImpl.java | 8 ++--- .../service/pool/ftp/FtpClientFactory.java | 6 ++-- .../service/pool/ftp/FtpPoolServiceImpl.java | 4 +-- .../service/pool/sftp/SftpClientFactory.java | 4 +-- .../service/pool/sftp/SftpPoolService.java | 4 +-- .../dataroom/core/utils/FtpClientUtil.java | 4 +-- .../core/utils/MinioFileInterface.java | 4 +-- .../dataroom/core/utils/SftpClientUtils.java | 4 +-- DataRoom/dataroom-server/pom.xml | 2 +- DataRoom/pom.xml | 4 +-- 15 files changed, 33 insertions(+), 55 deletions(-) rename DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/{FtpConfig.java => DataRoomFtpConfig.java} (96%) rename DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/{MinioConfig.java => DataRoomMinioConfig.java} (97%) rename DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/{SftpConfig.java => DataRoomSftpConfig.java} (70%) diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 0f1a7db1..3aedccb4 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 2.0.0.RELEASE + 2.0.1.2023102401.Alpha dataroom-core diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FtpConfig.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomFtpConfig.java similarity index 96% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FtpConfig.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomFtpConfig.java index c4af9c55..f22f500a 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FtpConfig.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomFtpConfig.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; @Data @Configuration @ConfigurationProperties(prefix = "gc.starter.file.ftp") -public class FtpConfig extends GenericObjectPoolConfig { +public class DataRoomFtpConfig extends GenericObjectPoolConfig { /** * ftp服务器地址 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/MinioConfig.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomMinioConfig.java similarity index 97% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/MinioConfig.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomMinioConfig.java index bebb10eb..c8ca3704 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/MinioConfig.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomMinioConfig.java @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; @Data @Configuration @ConfigurationProperties(prefix = "gc.starter.file.minio") -public class MinioConfig +public class DataRoomMinioConfig { /** * 服务地址 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/SftpConfig.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomSftpConfig.java similarity index 70% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/SftpConfig.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomSftpConfig.java index 6f0220e9..482b73a8 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/SftpConfig.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/DataRoomSftpConfig.java @@ -13,25 +13,25 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConfigurationProperties(prefix = "gc.starter.file.sftp") @Data -public class SftpConfig extends GenericObjectPoolConfig { +public class DataRoomSftpConfig extends GenericObjectPoolConfig { /** - * ftp服务器地址 + * sftp服务器地址 */ private String host; /** - * ftp服务器端口 + * sftp服务器端口 */ private Integer port; /** - * ftp服务器用户名 + * sftp服务器用户名 */ private String username; /** - * ftp服务器密码 + * sftp服务器密码 */ private String password; @@ -40,28 +40,6 @@ public class SftpConfig extends GenericObjectPoolConfig { */ private String privateKey; - /** - * 传输编码 - */ - String encoding = "utf-8"; - /** - * 被动模式：在这种模式下，数据连接是由客户程序发起的 - */ - boolean passiveMode = true; - /** - * 连接超时时间 - */ - int clientTimeout = 30000; - - /** - * 0=ASCII_FILE_TYPE(ASCII格式)，1=EBCDIC_FILE_TYPE，2=LOCAL_FILE_TYPE(二进制文件) - */ - int transferFileType = 2; - /** - * 重新连接时间 - */ - int retryTimes; - /** * 缓存大小 */ diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FileConfig.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FileConfig.java index b4fa1a54..8da947f1 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FileConfig.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FileConfig.java @@ -34,15 +34,15 @@ public class FileConfig { /** * ftp配置 */ - private FtpConfig ftp; + private DataRoomFtpConfig ftp; /** * sftp配置 */ - private SftpConfig sftp; + private DataRoomSftpConfig sftp; /** * minio配置 */ - private MinioConfig minio; + private DataRoomMinioConfig minio; } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomMinioServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomMinioServiceImpl.java index 6dd9185e..8d23583f 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomMinioServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomMinioServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.gccloud.common.exception.GlobalException; import com.gccloud.dataroom.core.config.DataRoomConfig; import com.gccloud.dataroom.core.config.bean.FileConfig; -import com.gccloud.dataroom.core.config.bean.MinioConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomMinioConfig; import com.gccloud.dataroom.core.module.file.entity.DataRoomFileEntity; import com.gccloud.dataroom.core.module.file.service.IDataRoomFileService; import com.gccloud.dataroom.core.module.file.service.IDataRoomOssService; @@ -75,7 +75,7 @@ public class DataRoomMinioServiceImpl implements IDataRoomOssService { // 组装路径:获取当前日期并格式化为"yyyy/mm/dd"格式的字符串 String basePath = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd")); String filePath = basePath + "/" + newFileName; - MinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); + DataRoomMinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); try (InputStream inputStream = file.getInputStream()) { PutObjectArgs args = PutObjectArgs.builder() .bucket(minioConfig.getBucketName()) @@ -106,7 +106,7 @@ public class DataRoomMinioServiceImpl implements IDataRoomOssService { public DataRoomFileEntity upload(InputStream inputStream, String fileName, long size, DataRoomFileEntity entity) { fileName = PathUtils.normalizePath(fileName); String extension = FilenameUtils.getExtension(fileName); - MinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); + DataRoomMinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); long fileSize = size == 0 ? -1 : size; // 使用minio的最小分片大小 long partSize = fileSize == -1 ? ObjectWriteArgs.MIN_MULTIPART_SIZE : -1; @@ -197,7 +197,7 @@ public class DataRoomMinioServiceImpl implements IDataRoomOssService { @Override public String copy(String sourcePath, String targetPath) { - MinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); + DataRoomMinioConfig minioConfig = bigScreenConfig.getFile().getMinio(); CopySource source = CopySource.builder().bucket(minioConfig.getBucketName()).object(sourcePath).build(); CopyObjectArgs args = CopyObjectArgs.builder() .bucket(minioConfig.getBucketName()) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpClientFactory.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpClientFactory.java index 19dfd2c0..28a9957b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpClientFactory.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpClientFactory.java @@ -1,7 +1,7 @@ package com.gccloud.dataroom.core.module.file.service.pool.ftp; import com.gccloud.dataroom.core.config.DataRoomConfig; -import com.gccloud.dataroom.core.config.bean.FtpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomFtpConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -41,7 +41,7 @@ public class FtpClientFactory implements PooledObjectFactory { @Override public PooledObject makeObject() throws Exception { log.info("创建ftp连接"); - FtpConfig ftp = config.getFile().getFtp(); + DataRoomFtpConfig ftp = config.getFile().getFtp(); FTPClient ftpClient = new FTPClient(); ftpClient.setConnectTimeout(ftp.getClientTimeout()); ftpClient.connect(ftp.getHost(), ftp.getPort()); @@ -137,7 +137,7 @@ public class FtpClientFactory implements PooledObjectFactory { */ @Override public void activateObject(PooledObject pool) throws Exception { - FtpConfig ftp = config.getFile().getFtp(); + DataRoomFtpConfig ftp = config.getFile().getFtp(); FTPClient ftpClient = pool.getObject(); if (!ftpClient.isConnected()) { log.info("ftp连接已关闭，重新连接"); diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpPoolServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpPoolServiceImpl.java index cf1a3647..998ff726 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpPoolServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/ftp/FtpPoolServiceImpl.java @@ -1,6 +1,6 @@ package com.gccloud.dataroom.core.module.file.service.pool.ftp; -import com.gccloud.dataroom.core.config.bean.FtpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomFtpConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.pool2.impl.GenericObjectPool; @@ -29,7 +29,7 @@ public class FtpPoolServiceImpl { * ftp 客户端配置文件 */ @Resource - private FtpConfig config; + private DataRoomFtpConfig config; /** * ftp 客户端工厂 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpClientFactory.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpClientFactory.java index c90ab162..8acbf764 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpClientFactory.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpClientFactory.java @@ -1,6 +1,6 @@ package com.gccloud.dataroom.core.module.file.service.pool.sftp; -import com.gccloud.dataroom.core.config.bean.SftpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomSftpConfig; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; @@ -28,7 +28,7 @@ import java.util.Properties; public class SftpClientFactory extends BasePooledObjectFactory{ @Resource - private SftpConfig config; + private DataRoomSftpConfig config; /** * 新建对象 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpPoolService.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpPoolService.java index 929a995e..9143a69d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpPoolService.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/pool/sftp/SftpPoolService.java @@ -1,6 +1,6 @@ package com.gccloud.dataroom.core.module.file.service.pool.sftp; -import com.gccloud.dataroom.core.config.bean.SftpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomSftpConfig; import com.jcraft.jsch.ChannelSftp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.pool2.impl.GenericObjectPool; @@ -30,7 +30,7 @@ public class SftpPoolService { * ftp 客户端配置文件 */ @Resource - private SftpConfig config; + private DataRoomSftpConfig config; /** * ftp 客户端工厂 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/FtpClientUtil.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/FtpClientUtil.java index 5f80f1fa..bd6331b5 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/FtpClientUtil.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/FtpClientUtil.java @@ -1,7 +1,7 @@ package com.gccloud.dataroom.core.utils; -import com.gccloud.dataroom.core.config.bean.FtpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomFtpConfig; import com.gccloud.dataroom.core.module.file.service.pool.ftp.FtpPoolServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -29,7 +29,7 @@ import java.io.OutputStream; public class FtpClientUtil { @Resource - private FtpConfig config; + private DataRoomFtpConfig config; /** * ftp 连接池 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/MinioFileInterface.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/MinioFileInterface.java index c11553c1..0d1f4304 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/MinioFileInterface.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/MinioFileInterface.java @@ -1,6 +1,6 @@ package com.gccloud.dataroom.core.utils; -import com.gccloud.dataroom.core.config.bean.MinioConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomMinioConfig; import io.minio.BucketExistsArgs; import io.minio.GetObjectArgs; import io.minio.GetPresignedObjectUrlArgs; @@ -30,7 +30,7 @@ import java.security.NoSuchAlgorithmException; @Component public class MinioFileInterface { @Autowired - private MinioConfig minioConfig; + private DataRoomMinioConfig minioConfig; private MinioClient init() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { MinioClient build = MinioClient.builder().endpoint(minioConfig.getUrl()).credentials(minioConfig.getAccessKey(), minioConfig.getSecretKey()).build(); diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/SftpClientUtils.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/SftpClientUtils.java index af8d26b9..55ac2f35 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/SftpClientUtils.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/utils/SftpClientUtils.java @@ -1,6 +1,6 @@ package com.gccloud.dataroom.core.utils; -import com.gccloud.dataroom.core.config.bean.SftpConfig; +import com.gccloud.dataroom.core.config.bean.DataRoomSftpConfig; import com.gccloud.dataroom.core.module.file.service.pool.sftp.SftpPoolService; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.SftpException; @@ -26,7 +26,7 @@ import java.io.OutputStream; public class SftpClientUtils { @Resource - private SftpConfig config; + private DataRoomSftpConfig config; @Resource private SftpPoolService sFtpPoolService; diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index 60f5169a..4ee621a1 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 2.0.0.RELEASE + 2.0.1.2023102401.Alpha dataroom-server diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 4cb84f31..400438f7 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -5,7 +5,7 @@ com.gccloud dataroom - 2.0.0.RELEASE + 2.0.1.2023102401.Alpha pom dataroom @@ -45,7 +45,7 @@ 2.13.3 20220320 8.2.2 - 2.0.1.2023102401.Alpha + 2.0.1.2023102501.Alpha 2.22.2 3.6 2.10.0