diff --git a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java index b8ba0aa..6c74c44 100644 --- a/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java +++ b/parser/src/main/java/cn/qaiu/parser/PanDomainTemplate.java @@ -60,8 +60,8 @@ public enum PanDomainTemplate { "https://mail.qq.com", QQTool.class), // https://wx.mail.qq.com/s?k=uAG9JR42Rqgt010mFp - QQW("QQ邮箱中转站(微信账户)", - compile("https://wx\\.mail\\.qq\\.com/s\\?k=(?.+)"), + QQW("QQ邮箱云盘", + compile("https://i?wx\\.mail\\.qq\\.com/s\\?k=(?.+)"), "https://wx.mail.qq.com/s?k={shareKey}", "https://mail.qq.com", QQwTool.class), @@ -185,7 +185,7 @@ public enum PanDomainTemplate { MMGS("咪咕音乐分享", compile("https://music\\.migu\\.cn/v3/music/song/(?.+)(\\?.*)?"), "https://music.migu.cn/v3/music/song/{shareKey}", - MkwTool.class), + MmgTool.class), // =====================私有盘解析========================== // Cloudreve自定义域名解析, 解析器CeTool兜底策略, 即任意域名如果匹配不到对应的规则, 则由CeTool统一处理, diff --git a/parser/src/main/java/cn/qaiu/parser/impl/QQwTool.java b/parser/src/main/java/cn/qaiu/parser/impl/QQwTool.java index a457868..d47e9c3 100644 --- a/parser/src/main/java/cn/qaiu/parser/impl/QQwTool.java +++ b/parser/src/main/java/cn/qaiu/parser/impl/QQwTool.java @@ -2,8 +2,6 @@ package cn.qaiu.parser.impl; import cn.qaiu.entity.ShareLinkInfo; import io.vertx.core.Future; -import io.vertx.core.MultiMap; - import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; @@ -22,6 +20,9 @@ public class QQwTool extends QQTool { String url = extractVariables(html).get("url"); if (url != null) { String url302 = url.replace("\\x26", "&"); + promise.complete(url302); + + /* clientNoRedirects.getAbs(url302).send().onSuccess(res2 -> { MultiMap headers = res2.headers(); if (headers.contains("Location")) { @@ -29,7 +30,11 @@ public class QQwTool extends QQTool { } else { fail("找不到重定向URL"); } + }).onFailure(handleFail()); + */ + } else { + fail("分享链接解析失败, 可能是链接失效"); } }).onFailure(handleFail()); diff --git a/web-service/src/main/resources/app-dev.yml b/web-service/src/main/resources/app-dev.yml index 9e30c38..ce2574b 100644 --- a/web-service/src/main/resources/app-dev.yml +++ b/web-service/src/main/resources/app-dev.yml @@ -49,7 +49,7 @@ cache: # 具体网盘的缓存配置,如果不加配置则不缓存,每次请求都会请求网盘API,格式:网盘标识: 时长 duration: ce: 5 - cow: + cow: 5 ec: 5 fc: fj: 20 @@ -57,6 +57,7 @@ cache: le: 2879 lz: 20 qq: 9999999 + qqw: 30 ws: 10 ye: -1 mne: 30