优化附件读取接口逻辑

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.0.9
+
+- 优化附件读取接口逻辑
+
 # 1.0.8
 
 - 优化在线流解析接口，给获取下载url添加缓存

build.gradle

@@ -14,7 +14,7 @@ ext {
     springContext = '6.0.3'
     pf4j = '3.8.0'
     lombok = '1.18.24'
-    libFile = 'lib/api-1.0.5.jar'
+    libFile = 'lib/api-1.0.6.jar'
 }
 
 

gradle.properties

@@ -1,3 +1,3 @@
 group=run.ikaros.plugin
 description=A pan115 plugin for ikaros.
-version=1.0.8
+version=1.0.9

lib/api-1.0.5-sources.jar lib/api-1.0.6-sources.jarlib/api-1.0.5-sources.jar renamed to lib/api-1.0.6-sources.jar

@@ -6,6 +6,7 @@
 import org.springframework.util.Assert;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import run.ikaros.api.constant.OpenApiConst;
 import run.ikaros.api.core.attachment.Attachment;
 import run.ikaros.api.core.attachment.AttachmentDriver;
 import run.ikaros.api.core.attachment.AttachmentDriverFetcher;
@@ -131,17 +132,18 @@ public Mono<String> parseReadUrl(Attachment attachment) {
         if (AttachmentType.Driver_Directory.equals(type)) return Mono.just(attachment.getUrl());
         String name = attachment.getName();
         Long driverId = attachment.getDriverId();
-        Mono<AttachmentDriver> checkoutMono = checkoutToken(driverId);
-        if (FileUtils.isImage(name)) {
-            return checkoutMono.map(driver -> attachment.getUrl());
-        } else if (FileUtils.isVideo(name)) {
-            return checkoutMono.flatMap(driver -> pan115Repository.openVideoPlay(attachment.getUrl()));
-        } else if (FileUtils.isVoice(name)) {
-            return parseDownloadUrl(attachment);
-        } else {
-            // doc
-            return checkoutMono.map(driver -> attachment.getUrl());
-        }
+        final String attStreamUrl = OpenApiConst.ATT_STREAM_ENDPOINT_PREFIX + '/' + attachment.getId();
+        return checkoutToken(driverId).map(driver -> attStreamUrl);
+        // if (FileUtils.isImage(name)) {
+        //     return checkoutMono.map(driver -> attachment.getUrl());
+        // } else if (FileUtils.isVideo(name)) {
+        //     return checkoutMono.flatMap(driver -> pan115Repository.openVideoPlay(attachment.getUrl()));
+        // } else if (FileUtils.isVoice(name)) {
+        //     return parseDownloadUrl(attachment);
+        // } else {
+        //     // doc
+        //     return checkoutMono.map(driver -> attachment.getUrl());
+        // }
     }
 
     @Override

lib/api-1.0.5.jar lib/api-1.0.6.jarlib/api-1.0.5.jar renamed to lib/api-1.0.6.jar

@@ -4,8 +4,8 @@ name: PluginPan115
 # plugin entry class that extends BasePlugin
 clazz: run.ikaros.plugin.pan115.Pan115Plugin
 # plugin 'version' is a valid semantic version string (see semver.org).
-version: 1.0.8
-requires: ">=1.0.5"
+version: 1.0.9
+requires: ">=1.0.6"
 author:
   name: Ikaros OSS Team
   website: https://github.com/ikaros-dev