Skip to content

Commit 8edcf9e

Browse files
committed
修复异常空的逻辑
1 parent 7b3f87c commit 8edcf9e

5 files changed

Lines changed: 8 additions & 12 deletions

File tree

CHANGELOG.MD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
更新日志文档,版本顺序从新到旧,最新版本在最前(上)面。
44

5+
# 1.0.13
6+
7+
- 修复异常空的逻辑
8+
9+
510
# 1.0.12
611

712
- 修复刷新令牌的问题

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group=run.ikaros.plugin
22
description=A pan115 plugin for ikaros.
3-
version=1.0.12
3+
version=1.0.13

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private Mono<AttachmentDriver> checkoutToken(Long driverId) {
6767
.flatMap(driver -> {
6868
pan115Repository.refreshHttpHeaders(driver.getAccessToken());
6969
return driverOperate.save(driver);
70-
});
70+
}).switchIfEmpty(driverOperate.findById(driverId));
7171
}
7272

7373
@Override

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,19 @@
33

44
import lombok.extern.slf4j.Slf4j;
55
import org.pf4j.PluginWrapper;
6-
import org.pf4j.RuntimeMode;
7-
import org.reactivestreams.Publisher;
86
import org.springframework.stereotype.Component;
97
import reactor.core.Disposable;
108
import reactor.core.publisher.Flux;
119
import reactor.core.publisher.Mono;
1210
import reactor.core.scheduler.Schedulers;
13-
import run.ikaros.api.core.task.TaskOperate;
1411
import run.ikaros.api.plugin.BasePlugin;
1512

1613
import java.time.Duration;
1714
import java.util.Objects;
18-
import java.util.Random;
1915

2016
@Slf4j
2117
@Component
2218
public class Pan115Plugin extends BasePlugin {
23-
private Disposable startRefreshTokenTask;
2419
private final Pan115AttachmentDriverFetcher driverFetcher;
2520

2621
public Pan115Plugin(PluginWrapper wrapper, Pan115AttachmentDriverFetcher driverFetcher) {
@@ -30,7 +25,6 @@ public Pan115Plugin(PluginWrapper wrapper, Pan115AttachmentDriverFetcher driverF
3025

3126
@Override
3227
public void start() {
33-
// startRefreshTokenTask = startRefreshTokenTask();
3428
log.info("plugin [Pan115Plugin] start success");
3529
}
3630

@@ -47,9 +41,6 @@ private Mono<Void> refreshTokenTask() {
4741

4842
@Override
4943
public void stop() {
50-
if (Objects.nonNull(startRefreshTokenTask)) {
51-
startRefreshTokenTask.dispose();
52-
}
5344
log.info("plugin [Pan115Plugin] stop success");
5445
}
5546

src/main/resources/plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: PluginPan115
44
# plugin entry class that extends BasePlugin
55
clazz: run.ikaros.plugin.pan115.Pan115Plugin
66
# plugin 'version' is a valid semantic version string (see semver.org).
7-
version: 1.0.12
7+
version: 1.0.13
88
requires: ">=1.0.6"
99
author:
1010
name: Ikaros OSS Team

0 commit comments

Comments
 (0)