fix: 修改各种文件存储配置类名称,避免可能的冲突

main
hong.yang 1 year ago
parent ddaa166716
commit 9b69739f28

@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.1.2023102401.Alpha</version>
</parent>
<artifactId>dataroom-core</artifactId>

@ -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

@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "gc.starter.file.minio")
public class MinioConfig
public class DataRoomMinioConfig
{
/**
*

@ -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_TYPE2=LOCAL_FILE_TYPE()
*/
int transferFileType = 2;
/**
*
*/
int retryTimes;
/**
*
*/

@ -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;
}

@ -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())

@ -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<FTPClient> {
@Override
public PooledObject<FTPClient> 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<FTPClient> {
*/
@Override
public void activateObject(PooledObject<FTPClient> pool) throws Exception {
FtpConfig ftp = config.getFile().getFtp();
DataRoomFtpConfig ftp = config.getFile().getFtp();
FTPClient ftpClient = pool.getObject();
if (!ftpClient.isConnected()) {
log.info("ftp连接已关闭重新连接");

@ -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

@ -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<ChannelSftp>{
@Resource
private SftpConfig config;
private DataRoomSftpConfig config;
/**
*

@ -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

@ -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

@ -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();

@ -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;

@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.1.2023102401.Alpha</version>
</parent>
<artifactId>dataroom-server</artifactId>

@ -5,7 +5,7 @@
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.1.2023102401.Alpha</version>
<packaging>pom</packaging>
<name>dataroom</name>
@ -45,7 +45,7 @@
<jackson.version.core>2.13.3</jackson.version.core>
<json.version>20220320</json.version>
<minio.version>8.2.2</minio.version>
<dataset.core.version>2.0.1.2023102401.Alpha</dataset.core.version>
<dataset.core.version>2.0.1.2023102501.Alpha</dataset.core.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<commons-net.version>3.6</commons-net.version>
<commons-dbcp2.version>2.10.0</commons-dbcp2.version>

Loading…
Cancel
Save