diff --git a/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java b/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java index b99dfa3..f00e144 100644 --- a/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java +++ b/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java @@ -20,7 +20,6 @@ import com.imyeyu.api.modules.common.service.TemplateService; import com.imyeyu.api.modules.common.service.VersionService; import com.imyeyu.api.modules.common.vo.FeedbackRequest; import com.imyeyu.api.modules.common.vo.TempFileResponse; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; import com.imyeyu.api.modules.system.util.ResourceHandler; import com.imyeyu.api.util.CaptchaManager; import com.imyeyu.io.IO; @@ -264,8 +263,8 @@ public class CommonController { @AOPLog @RequestRateLimit @GetMapping("/attachment/{mongoId}") - public AttachmentView getAttachment(@PathVariable String mongoId) { - return attachmentService.viewByMongoId(mongoId); + public Attachment getAttachment(@PathVariable String mongoId) { + return attachmentService.getByMongoId(mongoId); } @AOPLog diff --git a/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java b/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java index 3cebd04..f56114c 100644 --- a/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java @@ -1,8 +1,6 @@ package com.imyeyu.api.modules.common.service; import com.imyeyu.api.modules.common.entity.Attachment; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; import com.imyeyu.java.bean.timi.TimiException; import com.imyeyu.spring.service.BaseService; import com.mongodb.client.gridfs.model.GridFSFile; @@ -22,27 +20,6 @@ public interface AttachmentService extends BaseService { Attachment createMedia(Attachment attachment); - /** - * - * - * @param request - */ - @Deprecated - default void create(AttachmentRequest request) { - create((Attachment) request); - } - - /** - * 创建媒体附件，同步创建缩略图 - * - * @param request 附件请求 - * @return 缩略图附件 - */ - @Deprecated - default Attachment createMedia(AttachmentRequest request) throws TimiException { - return createMedia((Attachment) request); - } - void deleteMedia(Long thumbId) throws TimiException; Attachment getByBizId(Attachment.BizType bizType, long bizId); @@ -51,8 +28,6 @@ public interface AttachmentService extends BaseService { Attachment getByMongoId(String mongoId); - AttachmentView viewByMongoId(String mongoId); - GridFSFile readByMongoId(String mongoId); InputStream getInputStreamByMongoId(String mongoId); 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 02cdbb8..f6e02c0 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 @@ -9,7 +9,6 @@ import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.api.modules.common.mapper.AttachmentMapper; import com.imyeyu.api.modules.common.service.AttachmentService; import com.imyeyu.api.modules.common.service.SettingService; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; import com.imyeyu.api.util.JavaCV; import com.imyeyu.io.IO; import com.imyeyu.java.TimiJava; @@ -25,7 +24,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.coobird.thumbnailator.Thumbnails; import org.apache.tika.Tika; -import org.springframework.beans.BeanUtils; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.gridfs.GridFsTemplate; @@ -201,17 +199,6 @@ public class AttachmentServiceImplement extends AbstractEntityService diffAdd(List dbFiles) throws Exception; + protected abstract List diffAdd(List dbFiles) throws Exception; /** * 差分移除附件 @@ -70,10 +69,10 @@ public abstract class AttachmentMirror extends AbstractMirror { attachmentService.destroy(diffRemoveList.get(i).getId()); } - List diffAddList = diffAdd(dbFiles); + List diffAddList = diffAdd(dbFiles); syncAdded = diffAddList.size(); for (int i = 0; i < diffAddList.size(); i++) { - AttachmentRequest request = diffAddList.get(i); + Attachment request = diffAddList.get(i); request.setBizType(Attachment.BizType.MIRROR); request.setBizId(mirror.getId()); attachmentService.create(request); diff --git a/src/main/java/com/imyeyu/api/modules/mirror/FabricAPIMirror.java b/src/main/java/com/imyeyu/api/modules/mirror/FabricAPIMirror.java index 2c852f1..25450d4 100644 --- a/src/main/java/com/imyeyu/api/modules/mirror/FabricAPIMirror.java +++ b/src/main/java/com/imyeyu/api/modules/mirror/FabricAPIMirror.java @@ -3,7 +3,6 @@ package com.imyeyu.api.modules.mirror; import com.google.gson.Gson; import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.api.modules.common.service.AttachmentService; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; import com.imyeyu.api.modules.mirror.bean.AttachType; import com.imyeyu.api.modules.mirror.data.FabricAPI; import com.imyeyu.api.modules.mirror.entity.Mirror; @@ -106,10 +105,10 @@ public class FabricAPIMirror extends AttachmentMirror { } @Override - protected List diffAdd(List dbFiles) throws Exception { + protected List diffAdd(List dbFiles) throws Exception { Set dbNameSet = dbFiles.stream().map(Attachment::getName).collect(Collectors.toSet()); - List result = new ArrayList<>(); + List result = new ArrayList<>(); for (Map.Entry item : versionMap.entrySet()) { String version = "%s+%s".formatted(item.getValue(), item.getKey()); String name = "fabric-api-%s.jar".formatted(version); @@ -119,7 +118,7 @@ public class FabricAPIMirror extends AttachmentMirror { byte[] bytes = Request.get(url).viaProxy(proxy).execute().returnContent().asBytes(); - AttachmentRequest attachment = new AttachmentRequest(); + Attachment attachment = new Attachment(); attachment.setAttachTypeValue(AttachType.FABRIC_API); attachment.setName(name); attachment.setSize((long) bytes.length); diff --git a/src/main/java/com/imyeyu/api/modules/mirror/OpenJDKMirror.java b/src/main/java/com/imyeyu/api/modules/mirror/OpenJDKMirror.java index b04bf58..f48b358 100644 --- a/src/main/java/com/imyeyu/api/modules/mirror/OpenJDKMirror.java +++ b/src/main/java/com/imyeyu/api/modules/mirror/OpenJDKMirror.java @@ -3,7 +3,6 @@ package com.imyeyu.api.modules.mirror; import com.google.gson.Gson; import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.api.modules.common.service.AttachmentService; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; import com.imyeyu.api.modules.mirror.bean.AttachType; import com.imyeyu.api.modules.mirror.data.OpenJDK; import com.imyeyu.api.modules.mirror.entity.Mirror; @@ -70,11 +69,11 @@ public class OpenJDKMirror extends AttachmentMirror { } @Override - protected List diffAdd(List dbFiles) throws Exception { + protected List diffAdd(List dbFiles) throws Exception { Map githubNameMap = githubMirrorResult.stream().collect(Collectors.toMap(OpenJDK::getName, item -> item)); Set dbNameSet = dbFiles.stream().map(Attachment::getName).collect(Collectors.toSet()); - List result = new ArrayList<>(); + List result = new ArrayList<>(); for (Map.Entry item : githubNameMap.entrySet()) { if (!dbNameSet.contains(item.getKey())) { String url = item.getValue().getData(); @@ -82,7 +81,7 @@ public class OpenJDKMirror extends AttachmentMirror { byte[] bytes = Request.get(url).viaProxy(proxy).execute().returnContent().asBytes(); - AttachmentRequest attachment = new AttachmentRequest(); + Attachment attachment = new Attachment(); attachment.setAttachTypeValue(AttachType.OPEN_JDK); attachment.setName(item.getKey()); attachment.setSize((long) bytes.length); diff --git a/src/main/java/com/imyeyu/api/modules/system/controller/SystemController.java b/src/main/java/com/imyeyu/api/modules/system/controller/SystemController.java index 398849f..03fdaa4 100644 --- a/src/main/java/com/imyeyu/api/modules/system/controller/SystemController.java +++ b/src/main/java/com/imyeyu/api/modules/system/controller/SystemController.java @@ -1,7 +1,7 @@ package com.imyeyu.api.modules.system.controller; +import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.api.modules.common.service.AttachmentService; -import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; import com.imyeyu.api.modules.system.bean.ServerStatus; import com.imyeyu.api.modules.system.service.SystemService; import com.imyeyu.api.modules.system.vo.TempAttachRequest; @@ -119,7 +119,7 @@ public class SystemController { for (MultipartFile file : request.getFile()) { byte[] bytes = IO.toBytes(file.getInputStream()); - AttachmentRequest attach = new AttachmentRequest(); + Attachment attach = new Attachment(); attach.setName(file.getOriginalFilename()); attach.setBizType(request.getBizType()); attach.setBizId(request.getBizId());