From 0cb4d9f3e3f8b8b77892abc2524f0c9522233a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B0=8F=E5=B9=B3?= Date: Wed, 13 Nov 2024 19:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9A?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A7=E9=87=8F=E7=9B=B8=E5=90=8CMD5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E3=80=81=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E6=97=B6=E5=8F=AF=E8=83=BD=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=85=A2SQL=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/engine/impl/StorageEngineServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 cc4718d..0b2b136 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 @@ -500,9 +500,10 @@ public class StorageEngineServiceImpl implements StorageEngineService { FileMetadataInfoDTO fileMetadataInfo = new FileMetadataInfoDTO(); fileMetadataInfo.setFileMd5(metadata.getFileMd5()); - List metadataList = metadataRepository.list(fileMetadataInfo); + fileMetadataInfo.setIsFinished(Boolean.TRUE); + FileMetadataInfoVo fileMetadataInfoVo = metadataRepository.one(fileMetadataInfo); - if (CollUtil.isEmpty(metadataList)) { + if (null == fileMetadataInfoVo) { // 当不存在任何该MD5值的文件元数据时，删除物理文件 minioS3Client.removeObject(metadata.getStorageBucket(), metadata.getStoragePath() + "/" + metadata.getFileMd5()); if (Boolean.TRUE.equals(metadata.getIsPreview())) { @@ -524,9 +525,9 @@ public class StorageEngineServiceImpl implements StorageEngineService { FileMetadataInfoDTO fileMetadataInfo = new FileMetadataInfoDTO(); fileMetadataInfo.setFileKey(fileKey); // 取得md5元数据 - List fileMetadataInfoVoList = metadataRepository.list(fileMetadataInfo); + FileMetadataInfoVo fileMetadataInfoVo = metadataRepository.one(fileMetadataInfo); - for (FileMetadataInfoVo fileMetadataInfoVo : fileMetadataInfoVoList) { + if ( null!= fileMetadataInfoVo ) { if (Boolean.FALSE.equals(fileMetadataInfoVo.getIsPrivate()) || fileMetadataInfoVo.getCreateUser().equals(userId)) { return fileMetadataInfoVo; }