From 40eea9b5f4ac25c221b0278abf5338aa4ecd1b72 Mon Sep 17 00:00:00 2001
From: qaiu <736226400@qq.com>
Date: Wed, 21 Jun 2023 02:50:19 +0000
Subject: [PATCH 1/3] cow parse fail return
---
.vscode/settings.json | 3 +++
web-service/src/main/java/cn/qaiu/lz/AppMain.java | 2 +-
.../src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 .vscode/settings.json
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..8736487 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
@@ -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();
From 67edd5b5d8e8ef636429563df6ba1c94bb64e38e Mon Sep 17 00:00:00 2001
From: qaiu <736226400@qq.com>
Date: Wed, 21 Jun 2023 02:53:24 +0000
Subject: [PATCH 2/3] =?UTF-8?q?Cow=E8=A7=A3=E6=9E=90=E9=87=8D=E5=A4=8D?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AE=9E=E4=BE=8BVertxHolder.getVertxInstanc?=
=?UTF-8?q?e()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 8736487..1d7bbca 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,6 +2,7 @@ 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;
@@ -24,7 +25,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();
From 0d5b771db8817b7d9aa7f5865eaab01b58e6954f Mon Sep 17 00:00:00 2001
From: qaiu <736226400@qq.com>
Date: Wed, 21 Jun 2023 02:53:58 +0000
Subject: [PATCH 3/3] Zzz
---
.../src/main/java/cn/qaiu/lz/common/parser/impl/CowTool.java | 1 -
1 file changed, 1 deletion(-)
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 1d7bbca..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
@@ -5,7 +5,6 @@ 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;