diff --git a/minio-plus-api/pom.xml b/minio-plus-api/pom.xml index ad91d41..b59de5d 100644 --- a/minio-plus-api/pom.xml +++ b/minio-plus-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/minio-plus-application/minio-plus-application-mysql/pom.xml b/minio-plus-application/minio-plus-application-mysql/pom.xml index 8d9d5c6..63af9db 100644 --- a/minio-plus-application/minio-plus-application-mysql/pom.xml +++ b/minio-plus-application/minio-plus-application-mysql/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-application - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -14,7 +14,7 @@ - org.liuxp + me.liuxp minio-plus-all-spring-boot-starter diff --git a/minio-plus-application/pom.xml b/minio-plus-application/pom.xml index 8c42fba..2b244bb 100644 --- a/minio-plus-application/pom.xml +++ b/minio-plus-application/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/minio-plus-common/pom.xml b/minio-plus-common/pom.xml index 548cf15..5b641fb 100644 --- a/minio-plus-common/pom.xml +++ b/minio-plus-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/minio-plus-core/pom.xml b/minio-plus-core/pom.xml index efa81b8..52cf190 100644 --- a/minio-plus-core/pom.xml +++ b/minio-plus-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -18,15 +18,15 @@ spring-boot-starter - org.liuxp + me.liuxp minio-plus-common - org.liuxp + me.liuxp minio-plus-api - org.liuxp + me.liuxp minio-s3-api-definition diff --git a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/MinioPlusCommonUtil.java b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/CommonUtil.java similarity index 92% rename from minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/MinioPlusCommonUtil.java rename to minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/CommonUtil.java index 3fd28ca..66d82d7 100644 --- a/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/MinioPlusCommonUtil.java +++ b/minio-plus-core/src/main/java/org/liuxp/minioplus/core/common/utils/CommonUtil.java @@ -12,7 +12,7 @@ import java.io.InputStream; * @author contact@liuxp.me * @since 2024/05/23 */ -public class MinioPlusCommonUtil { +public class CommonUtil { /** * 取得对象名称 @@ -20,7 +20,7 @@ public class MinioPlusCommonUtil { * @return 对象名称 */ public static String getObjectName(String md5){ - return MinioPlusCommonUtil.getPathByDate() + "/" + md5; + return CommonUtil.getPathByDate() + "/" + md5; } /** 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 845bef8..458b79f 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 @@ -10,7 +10,7 @@ import org.liuxp.minioplus.common.config.MinioPlusProperties; 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.core.common.utils.MinioPlusCommonUtil; +import org.liuxp.minioplus.core.common.utils.CommonUtil; import org.liuxp.minioplus.core.engine.StorageEngineService; import org.liuxp.minioplus.core.repository.MetadataRepository; import org.liuxp.minioplus.api.model.bo.CreateUploadUrlReqBO; @@ -423,15 +423,15 @@ public class StorageEngineServiceImpl implements StorageEngineService { public Boolean createFile(FileMetadataInfoSaveDTO saveDTO, byte[] fileBytes) { // 写入文件 - minioS3Client.putObject(saveDTO.getStorageBucket(), MinioPlusCommonUtil.getObjectName(saveDTO.getFileMd5()), new ByteArrayInputStream(fileBytes), saveDTO.getFileSize(), saveDTO.getFileMimeType()); + minioS3Client.putObject(saveDTO.getStorageBucket(), CommonUtil.getObjectName(saveDTO.getFileMd5()), new ByteArrayInputStream(fileBytes), saveDTO.getFileSize(), saveDTO.getFileMimeType()); // 判断是否生成缩略图 if(Boolean.TRUE.equals(saveDTO.getIsPreview())){ try{ - ByteArrayOutputStream largeImage = MinioPlusCommonUtil.resizeImage(new ByteArrayInputStream(fileBytes), properties.getThumbnail().getSize()); + ByteArrayOutputStream largeImage = CommonUtil.resizeImage(new ByteArrayInputStream(fileBytes), properties.getThumbnail().getSize()); byte[] largeImageBytes = largeImage.toByteArray(); - minioS3Client.putObject(StorageBucketEnums.IMAGE_PREVIEW.getCode(), MinioPlusCommonUtil.getObjectName(saveDTO.getFileMd5()), new ByteArrayInputStream(largeImageBytes), largeImageBytes.length, saveDTO.getFileMimeType()); + minioS3Client.putObject(StorageBucketEnums.IMAGE_PREVIEW.getCode(), CommonUtil.getObjectName(saveDTO.getFileMd5()), new ByteArrayInputStream(largeImageBytes), largeImageBytes.length, saveDTO.getFileMimeType()); }catch(Exception e){ log.error(MinioPlusErrorCode.FILE_PREVIEW_WRITE_FAILED.getMessage(),e); throw new MinioPlusException(MinioPlusErrorCode.FILE_PREVIEW_WRITE_FAILED); @@ -733,7 +733,7 @@ public class StorageEngineServiceImpl implements StorageEngineService { * @return {@link ListParts} 分片任务信息 */ private ListParts buildResultPart(FileMetadataInfoVo metadataInfo){ - String objectName = MinioPlusCommonUtil.getObjectName(metadataInfo.getFileMd5()); + String objectName = CommonUtil.getObjectName(metadataInfo.getFileMd5()); // 获取所有的分片信息 return minioS3Client.listParts(metadataInfo.getStorageBucket(), objectName, metadataInfo.getPartNumber(), metadataInfo.getUploadTaskId()); } @@ -757,7 +757,7 @@ public class StorageEngineServiceImpl implements StorageEngineService { // 存储桶 bucketName = bo.getStorageBucket(); // 存储路径 - storagePath = MinioPlusCommonUtil.getObjectName(bo.getFileMd5()); + storagePath = CommonUtil.getObjectName(bo.getFileMd5()); // 文件key fileKey = bo.getFileKey(); uploadId = bo.getUploadId(); @@ -778,7 +778,7 @@ public class StorageEngineServiceImpl implements StorageEngineService { // 文件key fileKey = IdUtil.fastSimpleUUID(); // 存储路径 - storagePath = MinioPlusCommonUtil.getPathByDate(); + storagePath = CommonUtil.getPathByDate(); // 存储桶 bucketName = StorageBucketEnums.getBucketByFileSuffix(suffix); @@ -798,10 +798,10 @@ public class StorageEngineServiceImpl implements StorageEngineService { uploadId = fileKey; } else { // 创建分片请求,获取uploadId - uploadId = minioS3Client.createMultipartUpload(bucketName,MinioPlusCommonUtil.getObjectName(bo.getFileMd5())); + uploadId = minioS3Client.createMultipartUpload(bucketName, CommonUtil.getObjectName(bo.getFileMd5())); long start = 0; for (Integer partNumber = 1; partNumber <= chunkNum; partNumber++) { - FileCheckResultVo.Part part = this.buildResultPart(bucketName,MinioPlusCommonUtil.getObjectName(bo.getFileMd5()), uploadId, bo.getFileSize(), start, partNumber); + FileCheckResultVo.Part part = this.buildResultPart(bucketName, CommonUtil.getObjectName(bo.getFileMd5()), uploadId, bo.getFileSize(), start, partNumber); // 更改下一次的开始位置 start = start + properties.getPart().getSize(); partList.add(part); 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 02b734d..81a42d9 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 @@ -20,7 +20,7 @@ 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.core.common.utils.ContentTypeUtil; -import org.liuxp.minioplus.core.common.utils.MinioPlusCommonUtil; +import org.liuxp.minioplus.core.common.utils.CommonUtil; import org.liuxp.minioplus.api.model.vo.FileMetadataInfoVo; import org.liuxp.minioplus.core.engine.StorageEngineService; import org.liuxp.minioplus.core.repository.MetadataRepository; @@ -198,7 +198,7 @@ public class StorageServiceImpl implements StorageService { String storageBucket = StorageBucketEnums.getBucketByFileSuffix(suffix); // 取得存储路径 - String storagePath = MinioPlusCommonUtil.getPathByDate(); + String storagePath = CommonUtil.getPathByDate(); // 是否存在缩略图 Boolean isPreview = properties.getThumbnail().isEnable() && StorageBucketEnums.IMAGE.getCode().equals(storageBucket); diff --git a/minio-plus-extension/pom.xml b/minio-plus-extension/pom.xml index 7cce7cd..a0f4180 100644 --- a/minio-plus-extension/pom.xml +++ b/minio-plus-extension/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -14,7 +14,7 @@ - org.liuxp + me.liuxp minio-plus-core diff --git a/minio-plus-spring-boot-starter/minio-plus-all-spring-boot-starter/pom.xml b/minio-plus-spring-boot-starter/minio-plus-all-spring-boot-starter/pom.xml index cde73b0..bea28c0 100644 --- a/minio-plus-spring-boot-starter/minio-plus-all-spring-boot-starter/pom.xml +++ b/minio-plus-spring-boot-starter/minio-plus-all-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-spring-boot-starter - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -14,11 +14,11 @@ - org.liuxp + me.liuxp minio-plus-extension - org.liuxp + me.liuxp minio-s3-api-official diff --git a/minio-plus-spring-boot-starter/pom.xml b/minio-plus-spring-boot-starter/pom.xml index 519499c..acca8cf 100644 --- a/minio-plus-spring-boot-starter/pom.xml +++ b/minio-plus-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/minio-s3-api/minio-s3-api-custom/pom.xml b/minio-s3-api/minio-s3-api-custom/pom.xml index e17227e..1aa8099 100644 --- a/minio-s3-api/minio-s3-api-custom/pom.xml +++ b/minio-s3-api/minio-s3-api-custom/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-s3-api - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -18,11 +18,11 @@ hutool-all - org.liuxp + me.liuxp minio-s3-api-definition - org.liuxp + me.liuxp minio-plus-common diff --git a/minio-s3-api/minio-s3-api-definition/pom.xml b/minio-s3-api/minio-s3-api-definition/pom.xml index d1fc736..d501fd8 100644 --- a/minio-s3-api/minio-s3-api-definition/pom.xml +++ b/minio-s3-api/minio-s3-api-definition/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-s3-api - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/minio-s3-api/minio-s3-api-official/pom.xml b/minio-s3-api/minio-s3-api-official/pom.xml index d3df15d..3277c6a 100644 --- a/minio-s3-api/minio-s3-api-official/pom.xml +++ b/minio-s3-api/minio-s3-api-official/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-s3-api - org.liuxp + me.liuxp ${revision} 4.0.0 @@ -30,11 +30,11 @@ 4.11.0 - org.liuxp + me.liuxp minio-s3-api-definition - org.liuxp + me.liuxp minio-plus-common diff --git a/minio-s3-api/pom.xml b/minio-s3-api/pom.xml index 428b44d..9b2dbc7 100644 --- a/minio-s3-api/pom.xml +++ b/minio-s3-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> minio-plus-parent - org.liuxp + me.liuxp ${revision} 4.0.0 diff --git a/pom.xml b/pom.xml index 315993b..6751533 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.liuxp + me.liuxp minio-plus-parent ${revision} pom @@ -137,42 +137,42 @@ ${thumbnailator.version} - org.liuxp + me.liuxp minio-plus-common ${revision} - org.liuxp + me.liuxp minio-plus-core ${revision} - org.liuxp + me.liuxp minio-plus-extension ${revision} - org.liuxp + me.liuxp minio-plus-api ${revision} - org.liuxp + me.liuxp minio-plus-all-spring-boot-starter ${revision} - org.liuxp + me.liuxp minio-s3-api-definition ${revision} - org.liuxp + me.liuxp minio-s3-api-custom ${revision} - org.liuxp + me.liuxp minio-s3-api-official ${revision}