diff --git a/src/main/java/com/imyeyu/api/modules/common/bean/MediaAttach.java b/src/main/java/com/imyeyu/api/modules/common/bean/MediaAttach.java index 177a3da..25365d0 100644 --- a/src/main/java/com/imyeyu/api/modules/common/bean/MediaAttach.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/MediaAttach.java @@ -1,7 +1,5 @@ package com.imyeyu.api.modules.common.bean; -import lombok.Data; - /** * @author 夜雨 * @since 2025-10-20 15:04 @@ -18,22 +16,4 @@ public class MediaAttach { THUMB } - - /** - * - * - * @author 夜雨 - * @since 2025-10-20 15:04 - */ - @Data - public static class ExtData { - - private Long sourceId; - - private String sourceMongoId; - - private boolean isImage; - - private boolean isVideo; - } } diff --git a/src/main/java/com/imyeyu/api/modules/common/bean/Metadata.java b/src/main/java/com/imyeyu/api/modules/common/bean/Metadata.java index dfad00b..84ef59d 100644 --- a/src/main/java/com/imyeyu/api/modules/common/bean/Metadata.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/Metadata.java @@ -1,6 +1,7 @@ package com.imyeyu.api.modules.common.bean; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 夜雨 @@ -9,7 +10,7 @@ import lombok.Data; public class Metadata { /** - * + * 图片 * * @author 夜雨 * @since 2025-12-11 18:15 @@ -21,4 +22,21 @@ public class Metadata { private int height; } + + /** + * 缩略图 + * + * @author 夜雨 + * @since 2026-01-04 18:10 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class ThumbImage extends Image { + + private long sourceId; + + private String sourceMongoId; + + private String sourceMimeType; + } } diff --git a/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java b/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java index 0feb0dc..01aada5 100644 --- a/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java @@ -79,8 +79,6 @@ public class Attachment extends Entity implements MultilingualHandler { protected String md5; - protected String ext; - protected Long destroyAt; @Transient diff --git a/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java b/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java index 155b8ca..02cdbb8 100644 --- a/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java @@ -1,6 +1,7 @@ package com.imyeyu.api.modules.common.service.implement; import com.google.gson.Gson; +import com.google.gson.JsonObject; import com.imyeyu.api.config.dbsource.TimiServerDBConfig; import com.imyeyu.api.modules.common.bean.MediaAttach; import com.imyeyu.api.modules.common.bean.Metadata; @@ -90,10 +91,10 @@ public class AttachmentServiceImplement extends AbstractEntityService { - isImage = true; Thumbnails.of(sourceStream).width(256).keepAspectRatio(true).toOutputStream(thumbStream); } case "video/mp4", "video/quicktime" -> { @@ -155,18 +156,17 @@ public class AttachmentServiceImplement extends AbstractEntityService