修复刷新令牌的问题

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.0.12
+
+- 修复刷新令牌的问题
+
 # 1.0.11
 
 - 增加webclient的缓冲区大小

gradle.properties

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

src/main/java/run/ikaros/plugin/pan115/Pan115AttachmentDriverFetcher.java

@@ -61,12 +61,10 @@ private Mono<AttachmentDriver> checkoutToken(Long driverId) {
         Assert.isTrue(driverId >= 0, "driverId is negative");
         log.debug("Do checkoutToken for driverId={}", driverId);
         return driverOperate.findById(driverId)
+                .filter(driver -> driver.getExpireTime() == null
+                        || driver.getExpireTime().isBefore(LocalDateTime.now()))
+                .flatMap(this::applyPan115Token)
                 .flatMap(driver -> {
-                    if (driver.getExpireTime() == null
-                            || driver.getExpireTime().isBefore(LocalDateTime.now())) {
-                        applyPan115Token(driver);
-                    }
-
                     pan115Repository.refreshHttpHeaders(driver.getAccessToken());
                     return driverOperate.save(driver);
                 });
@@ -182,9 +180,9 @@ public Flux<DataBuffer> getSteam(Attachment attachment, long start, long end) {
                 pan115Repository.openUFileSteamWithRange(attachment.getUrl(), start, end));
     }
 
-    private void applyPan115Token(AttachmentDriver driver) {
+    private Mono<AttachmentDriver> applyPan115Token(AttachmentDriver driver) {
         Assert.notNull(driver, "'driver' must not null.");
-        pan115Repository.refreshToken(driver);
+        return pan115Repository.refreshToken(driver);
     }
 
 }

src/main/resources/plugin.yaml

@@ -4,7 +4,7 @@ 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.11
+version: 1.0.12
 requires: ">=1.0.6"
 author:
   name: Ikaros OSS Team