From 78580714a3030e45dd30253d48924647a5eca3ac Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 1 Dec 2023 23:00:17 +0800 Subject: [PATCH] Fix bug --- .../java/com/github/catvod/api/AliYun.java | 10 +++++----- jar/custom_spider.jar | Bin 366834 -> 366456 bytes jar/custom_spider.jar.md5 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/catvod/api/AliYun.java b/app/src/main/java/com/github/catvod/api/AliYun.java index 0c5b03f2..d8066fc5 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -328,7 +328,7 @@ public class AliYun { public String getShareDownloadUrl(String shareId, String fileId) { try { - if (shareDownloadMap.containsKey(fileId) && shareDownloadMap.get(fileId) != null && !isExpire(shareDownloadMap.get(fileId))) return shareDownloadMap.get(fileId); + if (shareDownloadMap.containsKey(fileId) && shareDownloadMap.get(fileId) != null && !isExpire(shareDownloadMap.get(fileId), 600)) return shareDownloadMap.get(fileId); refreshShareToken(shareId); SpiderDebug.log("getShareDownloadUrl..." + fileId); JsonObject param = new JsonObject(); @@ -347,7 +347,7 @@ public class AliYun { public String getDownloadUrl(String shareId, String fileId) { try { - if (downloadMap.containsKey(fileId) && downloadMap.get(fileId) != null && !isExpire(downloadMap.get(fileId))) return downloadMap.get(fileId); + if (downloadMap.containsKey(fileId) && downloadMap.get(fileId) != null && !isExpire(downloadMap.get(fileId), 900)) return downloadMap.get(fileId); refreshShareToken(shareId); SpiderDebug.log("getDownloadUrl..." + fileId); tempIds.add(0, copy(shareId, fileId)); @@ -460,10 +460,10 @@ public class AliYun { return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s&templateId=%s&mediaId=%s", cate, shareId, fileId, templateId, mediaId); } - private static boolean isExpire(String url) { + private static boolean isExpire(String url, int time) { String expires = new UrlQuerySanitizer(url).getValue("x-oss-expires"); if (TextUtils.isEmpty(expires)) return false; - return Long.parseLong(expires) - getTimeStamp() <= 15; + return Long.parseLong(expires) - getTimeStamp() <= time / 60; } private static long getTimeStamp() { @@ -492,7 +492,7 @@ public class AliYun { } else if ("m3u8".equals(cate)) { lock.lock(); String mediaUrl = m3u8MediaMap.get(fileId).get(mediaId); - if (isExpire(mediaUrl)) { + if (isExpire(mediaUrl, 900)) { getM3u8(shareId, fileId, templateId); mediaUrl = m3u8MediaMap.get(fileId).get(mediaId); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index ae5181aa15c15480459ca7d0ac85170bbaa75727..8c9cfae115f30b1571df609350b71da7d976ebbf 100644 GIT binary patch literal 366456 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