优化请求api的报错逻辑

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.0.16
+
+- 优化请求api的报错逻辑
+
 # 1.0.15
 
 - 刷新Token后立刻刷新请求头

gradle.properties

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

src/main/java/run/ikaros/plugin/pan115/repository/DefaultPan115Repository.java

@@ -10,6 +10,7 @@
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
@@ -163,6 +164,16 @@ public Mono<AttachmentDriver> refreshToken(AttachmentDriver driver) {
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                 .bodyValue(body)
                 .exchangeToMono(rsp -> rsp.bodyToMono(Pan115Result.class))
+                .flatMap(r -> {
+                    if (r == null) {
+                        return Mono.error(new Pan115RequestFailException(HttpStatusCode.valueOf(400),
+                                "request pan 115 api fail with result is null"));
+                    }
+                    if (!r.getState()) {
+                        return Mono.error(new Pan115RequestFailException(r.getMessage(), r.getCode()));
+                    }
+                    return Mono.just(r);
+                })
                 .filter(r -> Objects.nonNull(r) && r.getState())
                 .flatMap(r -> {
                     if (!r.getState()) {