diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/web-service/src/main/java/cn/qaiu/lz/AppMain.java b/web-service/src/main/java/cn/qaiu/lz/AppMain.java index 5a9ae1c..65a7adf 100644 --- a/web-service/src/main/java/cn/qaiu/lz/AppMain.java +++ b/web-service/src/main/java/cn/qaiu/lz/AppMain.java @@ -10,7 +10,7 @@ import io.vertx.core.json.JsonObject; * 程序入口 *
Create date 2021-05-08 13:00:01 * - * @author qiu + * @author qaiu */ public class AppMain { diff --git a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java index 2379511..fa78a2c 100644 --- a/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java +++ b/web-service/src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java @@ -2,9 +2,9 @@ package cn.qaiu.lz.common.parser.impl; import cn.qaiu.lz.common.parser.IPanTool; import cn.qaiu.lz.common.util.CommonUtils; +import cn.qaiu.vx.core.util.VertxHolder; import io.vertx.core.Future; import io.vertx.core.Promise; -import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.client.WebClient; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ public class CowTool implements IPanTool { public Future parse(String data, String code) { Promise promise = Promise.promise(); - WebClient client = WebClient.create(Vertx.vertx()); + WebClient client = WebClient.create(VertxHolder.getVertxInstance()); String key = CommonUtils.adaptShortPaths(SHARE_URL_PREFIX, data); client.getAbs(API_REQUEST_URL + "?uniqueUrl=" + key).send().onSuccess(res -> { JsonObject resJson = res.bodyAsJsonObject(); @@ -44,10 +44,12 @@ public class CowTool implements IPanTool { } } else { log.error("cow parse fail: {}; json: {}", url2, res2Json); + promise.fail("cow parse fail: " + url2 + "; json:" + res2Json); } }); } else { log.error("cow parse fail: {}; json: {}", key, resJson); + promise.fail("cow parse fail: " + key + "; json:" + resJson); } }); return promise.future();