From 4e702d1305ef89c716200755f949a9b36969c3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B0=8F=E5=B9=B3?= Date: Sat, 25 May 2024 16:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8Cminio-plus-spring-boot-config=20->?= =?UTF-8?q?=20minio-plus-config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minio-plus-application-mysql/pom.xml | 2 +- minio-plus-common/pom.xml | 7 +------ .../pom.xml | 2 +- .../org/liuxp/minioplus/config/MinioPlusConfig.java | 0 .../liuxp/minioplus/config/MinioPlusProperties.java | 0 .../src/main/resources/META-INF/spring.factories | 0 minio-plus-core/pom.xml | 2 +- .../core/common/context}/ListPartsResultCopy.java | 2 +- .../core/common/context}/MultipartUploadCreateDTO.java | 2 +- .../core/engine/impl/StorageEngineServiceImpl.java | 4 ++-- .../minioplus/core/repository/MinioRepository.java | 2 +- .../core/repository/impl/MinioRepositoryImpl.java | 2 +- minio-plus-extension/pom.xml | 7 +------ minio-plus-model/pom.xml | 4 ++++ pom.xml | 10 +++++----- 15 files changed, 20 insertions(+), 26 deletions(-) rename {minio-plus-spring-boot-config => minio-plus-config}/pom.xml (93%) rename {minio-plus-spring-boot-config => minio-plus-config}/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java (100%) rename {minio-plus-spring-boot-config => minio-plus-config}/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java (100%) rename {minio-plus-spring-boot-config => minio-plus-config}/src/main/resources/META-INF/spring.factories (100%) rename {minio-plus-model/src/main/java/org/liuxp/minioplus/model/copy => minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context}/ListPartsResultCopy.java (84%) rename {minio-plus-model/src/main/java/org/liuxp/minioplus/model/dto/minio => minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context}/MultipartUploadCreateDTO.java (95%) diff --git a/minio-plus-application/minio-plus-application-mysql/pom.xml b/minio-plus-application/minio-plus-application-mysql/pom.xml index aeab07009..6d1c4ab6c 100644 --- a/minio-plus-application/minio-plus-application-mysql/pom.xml +++ b/minio-plus-application/minio-plus-application-mysql/pom.xml @@ -18,7 +18,7 @@ org.liuxp - minio-plus-spring-boot-config + minio-plus-config diff --git a/minio-plus-common/pom.xml b/minio-plus-common/pom.xml index 40c03cece..3ff20fd3d 100644 --- a/minio-plus-common/pom.xml +++ b/minio-plus-common/pom.xml @@ -5,15 +5,10 @@ minio-plus-parent org.liuxp - 1.0.0-SNAPSHOT + ${revision} 4.0.0 minio-plus-common - - 11 - 11 - - \ No newline at end of file diff --git a/minio-plus-spring-boot-config/pom.xml b/minio-plus-config/pom.xml similarity index 93% rename from minio-plus-spring-boot-config/pom.xml rename to minio-plus-config/pom.xml index c266ce8c5..557492a35 100644 --- a/minio-plus-spring-boot-config/pom.xml +++ b/minio-plus-config/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - minio-plus-spring-boot-config + minio-plus-config diff --git a/minio-plus-spring-boot-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java b/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java similarity index 100% rename from minio-plus-spring-boot-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java rename to minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusConfig.java diff --git a/minio-plus-spring-boot-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java b/minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java similarity index 100% rename from minio-plus-spring-boot-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java rename to minio-plus-config/src/main/java/org/liuxp/minioplus/config/MinioPlusProperties.java diff --git a/minio-plus-spring-boot-config/src/main/resources/META-INF/spring.factories b/minio-plus-config/src/main/resources/META-INF/spring.factories similarity index 100% rename from minio-plus-spring-boot-config/src/main/resources/META-INF/spring.factories rename to minio-plus-config/src/main/resources/META-INF/spring.factories diff --git a/minio-plus-core/pom.xml b/minio-plus-core/pom.xml index 5b463eefe..4b3a33905 100644 --- a/minio-plus-core/pom.xml +++ b/minio-plus-core/pom.xml @@ -34,7 +34,7 @@ org.liuxp - minio-plus-spring-boot-config + minio-plus-config org.liuxp diff --git a/minio-plus-model/src/main/java/org/liuxp/minioplus/model/copy/ListPartsResultCopy.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/ListPartsResultCopy.java similarity index 84% rename from minio-plus-model/src/main/java/org/liuxp/minioplus/model/copy/ListPartsResultCopy.java rename to minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/ListPartsResultCopy.java index 4df05dedf..392d0835f 100644 --- a/minio-plus-model/src/main/java/org/liuxp/minioplus/model/copy/ListPartsResultCopy.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/ListPartsResultCopy.java @@ -1,4 +1,4 @@ -package org.liuxp.minioplus.model.copy; +package org.liuxp.minioplus.core.common.context; import io.minio.messages.ListPartsResult; import io.minio.messages.Part; diff --git a/minio-plus-model/src/main/java/org/liuxp/minioplus/model/dto/minio/MultipartUploadCreateDTO.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/MultipartUploadCreateDTO.java similarity index 95% rename from minio-plus-model/src/main/java/org/liuxp/minioplus/model/dto/minio/MultipartUploadCreateDTO.java rename to minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/MultipartUploadCreateDTO.java index e7786cabe..8ba57ba63 100644 --- a/minio-plus-model/src/main/java/org/liuxp/minioplus/model/dto/minio/MultipartUploadCreateDTO.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/context/MultipartUploadCreateDTO.java @@ -1,4 +1,4 @@ -package org.liuxp.minioplus.model.dto.minio; +package org.liuxp.minioplus.core.common.context; import com.google.common.collect.Multimap; import io.minio.messages.Part; 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 2470b0279..bf200c82e 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 @@ -13,12 +13,12 @@ import lombok.extern.slf4j.Slf4j; import org.liuxp.minioplus.config.MinioPlusProperties; import org.liuxp.minioplus.model.bo.CreateUploadUrlReqBO; import org.liuxp.minioplus.model.bo.CreateUploadUrlRespBO; -import org.liuxp.minioplus.model.copy.ListPartsResultCopy; +import org.liuxp.minioplus.core.common.context.ListPartsResultCopy; import org.liuxp.minioplus.model.dto.FileCheckDTO; import org.liuxp.minioplus.model.dto.FileMetadataInfoDTO; import org.liuxp.minioplus.model.dto.FileMetadataInfoSaveDTO; import org.liuxp.minioplus.model.dto.FileMetadataInfoUpdateDTO; -import org.liuxp.minioplus.model.dto.minio.MultipartUploadCreateDTO; +import org.liuxp.minioplus.core.common.context.MultipartUploadCreateDTO; import org.liuxp.minioplus.model.enums.ResponseCodeEnum; import org.liuxp.minioplus.model.enums.StorageBucketEnums; import org.liuxp.minioplus.core.common.exception.MinioPlusBusinessException; diff --git a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/MinioRepository.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/MinioRepository.java index 445be9e55..720c01ec5 100644 --- a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/MinioRepository.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/MinioRepository.java @@ -3,7 +3,7 @@ package org.liuxp.minioplus.core.repository; import io.minio.CreateMultipartUploadResponse; import io.minio.ListPartsResponse; import io.minio.ObjectWriteResponse; -import org.liuxp.minioplus.model.dto.minio.MultipartUploadCreateDTO; +import org.liuxp.minioplus.core.common.context.MultipartUploadCreateDTO; import org.liuxp.minioplus.core.repository.impl.CustomMinioClient; import java.io.InputStream; diff --git a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/impl/MinioRepositoryImpl.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/impl/MinioRepositoryImpl.java index 9d1962c66..ff31e102c 100644 --- a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/impl/MinioRepositoryImpl.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/repository/impl/MinioRepositoryImpl.java @@ -6,7 +6,7 @@ import io.minio.http.Method; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.liuxp.minioplus.config.MinioPlusProperties; -import org.liuxp.minioplus.model.dto.minio.MultipartUploadCreateDTO; +import org.liuxp.minioplus.core.common.context.MultipartUploadCreateDTO; import org.liuxp.minioplus.model.enums.ResponseCodeEnum; import org.liuxp.minioplus.core.common.exception.MinioPlusBusinessException; import org.liuxp.minioplus.core.repository.MinioRepository; diff --git a/minio-plus-extension/pom.xml b/minio-plus-extension/pom.xml index 6bdac2e9c..aa35e4c4e 100644 --- a/minio-plus-extension/pom.xml +++ b/minio-plus-extension/pom.xml @@ -5,15 +5,10 @@ minio-plus-parent org.liuxp - 1.0.0-SNAPSHOT + ${revision} 4.0.0 minio-plus-extension - - 11 - 11 - - \ No newline at end of file diff --git a/minio-plus-model/pom.xml b/minio-plus-model/pom.xml index f275e46b2..325d9be58 100644 --- a/minio-plus-model/pom.xml +++ b/minio-plus-model/pom.xml @@ -26,6 +26,10 @@ io.swagger swagger-annotations + + org.projectlombok + lombok + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e8cc0d1d8..902d6ce7b 100644 --- a/pom.xml +++ b/pom.xml @@ -35,13 +35,13 @@ - minio-plus-core - minio-plus-spring-boot-config - minio-plus-spring-boot-starter minio-plus-application - minio-plus-model minio-plus-common + minio-plus-config + minio-plus-core minio-plus-extension + minio-plus-model + minio-plus-spring-boot-starter @@ -158,7 +158,7 @@ org.liuxp - minio-plus-spring-boot-config + minio-plus-config ${revision}