diff --git a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkQuery.java b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkQuery.java index 3c38a85..632127d 100644 --- a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkQuery.java +++ b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/BookmarkQuery.java @@ -101,7 +101,7 @@ public class BookmarkQuery { for (CTBookmark bookmark : bookmarks) { String name = bookmark.getName(); - results.add(new BookmarkQueryDataModel(name, null)); + results.add(new BookmarkQueryDataModel(name, BookmarkType.TEXT)); } return new ArrayList<>(results); diff --git a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/AbstractExData.java b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/AbstractExData.java index 7d7d30f..1af8f17 100644 --- a/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/AbstractExData.java +++ b/wmyun-framework/wmyun-spring-boot-starter-word/src/main/java/com/wmyun/farmwork/word/core/model/AbstractExData.java @@ -1,5 +1,6 @@ package com.wmyun.farmwork.word.core.model; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.wmyun.farmwork.word.core.enums.BookmarkType; @@ -16,13 +17,17 @@ import lombok.Data; @Data @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, - property = "type" + property = "type", + visible = true ) @JsonSubTypes({ @JsonSubTypes.Type(value = TextExData.class, name = "TEXT"), - @JsonSubTypes.Type(value = PictureExData.class, name = "PICTURE") + @JsonSubTypes.Type(value = PictureExData.class, name = "PICTURE"), + @JsonSubTypes.Type(value = PictureExData.class, name = "PICTURE_DESC") }) public class AbstractExData { + + @JsonProperty("type") private BookmarkType type; private String value; diff --git a/wmyun-gateway/src/main/resources/application.yaml b/wmyun-gateway/src/main/resources/application.yaml index fd92a8e..5989694 100644 --- a/wmyun-gateway/src/main/resources/application.yaml +++ b/wmyun-gateway/src/main/resources/application.yaml @@ -13,6 +13,9 @@ spring: - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 + codec: + max-in-memory-size: 25MB + cloud: # Spring Cloud Gateway 配置项,对应 GatewayProperties 类 gateway: diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/file/OfficePreviewController.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/file/OfficePreviewController.java index 1197cc1..9d5fe2d 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/file/OfficePreviewController.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/file/OfficePreviewController.java @@ -33,8 +33,8 @@ public class OfficePreviewController { @GetMapping("/files/{fileId}") @PermitAll - public ResponseEntity getFileInfo(@PathVariable("fileId") String fileId) { - return ResponseEntity.ok().body(previewService.createPreviewInfo(fileId)); + public ResponseEntity getFileInfo(@PathVariable("fileId") String fileId, @RequestParam String access_token) { + return ResponseEntity.ok().body(previewService.createPreviewInfo(fileId, access_token)); } @GetMapping(value = "/files/{fileId}/contents") diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewService.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewService.java index 60d87e7..2a6f8bc 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewService.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewService.java @@ -15,7 +15,7 @@ import java.io.InputStream; public interface FilePreviewService { - CheckFileInfoVo createPreviewInfo(String fileId); + CheckFileInfoVo createPreviewInfo(String fileId, String access_token); FileDO queryFileInfoByFileId(String fileId); diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewServiceImpl.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewServiceImpl.java index d298adb..dab7166 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewServiceImpl.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/FilePreviewServiceImpl.java @@ -45,7 +45,7 @@ public class FilePreviewServiceImpl implements FilePreviewService { private ConfigService configService; @Override - public CheckFileInfoVo createPreviewInfo(String fileId) { + public CheckFileInfoVo createPreviewInfo(String fileId, String access_token) { FileDO file = queryFileInfoByFileId(fileId); if (file == null) { return null;