config 模块合并进 common 模块。

README.md

@@ -25,15 +25,14 @@
 
 ![模块划分](doc/image/模块划分.png)
 
-* minio-plus-core：核心业务逻辑包
+* minio-plus-api：MinIO Plus 对外提供的能力接口定义，可以理解为 Service 层接口定义
-* minio-plus-extension：扩展包，该包封装了Controller相关接口，帮助项目使用时开箱即用
+* minio-plus-core：核心业务逻辑包，可以理解为 minio-plus-api 包的接口实现
-* minio-plus-common：工具类包，一些常用的工具类
+* minio-plus-extension：扩展包，该包封装了Controller相关接口，可以理解为 minio-plus-api 包的接口的 Controller 层封装，帮助项目使用时开箱即用
-* minio-plus-model：实体类包
+* minio-plus-common：工具类、配置类包
-* minio-plus-config：配置类包
 * minio-plus-spring-boot-starter
-  * minio-plus-all-spring-boot-starter：包含core、extension、common、model
+  * minio-plus-all-spring-boot-starter：包含core、extension、common、api
-  * minio-plus-core-spring-boot-starter：包含core、common、model
+  * minio-plus-core-spring-boot-starter：包含core、common、api
-  * minio-plus-model-spring-boot-starter：只有model自身
+  * minio-plus-api-spring-boot-starter：只有api定义
 * minio-plus-application
   * minio-plus-application-mysql：基于all-starter，元数据使用MySQL数据库的示例工程
   

minio-plus-common/pom.xml

@@ -16,6 +16,20 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <!-- 自定义的配置类生成元数据信息 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>

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;
 

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;

minio-plus-common/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.liuxp.minioplus.config.MinioPlusConfig
+org.liuxp.minioplus.common.config.MinioPlusConfig

minio-plus-config/pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>minio-plus-parent</artifactId>
-        <groupId>org.liuxp</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>minio-plus-config</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <!-- 自定义的配置类生成元数据信息 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

minio-plus-core/pom.xml

@@ -36,10 +36,6 @@
             <groupId>org.liuxp</groupId>
             <artifactId>minio-plus-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.liuxp</groupId>
-            <artifactId>minio-plus-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.liuxp</groupId>
             <artifactId>minio-plus-model</artifactId>

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.common.config.MinioPlusProperties;
-import org.liuxp.minioplus.core.common.context.ListPartsResultCopy;
 import org.liuxp.minioplus.core.common.context.MultipartUploadCreateDTO;
 import org.liuxp.minioplus.core.common.utils.MinioPlusCommonUtil;
 import org.liuxp.minioplus.core.engine.StorageEngineService;

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;

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;

minio-s3-api/minio-s3-api-custom/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.liuxp</groupId>
-            <artifactId>minio-plus-config</artifactId>
+            <artifactId>minio-plus-common</artifactId>
         </dependency>
     </dependencies>
 

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;

minio-s3-api/minio-s3-api-official/pom.xml

@@ -32,10 +32,6 @@
             <groupId>org.liuxp</groupId>
             <artifactId>minio-s3-api-definition</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.liuxp</groupId>
-            <artifactId>minio-plus-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.liuxp</groupId>
             <artifactId>minio-plus-common</artifactId>

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;

pom.xml

@@ -37,7 +37,6 @@
     <modules>
         <module>minio-plus-application</module>
         <module>minio-plus-common</module>
-        <module>minio-plus-config</module>
         <module>minio-plus-core</module>
         <module>minio-plus-extension</module>
         <module>minio-plus-model</module>
@@ -157,11 +156,6 @@
                 <artifactId>minio-plus-model</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>org.liuxp</groupId>
-                <artifactId>minio-plus-config</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>org.liuxp</groupId>
                 <artifactId>minio-plus-all-spring-boot-starter</artifactId>