diff --git a/core/src/main/java/com/dite/znpt/enums/FilePathEnum.java b/core/src/main/java/com/dite/znpt/enums/FilePathEnum.java index 46ed9bb..6b7e3f7 100644 --- a/core/src/main/java/com/dite/znpt/enums/FilePathEnum.java +++ b/core/src/main/java/com/dite/znpt/enums/FilePathEnum.java @@ -7,16 +7,16 @@ import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.core.env.Environment; -@Getter @AllArgsConstructor public enum FilePathEnum { - IMAGE("/static/image/", "/image/"), - IMAGE_TEMP("/static/image/temp/", "/image/temp/"), - VIDEO("/static/video/", "/video/"), - AUDIO("/static/audio/", "/audio/"), + IMAGE("/static/image/", "image"), + IMAGE_TEMP("/static/image/temp/", "image-temp"), + VIDEO("/static/video/", "video"), + AUDIO("/static/audio/", "audio"), ; + @Getter private final String urlPath; private final String fileRelativePath; @@ -28,7 +28,7 @@ public enum FilePathEnum { * @date 2025/06/23 14:46 **/ public String getFileAbsolutePath() { - return SpringUtil.getBean(Environment.class).getProperty("upload.save-path") + fileRelativePath; + return SpringUtil.getBean(Environment.class).getProperty("upload.save-path") + fileRelativePath + FileUtil.FILE_SEPARATOR; } /** diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java index d71e65d..b7348f2 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java @@ -191,7 +191,7 @@ public class ImageServiceImpl extends ServiceImpl impl result.add(FilePathEnum.IMAGE.getImageDownPath(path)); } String partId = imageWorkReq.getPartId(); - if (Objects.nonNull(partId)) { + if (StrUtil.isNotEmpty(partId)) { ImageCollectEntity imageCollect = new ImageCollectEntity(); imageCollect.setCollectId(IdUtil.simpleUUID()); imageCollect.setCollectorName(imageWorkReq.getUploadUser());