diff --git a/README.md b/README.md index d59a532..0beb4a0 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,14 @@ ![模块划分](doc/image/模块划分.png) -* minio-plus-core:核心业务逻辑包 -* minio-plus-extension:扩展包,该包封装了Controller相关接口,帮助项目使用时开箱即用 -* minio-plus-common:工具类包,一些常用的工具类 -* minio-plus-model:实体类包 -* minio-plus-config:配置类包 +* minio-plus-api:MinIO Plus 对外提供的能力接口定义,可以理解为 Service 层接口定义 +* minio-plus-core:核心业务逻辑包,可以理解为 minio-plus-api 包的接口实现 +* minio-plus-extension:扩展包,该包封装了Controller相关接口,可以理解为 minio-plus-api 包的接口的 Controller 层封装,帮助项目使用时开箱即用 +* minio-plus-common:工具类、配置类包 * minio-plus-spring-boot-starter - * minio-plus-all-spring-boot-starter:包含core、extension、common、model - * minio-plus-core-spring-boot-starter:包含core、common、model - * minio-plus-model-spring-boot-starter:只有model自身 + * minio-plus-all-spring-boot-starter:包含core、extension、common、api + * minio-plus-core-spring-boot-starter:包含core、common、api + * minio-plus-api-spring-boot-starter:只有api定义 * minio-plus-application * minio-plus-application-mysql:基于all-starter,元数据使用MySQL数据库的示例工程 diff --git a/minio-plus-common/pom.xml b/minio-plus-common/pom.xml index 2d64f1c..823854c 100644 --- a/minio-plus-common/pom.xml +++ b/minio-plus-common/pom.xml @@ -16,6 +16,20 @@ cn.hutool hutool-all + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-configuration-processor + true + \ No newline at end of file diff --git a/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java b/minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusConfig.java similarity index 86% rename from minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java rename to minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusConfig.java index 0d9fc40..a587089 100644 --- a/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java +++ b/minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusConfig.java @@ -1,4 +1,4 @@ -package org.liuxp.minioplus.config; +package org.liuxp.minioplus.common.config; import org.springframework.context.annotation.Bean; diff --git a/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java b/minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusProperties.java similarity index 97% rename from minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java rename to minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusProperties.java index 8fd738b..f1cae63 100644 --- a/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java +++ b/minio-plus-common/src/main/java/org/liuxp/minioplus/common/config/MinioPlusProperties.java @@ -1,4 +1,4 @@ -package org.liuxp.minioplus.config; +package org.liuxp.minioplus.common.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/minio-plus-config/src/main/resources/META-INF/spring.factories b/minio-plus-common/src/main/resources/META-INF/spring.factories similarity index 57% rename from minio-plus-config/src/main/resources/META-INF/spring.factories rename to minio-plus-common/src/main/resources/META-INF/spring.factories index 20298b4..b5276bd 100644 --- a/minio-plus-config/src/main/resources/META-INF/spring.factories +++ b/minio-plus-common/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.liuxp.minioplus.config.MinioPlusConfig \ No newline at end of file +org.liuxp.minioplus.common.config.MinioPlusConfig \ No newline at end of file diff --git a/minio-plus-config/pom.xml b/minio-plus-config/pom.xml deleted file mode 100644 index 557492a..0000000 --- a/minio-plus-config/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - minio-plus-parent - org.liuxp - ${revision} - - 4.0.0 - - minio-plus-config - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.projectlombok - lombok - - - - \ No newline at end of file diff --git a/minio-plus-core/pom.xml b/minio-plus-core/pom.xml index aa81078..1d8fbe9 100644 --- a/minio-plus-core/pom.xml +++ b/minio-plus-core/pom.xml @@ -36,10 +36,6 @@ org.liuxp minio-plus-common - - org.liuxp - minio-plus-config - org.liuxp minio-plus-model diff --git a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/engine/impl/StorageEngineServiceImpl.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/engine/impl/StorageEngineServiceImpl.java index 5caf15a..72c600e 100644 --- a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/engine/impl/StorageEngineServiceImpl.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/engine/impl/StorageEngineServiceImpl.java @@ -5,16 +5,11 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Pair; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.IdUtil; -import io.minio.CreateMultipartUploadResponse; -import io.minio.ListPartsResponse; -import io.minio.ObjectWriteResponse; -import io.minio.messages.Part; import lombok.extern.slf4j.Slf4j; import org.liuxp.minioplus.common.enums.MinioPlusErrorCode; import org.liuxp.minioplus.common.enums.StorageBucketEnums; import org.liuxp.minioplus.common.exception.MinioPlusException; -import org.liuxp.minioplus.config.MinioPlusProperties; -import org.liuxp.minioplus.core.common.context.ListPartsResultCopy; +import org.liuxp.minioplus.common.config.MinioPlusProperties; import org.liuxp.minioplus.core.common.context.MultipartUploadCreateDTO; import org.liuxp.minioplus.core.common.utils.MinioPlusCommonUtil; import org.liuxp.minioplus.core.engine.StorageEngineService; diff --git a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/service/impl/StorageServiceImpl.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/service/impl/StorageServiceImpl.java index 4d94deb..c100292 100644 --- a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/service/impl/StorageServiceImpl.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/service/impl/StorageServiceImpl.java @@ -8,7 +8,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; -import org.liuxp.minioplus.config.MinioPlusProperties; +import org.liuxp.minioplus.common.config.MinioPlusProperties; import org.liuxp.minioplus.model.dto.FileMetadataInfoDTO; import org.liuxp.minioplus.model.dto.FileMetadataInfoSaveDTO; import org.liuxp.minioplus.model.dto.FileSaveDTO; diff --git a/minio-plus-extension/src/main/java/org/liuxp/minioplus/extension/controller/StorageController.java b/minio-plus-extension/src/main/java/org/liuxp/minioplus/extension/controller/StorageController.java index 0456e0a..101d3c0 100644 --- a/minio-plus-extension/src/main/java/org/liuxp/minioplus/extension/controller/StorageController.java +++ b/minio-plus-extension/src/main/java/org/liuxp/minioplus/extension/controller/StorageController.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.liuxp.minioplus.config.MinioPlusProperties; +import org.liuxp.minioplus.common.config.MinioPlusProperties; import org.liuxp.minioplus.extension.context.Response; import org.liuxp.minioplus.model.dto.FileCheckDTO; import org.liuxp.minioplus.model.dto.FileCompleteDTO; diff --git a/minio-s3-api/minio-s3-api-custom/pom.xml b/minio-s3-api/minio-s3-api-custom/pom.xml index 0b5361a..928965e 100644 --- a/minio-s3-api/minio-s3-api-custom/pom.xml +++ b/minio-s3-api/minio-s3-api-custom/pom.xml @@ -22,7 +22,7 @@ org.liuxp - minio-plus-config + minio-plus-common diff --git a/minio-s3-api/minio-s3-api-custom/src/main/java/org/liuxp/minioplus/s3/custom/MinioS3ClientImpl.java b/minio-s3-api/minio-s3-api-custom/src/main/java/org/liuxp/minioplus/s3/custom/MinioS3ClientImpl.java index 011856b..8f45f3d 100644 --- a/minio-s3-api/minio-s3-api-custom/src/main/java/org/liuxp/minioplus/s3/custom/MinioS3ClientImpl.java +++ b/minio-s3-api/minio-s3-api-custom/src/main/java/org/liuxp/minioplus/s3/custom/MinioS3ClientImpl.java @@ -1,7 +1,7 @@ package org.liuxp.minioplus.s3.custom; import lombok.extern.slf4j.Slf4j; -import org.liuxp.minioplus.config.MinioPlusProperties; +import org.liuxp.minioplus.common.config.MinioPlusProperties; import org.liuxp.minioplus.s3.def.ListParts; import org.liuxp.minioplus.s3.def.MinioS3Client; import org.springframework.stereotype.Repository; diff --git a/minio-s3-api/minio-s3-api-official/pom.xml b/minio-s3-api/minio-s3-api-official/pom.xml index 74ac3fb..d641cc5 100644 --- a/minio-s3-api/minio-s3-api-official/pom.xml +++ b/minio-s3-api/minio-s3-api-official/pom.xml @@ -32,10 +32,6 @@ org.liuxp minio-s3-api-definition - - org.liuxp - minio-plus-config - org.liuxp minio-plus-common diff --git a/minio-s3-api/minio-s3-api-official/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java b/minio-s3-api/minio-s3-api-official/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java index 0585a92..1fe4923 100644 --- a/minio-s3-api/minio-s3-api-official/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java +++ b/minio-s3-api/minio-s3-api-official/src/main/java/org/liuxp/minioplus/s3/official/MinioS3ClientImpl.java @@ -8,7 +8,7 @@ import io.minio.messages.Part; import lombok.extern.slf4j.Slf4j; import org.liuxp.minioplus.common.enums.MinioPlusErrorCode; import org.liuxp.minioplus.common.exception.MinioPlusException; -import org.liuxp.minioplus.config.MinioPlusProperties; +import org.liuxp.minioplus.common.config.MinioPlusProperties; import org.liuxp.minioplus.s3.def.ListParts; import org.liuxp.minioplus.s3.def.MinioS3Client; import org.springframework.stereotype.Repository; diff --git a/pom.xml b/pom.xml index 7811634..6da9866 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,6 @@ minio-plus-application minio-plus-common - minio-plus-config minio-plus-core minio-plus-extension minio-plus-model @@ -157,11 +156,6 @@ minio-plus-model ${revision} - - org.liuxp - minio-plus-config - ${revision} - org.liuxp minio-plus-all-spring-boot-starter