ahdoawhfo/netdisk-fast-download
1
0
Fork 0
mirror of https://github.com/qaiu/netdisk-fast-download.git synced 2025-12-17 04:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed. ye解析,去除正则匹配, 分享key去除后缀, #123, #125

Browse Source
This commit is contained in:
q
2025-09-15 09:44:32 +08:00
parent b67544f0cd
commit 6647fc5371
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parser/src/main/java/cn/qaiu/parser/impl/YeTool.java
View File

@@ -66,11 +66,11 @@ public class YeTool extends PanBase {
public Future<String> parse() { public Future<String> parse() {
final String dataKey = shareLinkInfo.getShareKey(); final String shareKey = shareLinkInfo.getShareKey().replaceAll("(\\..*)|(#.*)", "");
final String pwd = shareLinkInfo.getSharePassword(); final String pwd = shareLinkInfo.getSharePassword();
client.getAbs(UriTemplate.of(GET_FILE_INFO_URL)) client.getAbs(UriTemplate.of(GET_FILE_INFO_URL))
.setTemplateParam("shareKey", dataKey) .setTemplateParam("shareKey", shareKey)
.setTemplateParam("pwd", pwd) .setTemplateParam("pwd", pwd)
.setTemplateParam("ParentFileId", "0") .setTemplateParam("ParentFileId", "0")
// .setTemplateParam("authKey", AESUtils.getAuthKey("/a/api/share/get")) // .setTemplateParam("authKey", AESUtils.getAuthKey("/a/api/share/get"))
@@ -79,13 +79,13 @@ public class YeTool extends PanBase {
.send().onSuccess(res2 -> { .send().onSuccess(res2 -> {
JsonObject infoJson = asJson(res2); JsonObject infoJson = asJson(res2);
if (infoJson.getInteger("code") != 0) { if (infoJson.getInteger("code") != 0) {
fail("{} 状态码异常 {}", dataKey, infoJson); fail("{} 状态码异常 {}", shareKey, infoJson);
return; return;
} }
JsonObject getFileInfoJson = JsonObject getFileInfoJson =
infoJson.getJsonObject("data").getJsonArray("InfoList").getJsonObject(0); infoJson.getJsonObject("data").getJsonArray("InfoList").getJsonObject(0);
getFileInfoJson.put("ShareKey", dataKey); getFileInfoJson.put("ShareKey", shareKey);
// 判断是否为文件夹: data->InfoList->0->Type: 1为文件夹, 0为文件 // 判断是否为文件夹: data->InfoList->0->Type: 1为文件夹, 0为文件
try { try {
@@ -95,7 +95,7 @@ public class YeTool extends PanBase {
return; return;
} }
} catch (Exception exception) { } catch (Exception exception) {
fail("该分享[{}]解析异常: {}", dataKey, exception.getMessage()); fail("该分享[{}]解析异常: {}", shareKey, exception.getMessage());
return; return;
} }
@@ -197,7 +197,6 @@ public class YeTool extends PanBase {
String shareKey = shareLinkInfo.getShareKey(); // 分享链接的唯一标识 String shareKey = shareLinkInfo.getShareKey(); // 分享链接的唯一标识
String pwd = shareLinkInfo.getSharePassword(); // 分享密码 String pwd = shareLinkInfo.getSharePassword(); // 分享密码
String parentFileId = "0"; // 根目录的文件ID String parentFileId = "0"; // 根目录的文件ID
String shareId = shareLinkInfo.getShareKey(); // String.valueOf(AESUtils.idEncrypt(dataKey));
// 如果参数里的目录ID不为空，则直接解析目录 // 如果参数里的目录ID不为空，则直接解析目录
String dirId = (String) shareLinkInfo.getOtherParam().get("dirId"); String dirId = (String) shareLinkInfo.getOtherParam().get("dirId");