From a5b19d3577b5df1641aad1ead241b91ecde40baf Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Sun, 9 Feb 2020 18:06:42 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=96=B0=E5=A2=9E=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=9B=B4=E9=93=BE=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/AbstractS3FileService.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java b/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java index b55e084..057ca89 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java +++ b/src/main/java/im/zhaojun/common/service/AbstractS3FileService.java @@ -1,7 +1,6 @@ package im.zhaojun.common.service; import cn.hutool.core.util.BooleanUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.URLUtil; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ListObjectsRequest; @@ -112,11 +111,21 @@ public abstract class AbstractS3FileService extends AbstractFileService { @Override public FileItemDTO getFileItem(String path) { - List list = fileList(path); - - if (list == null || list.size() == 0) { + List list; + try { + int end = path.lastIndexOf("/"); + list = fileList(path.substring(0, end + 1)); + } catch (Exception e) { throw new NotExistFileException(); } - return list.get(0); + + for (FileItemDTO fileItemDTO : list) { + String fullPath = StringUtils.concatUrl(fileItemDTO.getPath(), fileItemDTO.getName()); + if (Objects.equals(fullPath, path)) { + return fileItemDTO; + } + } + + throw new NotExistFileException(); } } \ No newline at end of file