diff --git a/cf-dependencies/pom.xml b/cf-dependencies/pom.xml index 6cc6dcb08..c06bfc27e 100644 --- a/cf-dependencies/pom.xml +++ b/cf-dependencies/pom.xml @@ -638,11 +638,6 @@ okhttp ${okhttp3.version} - - com.cf.imes - cf-spring-boot-starter-file - ${revision} - io.minio minio diff --git a/cf-framework/cf-spring-boot-starter-file/pom.xml b/cf-framework/cf-spring-boot-starter-file/pom.xml deleted file mode 100644 index 5b73b002b..000000000 --- a/cf-framework/cf-spring-boot-starter-file/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - cf-framework - com.cf.imes - ${revision} - - 4.0.0 - cf-spring-boot-starter-file - - ${project.artifactId} - 文件客户端，支持多种存储器 - 1. file：本地磁盘 - 2. ftp：FTP 服务器 - 2. sftp：SFTP 服务器 - 4. db：数据库 - 5. s3：支持 S3 协议的云存储服务，例如说 MinIO、阿里云、华为云、腾讯云、七牛云等等 - - - - - com.cf.imes - cf-common - - - - - org.springframework.boot - spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - org.slf4j - slf4j-api - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - - commons-net - commons-net - - - com.jcraft - jsch - - - - org.apache.tika - tika-core - - - - - io.minio - minio - - - - - com.cf.imes - cf-spring-boot-starter-test - test - - - - diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/config/ChenfengFileAutoConfiguration.java b/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/config/ChenfengFileAutoConfiguration.java deleted file mode 100644 index f582a223c..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/config/ChenfengFileAutoConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cf.imes.framework.file.config; - -import com.cf.imes.framework.file.core.client.FileClientFactory; -import com.cf.imes.framework.file.core.client.FileClientFactoryImpl; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; - -/** - * 文件配置类 - * - * @author 晨丰科技 - */ -@AutoConfiguration -public class ChenfengFileAutoConfiguration { - - @Bean - public FileClientFactory fileClientFactory() { - return new FileClientFactoryImpl(); - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/enums/FileStorageEnum.java b/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/enums/FileStorageEnum.java deleted file mode 100644 index e0fa9f409..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/enums/FileStorageEnum.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cf.imes.framework.file.core.enums; - -import cn.hutool.core.util.ArrayUtil; -import com.cf.imes.framework.file.core.client.FileClient; -import com.cf.imes.framework.file.core.client.FileClientConfig; -import com.cf.imes.framework.file.core.client.db.DBFileClient; -import com.cf.imes.framework.file.core.client.db.DBFileClientConfig; -import com.cf.imes.framework.file.core.client.ftp.FtpFileClient; -import com.cf.imes.framework.file.core.client.ftp.FtpFileClientConfig; -import com.cf.imes.framework.file.core.client.local.LocalFileClient; -import com.cf.imes.framework.file.core.client.local.LocalFileClientConfig; -import com.cf.imes.framework.file.core.client.s3.S3FileClient; -import com.cf.imes.framework.file.core.client.s3.S3FileClientConfig; -import com.cf.imes.framework.file.core.client.sftp.SftpFileClient; -import com.cf.imes.framework.file.core.client.sftp.SftpFileClientConfig; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 文件存储器枚举 - * - * @author 晨丰科技 - */ -@AllArgsConstructor -@Getter -public enum FileStorageEnum { - - DB(1, DBFileClientConfig.class, DBFileClient.class), - - LOCAL(10, LocalFileClientConfig.class, LocalFileClient.class), - FTP(11, FtpFileClientConfig.class, FtpFileClient.class), - SFTP(12, SftpFileClientConfig.class, SftpFileClient.class), - - S3(20, S3FileClientConfig.class, S3FileClient.class), - ; - - /** - * 存储器 - */ - private final Integer storage; - - /** - * 配置类 - */ - private final Class configClass; - /** - * 客户端类 - */ - private final Class clientClass; - - public static FileStorageEnum getByStorage(Integer storage) { - return ArrayUtil.firstMatch(o -> o.getStorage().equals(storage), values()); - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cf-framework/cf-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e34179de1..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.cf.imes.framework.file.config.ChenfengFileAutoConfiguration diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/config/package-info.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/config/package-info.java deleted file mode 100644 index 946b43414..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/config/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位，避免 package 无法提交到 Git 仓库 - */ -package com.cf.imes.framework.file.config; diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientTest.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientTest.java deleted file mode 100644 index 08b93859e..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cf.imes.framework.file.core.client.ftp; - -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.extra.ftp.FtpMode; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -public class FtpFileClientTest { - - @Test - @Disabled - public void test() { - // 创建客户端 - FtpFileClientConfig config = new FtpFileClientConfig(); - config.setDomain("http://127.0.0.1:48080"); - config.setBasePath("/home/ftp"); - config.setHost("kanchai.club"); - config.setPort(221); - config.setUsername(""); - config.setPassword(""); - config.setMode(FtpMode.Passive.name()); - FtpFileClient client = new FtpFileClient(0L, config); - assertNotNull(client); - client.init(); - // 上传文件 - String path = IdUtil.fastSimpleUUID() + ".jpg"; - byte[] content = ResourceUtil.readBytes("file/erweima.jpg"); - String fullPath = client.upload(content, path, "image/jpeg"); - assertNotNull(fullPath); - System.out.println("访问地址：" + fullPath); - if (false) { - byte[] bytes = client.getContent(path); - System.out.println("文件内容：" + bytes); - } - if (false) { - client.delete(path); - } - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/local/LocalFileClientTest.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/local/LocalFileClientTest.java deleted file mode 100644 index a36ba2e16..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/local/LocalFileClientTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cf.imes.framework.file.core.client.local; - -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -public class LocalFileClientTest { - - @Test - @Disabled - public void test() { - // 创建客户端 - LocalFileClientConfig config = new LocalFileClientConfig(); - config.setDomain("http://127.0.0.1:48080"); - config.setBasePath("/Users/yunai/file_test"); - LocalFileClient client = new LocalFileClient(0L, config); - assertNotNull(client); - client.init(); - // 上传文件 - String path = IdUtil.fastSimpleUUID() + ".jpg"; - byte[] content = ResourceUtil.readBytes("file/erweima.jpg"); - String fullPath = client.upload(content, path, "image/jpeg"); - assertNotNull(fullPath); - System.out.println("访问地址：" + fullPath); - client.delete(path); - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/s3/S3FileClientTest.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/s3/S3FileClientTest.java deleted file mode 100644 index c6b5f1a56..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/s3/S3FileClientTest.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.cf.imes.framework.file.core.client.s3; - -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -import com.cf.imes.framework.common.util.validation.ValidationUtils; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import javax.validation.Validation; - -public class S3FileClientTest { - - @Test - @Disabled // MinIO，如果要集成测试，可以注释本行 - public void testMinIO() throws Exception { - S3FileClientConfig config = new S3FileClientConfig(); - // 配置成你自己的 - config.setAccessKey("admin"); - config.setAccessSecret("password"); - config.setBucket("chenfengyuanma"); - config.setDomain(null); - // 默认 9000 endpoint - config.setEndpoint("http://127.0.0.1:9000"); - - // 执行上传 - testExecuteUpload(config); - } - - @Test - @Disabled // 阿里云 OSS，如果要集成测试，可以注释本行 - public void testAliyun() throws Exception { - S3FileClientConfig config = new S3FileClientConfig(); - // 配置成你自己的 - config.setAccessKey(System.getenv("ALIYUN_ACCESS_KEY")); - config.setAccessSecret(System.getenv("ALIYUN_SECRET_KEY")); - config.setBucket("yunai-aoteman"); - config.setDomain(null); // 如果有自定义域名，则可以设置。http://ali-oss.iocoder.cn - // 默认北京的 endpoint - config.setEndpoint("oss-cn-beijing.aliyuncs.com"); - - // 执行上传 - testExecuteUpload(config); - } - - @Test - @Disabled // 腾讯云 COS，如果要集成测试，可以注释本行 - public void testQCloud() throws Exception { - S3FileClientConfig config = new S3FileClientConfig(); - // 配置成你自己的 - config.setAccessKey(System.getenv("QCLOUD_ACCESS_KEY")); - config.setAccessSecret(System.getenv("QCLOUD_SECRET_KEY")); - config.setBucket("aoteman-1255880240"); - config.setDomain(null); // 如果有自定义域名，则可以设置。http://tengxun-oss.iocoder.cn - // 默认上海的 endpoint - config.setEndpoint("cos.ap-shanghai.myqcloud.com"); - - // 执行上传 - testExecuteUpload(config); - } - - @Test - @Disabled // 七牛云存储，如果要集成测试，可以注释本行 - public void testQiniu() throws Exception { - S3FileClientConfig config = new S3FileClientConfig(); - // 配置成你自己的 -// config.setAccessKey(System.getenv("QINIU_ACCESS_KEY")); -// config.setAccessSecret(System.getenv("QINIU_SECRET_KEY")); - config.setAccessKey("b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8"); - config.setAccessSecret("kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"); - config.setBucket("ruoyi-vue-pro"); - config.setDomain("http://test.chenfeng.iocoder.cn"); // 如果有自定义域名，则可以设置。http://static.chenfeng.iocoder.cn - // 默认上海的 endpoint - config.setEndpoint("s3-cn-south-1.qiniucs.com"); - - // 执行上传 - testExecuteUpload(config); - } - - @Test - @Disabled // 华为云存储，如果要集成测试，可以注释本行 - public void testHuaweiCloud() throws Exception { - S3FileClientConfig config = new S3FileClientConfig(); - // 配置成你自己的 -// config.setAccessKey(System.getenv("HUAWEI_CLOUD_ACCESS_KEY")); -// config.setAccessSecret(System.getenv("HUAWEI_CLOUD_SECRET_KEY")); - config.setBucket("chenfeng"); - config.setDomain(null); // 如果有自定义域名，则可以设置。 - // 默认上海的 endpoint - config.setEndpoint("obs.cn-east-3.myhuaweicloud.com"); - - // 执行上传 - testExecuteUpload(config); - } - - private void testExecuteUpload(S3FileClientConfig config) throws Exception { - // 校验配置 - ValidationUtils.validate(Validation.buildDefaultValidatorFactory().getValidator(), config); - // 创建 Client - S3FileClient client = new S3FileClient(0L, config); - client.init(); - // 上传文件 - String path = IdUtil.fastSimpleUUID() + ".jpg"; - byte[] content = ResourceUtil.readBytes("file/erweima.jpg"); - String fullPath = client.upload(content, path, "image/jpeg"); - System.out.println("访问地址：" + fullPath); - // 读取文件 - if (true) { - byte[] bytes = client.getContent(path); - System.out.println("文件内容：" + bytes.length); - } - // 删除文件 - if (false) { - client.delete(path); - } - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientTest.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientTest.java deleted file mode 100644 index 05656998c..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cf.imes.framework.file.core.client.sftp; - -import cn.hutool.core.io.resource.ResourceUtil; -import cn.hutool.core.util.IdUtil; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -public class SftpFileClientTest { - - @Test - @Disabled - public void test() { - // 创建客户端 - SftpFileClientConfig config = new SftpFileClientConfig(); - config.setDomain("http://127.0.0.1:48080"); - config.setBasePath("/home/ftp"); - config.setHost("kanchai.club"); - config.setPort(222); - config.setUsername(""); - config.setPassword(""); - SftpFileClient client = new SftpFileClient(0L, config); - assertNotNull(client); - client.init(); - // 上传文件 - String path = IdUtil.fastSimpleUUID() + ".jpg"; - byte[] content = ResourceUtil.readBytes("file/erweima.jpg"); - String fullPath = client.upload(content, path, "image/jpeg"); - assertNotNull(fullPath); - System.out.println("访问地址：" + fullPath); - if (false) { - byte[] bytes = client.getContent(path); - System.out.println("文件内容：" + bytes); - } - if (false) { - client.delete(path); - } - } - -} diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/enums/package-info.java b/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/enums/package-info.java deleted file mode 100644 index 338bea540..000000000 --- a/cf-framework/cf-spring-boot-starter-file/src/test/java/com/cf/imes/framework/file/core/enums/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位，避免 package 无法提交到 Git 仓库 - */ -package com.cf.imes.framework.file.core.enums; diff --git a/cf-framework/cf-spring-boot-starter-file/src/test/resources/file/erweima.jpg b/cf-framework/cf-spring-boot-starter-file/src/test/resources/file/erweima.jpg deleted file mode 100644 index 1447283cd..000000000 Binary files a/cf-framework/cf-spring-boot-starter-file/src/test/resources/file/erweima.jpg and /dev/null differ diff --git a/cf-framework/pom.xml b/cf-framework/pom.xml index 2c1732450..acd93f727 100644 --- a/cf-framework/pom.xml +++ b/cf-framework/pom.xml @@ -17,7 +17,6 @@ cf-spring-boot-starter-web cf-spring-boot-starter-security - cf-spring-boot-starter-file cf-spring-boot-starter-monitor cf-spring-boot-starter-protection diff --git a/cf-module-infra/cf-module-infra-biz/pom.xml b/cf-module-infra/cf-module-infra-biz/pom.xml index d06002ca8..e3137af05 100644 --- a/cf-module-infra/cf-module-infra-biz/pom.xml +++ b/cf-module-infra/cf-module-infra-biz/pom.xml @@ -139,8 +139,21 @@ - com.cf.imes - cf-spring-boot-starter-file + commons-net + commons-net + + + com.jcraft + jsch + + + io.minio + minio + + + + org.apache.tika + tika-core @@ -180,10 +193,6 @@ com.cf.imes cf-spring-boot-starter-excel - - com.cf.imes - cf-spring-boot-starter-file - com.cf.imes cf-spring-boot-starter-monitor diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java index 1f9318866..cd9e08bc9 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.infra.controller.admin.file.vo.config; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileConfigDO.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileConfigDO.java index e393e872c..7a32177d8 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileConfigDO.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileConfigDO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.infra.dal.dataobject.file; -import com.cf.imes.framework.file.core.client.FileClientConfig; -import com.cf.imes.framework.file.core.enums.FileStorageEnum; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.enums.FileStorageEnum; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileContentDO.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileContentDO.java index 937e92ad3..5a3628251 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileContentDO.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/dataobject/file/FileContentDO.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.file.core.client.db.DBFileClient; +import com.cf.imes.module.infra.framework.file.core.client.db.DBFileClient; import lombok.*; /** diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/mysql/file/FileContentDAOImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/mysql/file/FileContentDAOImpl.java index 6774bbfe8..8f222c4b8 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/mysql/file/FileContentDAOImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/dal/mysql/file/FileContentDAOImpl.java @@ -1,7 +1,7 @@ package com.cf.imes.module.infra.dal.mysql.file; import cn.hutool.core.collection.CollUtil; -import com.cf.imes.framework.file.core.client.db.DBFileContentFrameworkDAO; +import com.cf.imes.module.infra.framework.file.core.client.db.DBFileContentFrameworkDAO; import com.cf.imes.module.infra.dal.dataobject.file.FileContentDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Repository; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/config/ChenfengFileAutoConfiguration.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/config/ChenfengFileAutoConfiguration.java new file mode 100644 index 000000000..e799da5a2 --- /dev/null +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/config/ChenfengFileAutoConfiguration.java @@ -0,0 +1,21 @@ +package com.cf.imes.module.infra.framework.file.config; + +import com.cf.imes.module.infra.framework.file.core.client.FileClientFactory; +import com.cf.imes.module.infra.framework.file.core.client.FileClientFactoryImpl; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 文件配置类 + * + * @author 晨丰科技 + */ +@Configuration(proxyBeanMethods = false) +public class ChenfengFileAutoConfiguration { + + @Bean + public FileClientFactory fileClientFactory() { + return new FileClientFactoryImpl(); + } + +} diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/AbstractFileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/AbstractFileClient.java similarity index 96% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/AbstractFileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/AbstractFileClient.java index 69ff4ce6f..050655093 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/AbstractFileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/AbstractFileClient.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.client; +package com.cf.imes.module.infra.framework.file.core.client; import cn.hutool.core.text.CharSequenceUtil; import lombok.extern.slf4j.Slf4j; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClient.java similarity index 93% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClient.java index 109a97eed..33bc2a498 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClient.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.client; +package com.cf.imes.module.infra.framework.file.core.client; /** * 文件客户端 diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientConfig.java similarity index 89% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientConfig.java index 6640b7639..6d580e4ae 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientConfig.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.client; +package com.cf.imes.module.infra.framework.file.core.client; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactory.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactory.java similarity index 78% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactory.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactory.java index fae6f87c2..dd94bc487 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactory.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactory.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.file.core.client; +package com.cf.imes.module.infra.framework.file.core.client; -import com.cf.imes.framework.file.core.enums.FileStorageEnum; +import com.cf.imes.module.infra.framework.file.core.enums.FileStorageEnum; public interface FileClientFactory { diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactoryImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactoryImpl.java similarity index 93% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactoryImpl.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactoryImpl.java index 8cf5ffbab..b0239060a 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/FileClientFactoryImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/FileClientFactoryImpl.java @@ -1,8 +1,8 @@ -package com.cf.imes.framework.file.core.client; +package com.cf.imes.module.infra.framework.file.core.client; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ReflectUtil; -import com.cf.imes.framework.file.core.enums.FileStorageEnum; +import com.cf.imes.module.infra.framework.file.core.enums.FileStorageEnum; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.ConcurrentHashMap; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClient.java similarity index 88% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClient.java index 09de278b8..ff67abc8e 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClient.java @@ -1,7 +1,7 @@ -package com.cf.imes.framework.file.core.client.db; +package com.cf.imes.module.infra.framework.file.core.client.db; import cn.hutool.extra.spring.SpringUtil; -import com.cf.imes.framework.file.core.client.AbstractFileClient; +import com.cf.imes.module.infra.framework.file.core.client.AbstractFileClient; /** * 基于 DB 存储的文件客户端的配置类 diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClientConfig.java similarity index 75% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClientConfig.java index 4757a2c09..abfd4b802 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileClientConfig.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.file.core.client.db; +package com.cf.imes.module.infra.framework.file.core.client.db; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileContentFrameworkDAO.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileContentFrameworkDAO.java similarity index 91% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileContentFrameworkDAO.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileContentFrameworkDAO.java index 3eafeeaf3..eef7eb45b 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/db/DBFileContentFrameworkDAO.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/db/DBFileContentFrameworkDAO.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.client.db; +package com.cf.imes.module.infra.framework.file.core.client.db; /** * 文件内容 Framework DAO 接口 diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClient.java similarity index 94% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClient.java index 0426f9e36..7a92e7399 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClient.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.client.ftp; +package com.cf.imes.module.infra.framework.file.core.client.ftp; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -7,7 +7,7 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.extra.ftp.Ftp; import cn.hutool.extra.ftp.FtpException; import cn.hutool.extra.ftp.FtpMode; -import com.cf.imes.framework.file.core.client.AbstractFileClient; +import com.cf.imes.module.infra.framework.file.core.client.AbstractFileClient; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java similarity index 89% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java index a36706a52..d88037b4a 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/ftp/FtpFileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.file.core.client.ftp; +package com.cf.imes.module.infra.framework.file.core.client.ftp; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClient.java similarity index 89% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClient.java index 9cd4d9aa9..dba8a06b7 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClient.java @@ -1,7 +1,7 @@ -package com.cf.imes.framework.file.core.client.local; +package com.cf.imes.module.infra.framework.file.core.client.local; import cn.hutool.core.io.FileUtil; -import com.cf.imes.framework.file.core.client.AbstractFileClient; +import com.cf.imes.module.infra.framework.file.core.client.AbstractFileClient; import java.io.File; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClientConfig.java similarity index 79% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClientConfig.java index 13d8d7663..9aae99e05 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/local/LocalFileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/local/LocalFileClientConfig.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.file.core.client.local; +package com.cf.imes.module.infra.framework.file.core.client.local; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClient.java similarity index 88% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClient.java index 986ca1f0b..45a5bd666 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClient.java @@ -1,15 +1,19 @@ -package com.cf.imes.framework.file.core.client.s3; +package com.cf.imes.module.infra.framework.file.core.client.s3; import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.http.HttpUtil; -import com.cf.imes.framework.file.core.client.AbstractFileClient; -import io.minio.*; +import com.cf.imes.module.infra.framework.file.core.client.AbstractFileClient; +import io.minio.GetObjectArgs; +import io.minio.GetObjectResponse; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import io.minio.RemoveObjectArgs; import java.io.ByteArrayInputStream; -import static com.cf.imes.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_ALIYUN; -import static com.cf.imes.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_TENCENT; +import static com.cf.imes.module.infra.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_ALIYUN; +import static com.cf.imes.module.infra.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_TENCENT; /** * 基于 S3 协议的文件客户端，实现 MinIO、阿里云、腾讯云、七牛云、华为云等云服务 diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClientConfig.java similarity index 94% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClientConfig.java index c3f18a544..6af58a7f5 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/s3/S3FileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/s3/S3FileClientConfig.java @@ -1,7 +1,7 @@ -package com.cf.imes.framework.file.core.client.s3; +package com.cf.imes.module.infra.framework.file.core.client.s3; import cn.hutool.core.text.CharSequenceUtil; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClient.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClient.java similarity index 91% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClient.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClient.java index 9b77dacd2..27eb059fb 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClient.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClient.java @@ -1,9 +1,9 @@ -package com.cf.imes.framework.file.core.client.sftp; +package com.cf.imes.module.infra.framework.file.core.client.sftp; import cn.hutool.core.io.FileUtil; import cn.hutool.extra.ssh.Sftp; import com.cf.imes.framework.common.util.io.FileUtils; -import com.cf.imes.framework.file.core.client.AbstractFileClient; +import com.cf.imes.module.infra.framework.file.core.client.AbstractFileClient; import java.io.File; diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientConfig.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java similarity index 87% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientConfig.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java index 653bd3aed..b719f9960 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/client/sftp/SftpFileClientConfig.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java @@ -1,6 +1,6 @@ -package com.cf.imes.framework.file.core.client.sftp; +package com.cf.imes.module.infra.framework.file.core.client.sftp; -import com.cf.imes.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/enums/FileStorageEnum.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/enums/FileStorageEnum.java new file mode 100644 index 000000000..eba6e14ac --- /dev/null +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/enums/FileStorageEnum.java @@ -0,0 +1,55 @@ +package com.cf.imes.module.infra.framework.file.core.enums; + +import cn.hutool.core.util.ArrayUtil; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.db.DBFileClient; +import com.cf.imes.module.infra.framework.file.core.client.db.DBFileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.ftp.FtpFileClient; +import com.cf.imes.module.infra.framework.file.core.client.ftp.FtpFileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.local.LocalFileClient; +import com.cf.imes.module.infra.framework.file.core.client.local.LocalFileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.s3.S3FileClient; +import com.cf.imes.module.infra.framework.file.core.client.s3.S3FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.sftp.SftpFileClient; +import com.cf.imes.module.infra.framework.file.core.client.sftp.SftpFileClientConfig; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 文件存储器枚举 + * + * @author 晨丰科技 + */ +@AllArgsConstructor +@Getter +public enum FileStorageEnum { + + DB(1, DBFileClientConfig.class, DBFileClient.class), + + LOCAL(10, LocalFileClientConfig.class, LocalFileClient.class), + FTP(11, FtpFileClientConfig.class, FtpFileClient.class), + SFTP(12, SftpFileClientConfig.class, SftpFileClient.class), + + S3(20, S3FileClientConfig.class, S3FileClient.class), + ; + + /** + * 存储器 + */ + private final Integer storage; + + /** + * 配置类 + */ + private final Class configClass; + /** + * 客户端类 + */ + private final Class clientClass; + + public static FileStorageEnum getByStorage(Integer storage) { + return ArrayUtil.firstMatch(o -> o.getStorage().equals(storage), values()); + } + +} diff --git a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/utils/FileTypeUtils.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/utils/FileTypeUtils.java similarity index 95% rename from cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/utils/FileTypeUtils.java rename to cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/utils/FileTypeUtils.java index 8a0bc6bbd..a4d295be4 100644 --- a/cf-framework/cf-spring-boot-starter-file/src/main/java/com/cf/imes/framework/file/core/utils/FileTypeUtils.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/file/core/utils/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.cf.imes.framework.file.core.utils; +package com.cf.imes.module.infra.framework.file.core.utils; import com.alibaba.ttl.TransmittableThreadLocal; import lombok.SneakyThrows; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigService.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigService.java index 14f8f0970..5b59dca82 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigService.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigService.java @@ -1,7 +1,7 @@ package com.cf.imes.module.infra.service.file; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO; import com.cf.imes.module.infra.dal.dataobject.file.FileConfigDO; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigServiceImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigServiceImpl.java index 7e6ee5dd1..6ce3809b4 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigServiceImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileConfigServiceImpl.java @@ -5,10 +5,10 @@ import cn.hutool.core.util.IdUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.common.util.validation.ValidationUtils; -import com.cf.imes.framework.file.core.client.FileClient; -import com.cf.imes.framework.file.core.client.FileClientConfig; -import com.cf.imes.framework.file.core.client.FileClientFactory; -import com.cf.imes.framework.file.core.enums.FileStorageEnum; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientFactory; +import com.cf.imes.module.infra.framework.file.core.enums.FileStorageEnum; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO; import com.cf.imes.module.infra.convert.file.FileConfigConvert; diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileServiceImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileServiceImpl.java index e9b9e46ba..a381729c2 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileServiceImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/file/FileServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharSequenceUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.io.FileUtils; -import com.cf.imes.framework.file.core.client.FileClient; -import com.cf.imes.framework.file.core.utils.FileTypeUtils; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.utils.FileTypeUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.infra.controller.admin.file.vo.file.FilePageReqVO; import com.cf.imes.module.infra.dal.dataobject.file.FileDO; diff --git a/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileConfigServiceImplTest.java b/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileConfigServiceImplTest.java index 92696c2e6..fc0f89b26 100644 --- a/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileConfigServiceImplTest.java +++ b/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileConfigServiceImplTest.java @@ -4,12 +4,12 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.map.MapUtil; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.file.core.client.FileClient; -import com.cf.imes.framework.file.core.client.FileClientConfig; -import com.cf.imes.framework.file.core.client.FileClientFactory; -import com.cf.imes.framework.file.core.client.local.LocalFileClient; -import com.cf.imes.framework.file.core.client.local.LocalFileClientConfig; -import com.cf.imes.framework.file.core.enums.FileStorageEnum; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.client.FileClientConfig; +import com.cf.imes.module.infra.framework.file.core.client.FileClientFactory; +import com.cf.imes.module.infra.framework.file.core.client.local.LocalFileClient; +import com.cf.imes.module.infra.framework.file.core.client.local.LocalFileClientConfig; +import com.cf.imes.module.infra.framework.file.core.enums.FileStorageEnum; import com.cf.imes.framework.test.core.ut.BaseDbUnitTest; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; import com.cf.imes.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO; diff --git a/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileServiceImplTest.java b/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileServiceImplTest.java index 0dc2eb652..cc1bc5165 100644 --- a/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileServiceImplTest.java +++ b/cf-module-infra/cf-module-infra-biz/src/test/java/com/cf/imes/module/infra/service/file/FileServiceImplTest.java @@ -3,7 +3,7 @@ package com.cf.imes.module.infra.service.file; import cn.hutool.core.io.resource.ResourceUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.ObjectUtils; -import com.cf.imes.framework.file.core.client.FileClient; +import com.cf.imes.module.infra.framework.file.core.client.FileClient; import com.cf.imes.framework.test.core.ut.BaseDbUnitTest; import com.cf.imes.framework.test.core.util.AssertUtils; import com.cf.imes.module.infra.controller.admin.file.vo.file.FilePageReqVO; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml index e82460e6c..67d114b9d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml @@ -117,10 +117,6 @@ - - com.cf.imes - cf-spring-boot-starter-file - io.vavr vavr @@ -240,10 +236,6 @@ com.cf.imes cf-spring-boot-starter-excel - - com.cf.imes - cf-spring-boot-starter-file - com.cf.imes cf-spring-boot-starter-monitor