From 088fee9a4d4b499447f7c600eb9a4eaf11389fc8 Mon Sep 17 00:00:00 2001
From: qaiu <736226400@qq.com>
Date: Tue, 1 Oct 2024 17:38:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=20add=EF=BC=9A123=E4=BA=91=E7=9B=98=E7=9A=84?=
=?UTF-8?q?=E6=96=B0=E5=9F=9F=E5=90=8D=202.=20update:=20=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?API=E6=94=AF=E6=8C=81ce=E7=9B=98=203.=20=E7=BC=93=E5=AD=98?=
=?UTF-8?q?=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cn/qaiu/parser/PanDomainTemplate.java | 2 +-
.../java/cn/qaiu/parser/ParserCreate.java | 24 ++++++++++++++++++-
web-front/public/index.html | 4 ----
.../cn/qaiu/lz/web/controller/ParserApi.java | 16 +++++--------
web-service/src/main/resources/app-dev.yml | 4 ++--
.../src/main/resources/http-tools/test.http | 7 +++++-
6 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
index 7667aec..afff340 100644
--- a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
+++ b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java
@@ -57,7 +57,7 @@ public enum PanDomainTemplate {
WsTool.class),
// https://www.123pan.com/s/
YE("123网盘",
- "https://www\\.123pan\\.com/s/(.+)",
+ "https://www\\.(123pan|123865|123684)\\.com/s/(.+)",
"https://www.123pan.com/s/{shareKey}",
YeTool.class),
// https://www.ecpan.cn/web/#/yunpanProxy?path=%2F%23%2Fdrive%2Foutside&data={code}&isShare=1
diff --git a/parser/src/main/java/cn/qaiu/parser/ParserCreate.java b/parser/src/main/java/cn/qaiu/parser/ParserCreate.java
index 7ba8384..38c4aee 100644
--- a/parser/src/main/java/cn/qaiu/parser/ParserCreate.java
+++ b/parser/src/main/java/cn/qaiu/parser/ParserCreate.java
@@ -42,7 +42,9 @@ public class ParserCreate {
String standardUrl = getStandardUrlTemplate().replace("{shareKey}", shareKey);
shareLinkInfo.setShareUrl(shareUrl);
shareLinkInfo.setShareKey(shareKey);
- shareLinkInfo.setStandardUrl(standardUrl);
+ if (!(panDomainTemplate == PanDomainTemplate.CE)) {
+ shareLinkInfo.setStandardUrl(standardUrl);
+ }
return this;
}
throw new IllegalArgumentException("Invalid share URL for " + this.panDomainTemplate.getDisplayName());
@@ -101,6 +103,9 @@ public class ParserCreate {
.type(panDomainTemplate.name().toLowerCase())
.panName(panDomainTemplate.getDisplayName())
.shareUrl(shareUrl).build();
+ if (panDomainTemplate == PanDomainTemplate.CE) {
+ shareLinkInfo.setStandardUrl(shareUrl);
+ }
ParserCreate parserCreate = new ParserCreate(panDomainTemplate, shareLinkInfo);
return parserCreate.normalizeShareLink();
}
@@ -120,4 +125,21 @@ public class ParserCreate {
throw new IllegalArgumentException("No enum constant for type name: " + type);
}
}
+
+ // 生成parser短链path(不包含domainName)
+ public String genPathSuffix() {
+
+ String path;
+ if (panDomainTemplate == PanDomainTemplate.CE) {
+ // 处理Cloudreve(ce)类: pan.huang1111.cn_s_wDz5TK _ -> /
+ path = this.shareLinkInfo.getType() + "/"
+ + this.shareLinkInfo.getShareUrl()
+ .substring("https://".length()).replace("/", "_");
+ } else {
+ path = this.shareLinkInfo.getType() + "/" + this.shareLinkInfo.getShareKey();
+ }
+ String sharePassword = this.shareLinkInfo.getSharePassword();
+ return path + (StringUtils.isBlank(sharePassword) ? "" : ("@" + sharePassword));
+ }
+
}
diff --git a/web-front/public/index.html b/web-front/public/index.html
index e5d2978..57a2339 100644
--- a/web-front/public/index.html
+++ b/web-front/public/index.html
@@ -9,10 +9,6 @@
content="Netdisk fast download,网盘直链解析工具">
-
-
-