优化刷新令牌逻辑

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.0.14
+
+- 优化刷新令牌逻辑
+
 # 1.0.13
 
 - 修复异常空的逻辑

gradle.properties

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

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

@@ -61,13 +61,11 @@ 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 -> {
-                    pan115Repository.refreshHttpHeaders(driver.getAccessToken());
-                    return driverOperate.save(driver);
-                }).switchIfEmpty(driverOperate.findById(driverId));
+                .filter(driver -> driver.getExpireTime() != null
+                && driver.getExpireTime().isAfter(LocalDateTime.now()))
+                .switchIfEmpty(driverOperate.findById(driverId)
+                        .flatMap(this::applyPan115Token)
+                        .flatMap(driverOperate::save));
     }
 
     @Override

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

@@ -16,29 +16,15 @@
 @Slf4j
 @Component
 public class Pan115Plugin extends BasePlugin {
-    private final Pan115AttachmentDriverFetcher driverFetcher;
-
-    public Pan115Plugin(PluginWrapper wrapper, Pan115AttachmentDriverFetcher driverFetcher) {
+    public Pan115Plugin(PluginWrapper wrapper) {
         super(wrapper);
-        this.driverFetcher = driverFetcher;
     }
 
     @Override
     public void start() {
         log.info("plugin [Pan115Plugin] start success");
     }
 
-    public Disposable startRefreshTokenTask() {
-        return Flux.interval(Duration.ofMinutes(30))
-                .flatMap(tick -> refreshTokenTask())
-                .subscribeOn(Schedulers.newSingle("RefreshTokenTask", true))
-                .subscribe();
-    }
-
-    private Mono<Void> refreshTokenTask() {
-        return driverFetcher.checkoutAllDriverToken();
-    }
-
     @Override
     public void stop() {
         log.info("plugin [Pan115Plugin] stop success");

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.13
+version: 1.0.14
 requires: ">=1.0.6"
 author:
   name: Ikaros OSS Team