Merge branch 'main' of https://github.com/FongMi/CatVodSpider

app/src/main/java/com/github/catvod/api/AliYun.java

@@ -243,7 +243,7 @@ public class AliYun {
         List<Item> subs = new ArrayList<>();
         listFiles(shareId, new Item(getParentFileId(fileId, share)), files, subs);
         Collections.sort(files);
-        List<String> playFrom = Arrays.asList("原畫", "普畫", "極速");
+        List<String> playFrom = Arrays.asList("原畫", "普畫");
         List<String> episode = new ArrayList<>();
         List<String> playUrl = new ArrayList<>();
         for (Item file : files) episode.add(file.getDisplayName() + "$" + shareId + "+" + file.getFileId() + findSubs(file.getName(), subs));
@@ -409,7 +409,7 @@ public class AliYun {
         }
         List<Sub> subs = getSubs(ids);
         subs.addAll(getSubs(info));
-        return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string();
+        return Result.get().url(proxyUrl).m3u8().subs(subs).header(getHeader()).string();
     }
 
     private List<String> getPreviewUrl(Preview.Info info) {
@@ -489,11 +489,11 @@ public class AliYun {
         }
 
         if ("open".equals(cate)) {
+            thread = 10;
             downloadUrl = getDownloadUrl(shareId, fileId);
-            thread = 30;
         } else if ("share".equals(cate)) {
+            thread = 10;
             downloadUrl = getShareDownloadUrl(shareId, fileId);
-            thread = 30;
         } else if ("m3u8".equals(cate)) {
             lock.lock();
             String mediaUrl = m3u8MediaMap.get(fileId).get(mediaId);

app/src/main/java/com/github/catvod/spider/Ali.java

@@ -54,11 +54,10 @@ public class Ali extends Spider {
      */
     public String detailContentVodPlayFrom(List<String> ids) {
         List<String> playFrom = new ArrayList<>();
-        if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫", "極速"));
+        if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫"));
         for (int i = 1; i <= ids.size(); i++) {
             playFrom.add(String.format(Locale.getDefault(), "原畫#%02d", i));
             playFrom.add(String.format(Locale.getDefault(), "普畫#%02d", i));
-            playFrom.add(String.format(Locale.getDefault(), "極速#%02d", i));
         }
         return TextUtils.join("$$$", playFrom);
     }

app/src/main/java/com/github/catvod/utils/MultiThread.java

@@ -1,8 +1,5 @@
 package com.github.catvod.utils;
 
-import com.github.catvod.spider.Proxy;
-
-import java.net.URLEncoder;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -10,10 +7,6 @@ import fi.iki.elonen.NanoHTTPD;
 
 public class MultiThread {
 
-    public static String url(String url, int thread) {
-        return String.format(Proxy.getUrl() + "?do=multi&url=%s&thread=%d", URLEncoder.encode(url), thread);
-    }
-
     public static Object[] proxy(Map<String, String> params) throws Exception {
         String url = params.get("url");
         int thread = Integer.parseInt(params.get("thread"));

jar/custom_spider.jar.md5

@@ -1 +1 @@
-fba567f6ab0f55d841d2b464f91e6555
+d21813e2dfdd1685610b2748e96e6c3a

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;fba567f6ab0f55d841d2b464f91e6555",
+  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;d21813e2dfdd1685610b2748e96e6c3a",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;fba567f6ab0f55d841d2b464f91e6555",
+  "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;d21813e2dfdd1685610b2748e96e6c3a",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {