diff --git a/app/src/main/java/com/github/catvod/spider/AList.java b/app/src/main/java/com/github/catvod/spider/AList.java index ef223d88..ac50f1d6 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -34,8 +34,8 @@ public class AList extends Spider { private List getFilter() { List 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("order", "排序方式", Arrays.asList(new Filter.Value("⬆", "asc"), new Filter.Value("⬇", "desc")))); + 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("預設", ""), 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 extend) throws Exception { fetchRule(); - String type = extend.containsKey("type") ? extend.get("type") : "name"; - String order = extend.containsKey("order") ? extend.get("order") : "asc"; + String type = extend.containsKey("type") ? extend.get("type") : ""; + String order = extend.containsKey("order") ? extend.get("order") : ""; List folders = new ArrayList<>(); List files = new ArrayList<>(); List 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); - Sorter.sort(type, order, files); + if (!TextUtils.isEmpty(type) && !TextUtils.isEmpty(order)) { + 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(); diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 92e2009c..5d954339 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/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)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 1b9277bd..38ffc9f7 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 782d7e52..b58a57f9 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -bad875495a9d88aeb0dc1744e9c85feb +279424aa7be0e38dbd884daf8913c1d4 diff --git a/json/adult.json b/json/adult.json index 0ec87365..31abd986 100644 --- a/json/adult.json +++ b/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