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

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

@@ -34,8 +34,8 @@ public class AList extends Spider {
 
     private List<Filter> getFilter() {
         List<Filter> items = new ArrayList<>();
-        items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date"))));
+        items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date"))));
-        items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("⬆", "asc"), new Filter.Value("⬇", "desc"))));
+        items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("⬆", "asc"), new Filter.Value("⬇", "desc"))));
         return items;
     }
 
@@ -71,8 +71,8 @@ public class AList extends Spider {
     @Override
     public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
         fetchRule();
-        String type = extend.containsKey("type") ? extend.get("type") : "name";
+        String type = extend.containsKey("type") ? extend.get("type") : "";
-        String order = extend.containsKey("order") ? extend.get("order") : "asc";
+        String order = extend.containsKey("order") ? extend.get("order") : "";
         List<Item> folders = new ArrayList<>();
         List<Item> files = new ArrayList<>();
         List<Vod> list = new ArrayList<>();
@@ -80,8 +80,10 @@ public class AList extends Spider {
             if (item.isFolder()) folders.add(item);
             else files.add(item);
         }
-        Sorter.sort(type, order, folders);
+        if (!TextUtils.isEmpty(type) && !TextUtils.isEmpty(order)) {
-        Sorter.sort(type, order, files);
+            Sorter.sort(type, order, folders);
+            Sorter.sort(type, order, files);
+        }
         for (Item item : folders) list.add(item.getVod(tid));
         for (Item item : files) list.add(item.getVod(tid));
         return Result.get().vod(list).page().string();

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

@@ -90,6 +90,7 @@ public class Ali {
     private boolean check401(String result) {
         if (result.contains("AccessTokenInvalid")) return refreshAccessToken();
         if (result.contains("ShareLinkTokenInvalid")) return refreshShareToken();
+        if (result.contains("InvalidParameterNotMatch")) return refreshShareToken();
         return false;
     }
 
@@ -184,7 +185,7 @@ public class Ali {
         try {
             JSONObject body = new JSONObject();
             String token = auth.getRefreshToken();
-            if (token.startsWith("http")) token = OkHttp.string(token);
+            if (token.startsWith("http")) token = OkHttp.string(token).replaceAll("[^A-Za-z0-9]", "");
             body.put("refresh_token", token);
             body.put("grant_type", "refresh_token");
             JSONObject object = new JSONObject(post("https://auth.aliyundrive.com/v2/account/token", body));

jar/custom_spider.jar.md5

@@ -1 +1 @@
-bad875495a9d88aeb0dc1744e9c85feb
+279424aa7be0e38dbd884daf8913c1d4

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bad875495a9d88aeb0dc1744e9c85feb",
+  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "lives": [
     {
@@ -18,18 +18,9 @@
       "filterable": 1,
       "ext": {
         "drives": [
-          {
-            "name": "9T",
-            "server": "https://drive.9t.ee"
-          },
           {
             "name": "木偶",
             "server": "https://www.kugutsu.ml"
-          },
-          {
-            "name": "秋雨",
-            "server": "https://share.laowang.me",
-            "password": "s8;K^h[j<b"
           }
         ]
       }

json/alist.json

@@ -1,9 +1,5 @@
 {
   "drives": [
-    {
-      "name": "歐逼",
-      "server": "https://alistcn.repl.co"
-    },
     {
       "name": "小雅",
       "server": "http://alist.xiaoya.pro"
@@ -20,10 +16,6 @@
       "name": "星夢",
       "server": "https://pan.bashroot.top"
     },
-    {
-      "name": "晴園",
-      "server": "https://alist.52qy.repl.co"
-    },
     {
       "name": "梓澪",
       "server": "https://zi0.cc"
@@ -44,10 +36,6 @@
       "name": "七米藍",
       "server": "https://al.chirmyram.com"
     },
-    {
-      "name": "浩瀚吧",
-      "server": "https://8023.haohanba.cn"
-    },
     {
       "name": "雲播放",
       "server": "https://quanzi.laoxianghuijia.cn"
@@ -63,10 +51,6 @@
     {
       "name": "資源小站",
       "server": "https://960303.xyz"
-    },
-    {
-      "name": "DISK",
-      "server": "http://124.222.140.243:8080"
     }
   ]
 }

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bad875495a9d88aeb0dc1744e9c85feb",
+  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4",
   "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
   "lives": [
     {