diff --git a/app/src/main/java/com/github/catvod/spider/PushAgent.java b/app/src/main/java/com/github/catvod/spider/PushAgent.java index a65a32f..50c70a1 100644 --- a/app/src/main/java/com/github/catvod/spider/PushAgent.java +++ b/app/src/main/java/com/github/catvod/spider/PushAgent.java @@ -24,6 +24,11 @@ import java.util.*; import java.util.concurrent.locks.ReentrantLock; import java.util.regex.Matcher; import java.util.regex.Pattern; +/**6161-自动生成阿里云链接 61-默认阿里云播放 2-默认4K播放 + * TODO(阿里云 各种详情页面解析) + * @author yangqiang + * @date 2022/9/19 9:50 + */ public class PushAgent extends Spider { private static long timeToken = 0; @@ -426,7 +431,7 @@ public class PushAgent extends Spider { playLists.add(TextUtils.join("#", vodItems)); playLists.add(TextUtils.join("#", vodItems)); vodAtom.put("vod_play_url", TextUtils.join("$$$", playLists)); - vodAtom.put("vod_play_from", "4K原画$$$AliYun"); + vodAtom.put("vod_play_from", "AliYun$$$4K原画"); } JSONObject result = new JSONObject(); JSONArray list = new JSONArray(); diff --git a/app/src/main/java/com/github/catvod/spider/Upyunso.java b/app/src/main/java/com/github/catvod/spider/Upyunso.java index 3226ed0..07a8571 100644 --- a/app/src/main/java/com/github/catvod/spider/Upyunso.java +++ b/app/src/main/java/com/github/catvod/spider/Upyunso.java @@ -20,6 +20,7 @@ public class Upyunso extends PushAgent { @Override public String searchContent(String key, boolean z) { try { + fetchRule(false, 0); JSONArray jSONArray = new JSONArray(); key = URLEncoder.encode(key); JSONArray arr = Base64Utils.getJSONByUrl("https://api.upyunso.com/search?keyword=" + key+"&page=1"); diff --git a/app/src/main/java/com/github/catvod/spider/Yiso.java b/app/src/main/java/com/github/catvod/spider/Yiso.java index f908263..f24f490 100644 --- a/app/src/main/java/com/github/catvod/spider/Yiso.java +++ b/app/src/main/java/com/github/catvod/spider/Yiso.java @@ -24,7 +24,7 @@ public class Yiso extends PushAgent { @Override public String searchContent(String key, boolean quick) { try { - PushAgent.getRefreshTk(); + fetchRule(false, 0); HashMap LT = sHeaders(); String url = "https://yiso.fun/api/search?name=" + URLEncoder.encode(key) + "&from=ali"; diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index 7792c47..6da7c9d 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -21,7 +21,7 @@ public class Misc { public static JSONObject siteRule = null; public static Integer type=1; public static String btype="N"; - public static boolean rflag = true; + public static boolean rflag = false; public static String apikey = "0ac44ae016490db2204ce0a042db2916"; public static boolean isVip(String url) { // 适配2.0.6的调用应用内解析列表的支持, 需要配合直连分析一起使用,参考cjt影视和极品直连