diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadTask.java b/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadTask.java index 61456d2..88d739c 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadTask.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadTask.java @@ -51,7 +51,7 @@ public final class UploadTask } } - public UploadResult GenerateResult() + public UploadResult GenerateResult(boolean needThumbnail) { UploadResult res = new UploadResult(); @@ -73,16 +73,19 @@ public final class UploadTask res.setFileUrl(PathUtils.appendPaths(Constants.RESOURCE_PREFIX, baseUrl)); res.setFilePath(PathUtils.appendPaths(diskPath, baseUrl)); - // thumbnailFolderName/directory/yyyy/MM/dd/filename_uuid_thumbnail.extension - String thumbBaseUrl = StringUtils.format("{}/{}/{}/{}_thumbnail.{}", - thumbnailFolderName, - directory, - DateUtils.datePath(), - newBaseName, - "jpg" - ); - res.setThumbnailFileUrl(PathUtils.appendPaths(Constants.RESOURCE_PREFIX, thumbBaseUrl)); - res.setThumbnailFilePath(PathUtils.appendPaths(diskPath, thumbBaseUrl)); + if(needThumbnail) + { + // thumbnailFolderName/directory/yyyy/MM/dd/filename_uuid_thumbnail.extension + String thumbBaseUrl = StringUtils.format("{}/{}/{}/{}_thumbnail.{}", + thumbnailFolderName, + directory, + DateUtils.datePath(), + newBaseName, + "jpg" + ); + res.setThumbnailFileUrl(PathUtils.appendPaths(Constants.RESOURCE_PREFIX, thumbBaseUrl)); + res.setThumbnailFilePath(PathUtils.appendPaths(diskPath, thumbBaseUrl)); + } return res; } diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadFunc.java b/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadFunc.java index 6b3fb6a..f5b9074 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadFunc.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadFunc.java @@ -101,7 +101,7 @@ public class FileUploadFunc } } - UploadResult result = task.GenerateResult(); + UploadResult result = task.GenerateResult(needThumbnail); result.setState(1); // 存储