diff --git a/app/src/main/java/com/github/catvod/bean/ali/Item.java b/app/src/main/java/com/github/catvod/bean/ali/Item.java index 9ff85e4a..5556ad7e 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/Item.java +++ b/app/src/main/java/com/github/catvod/bean/ali/Item.java @@ -87,11 +87,11 @@ public class Item implements Comparable { } public String getSortName() { - return TextUtils.join(" ", Arrays.asList(getParent(), getName())).trim(); + return TextUtils.join(" ", Arrays.asList(getParent(), Utils.getDigit(getName()))).trim(); } @Override public int compareTo(Item item) { - return Integer.compare(Utils.getDigit(getSortName()), Utils.getDigit(item.getSortName())); + return getSortName().compareTo(item.getSortName()); } } diff --git a/app/src/main/java/com/github/catvod/spider/Zhaozy.java b/app/src/main/java/com/github/catvod/spider/Zhaozy.java index b286cee3..56195c09 100644 --- a/app/src/main/java/com/github/catvod/spider/Zhaozy.java +++ b/app/src/main/java/com/github/catvod/spider/Zhaozy.java @@ -24,7 +24,7 @@ public class Zhaozy extends Ali { private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)"); private final Pattern regexVid = Pattern.compile("(\\S+)"); - private final String siteUrl = "https://zhaoziyuan.la/"; + private final String siteUrl = "https://zhaoziyuan.me/"; private String username; private String password; @@ -42,7 +42,7 @@ public class Zhaozy extends Ali { params.put("password", password); Map headers = new HashMap<>(); headers.put("User-Agent", Utils.CHROME); - headers.put("Referer", siteUrl + "login.html"); + headers.put("Referer", siteUrl + "stop.html"); headers.put("Origin", siteUrl); Map> resp = new HashMap<>(); OkHttp.post(siteUrl + "logiu.html", params, headers, resp); @@ -69,7 +69,7 @@ public class Zhaozy extends Ali { @Override public String searchContent(String key, boolean quick) throws Exception { - String url = siteUrl + "so?filename=" + URLEncoder.encode(key); + String url = siteUrl + "sox?filename=" + URLEncoder.encode(key); Document doc = Jsoup.parse(OkHttp.string(url, getHeader())); List list = new ArrayList<>(); for (Element element : doc.select("div.li_con div.news_text")) { @@ -88,4 +88,4 @@ public class Zhaozy extends Ali { } return Result.string(list); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java index bca0f9ce..29f00c36 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -192,13 +192,13 @@ public class Utils { }); } - public static int getDigit(String text) { + public static String getDigit(String text) { try { Matcher matcher = Pattern.compile(".*(1080|720|2160|4k|4K).*").matcher(text); - if (matcher.find()) text = matcher.group(1) + text; - return Integer.parseInt(text.replaceAll("\\D+", "")); + if (matcher.find()) text = matcher.group(1) + " " + text; + return text.replaceAll("\\D+", ""); } catch (Exception e) { - return -1; + return ""; } } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6439734b..1584f530 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 6fcb3f44..388a67e5 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e202ef069c4742cadfd707f4b144ed2a +a0fb5dc6e2d2199a6663c3d5cee4bedb diff --git a/json/adult.json b/json/adult.json index 5a083fd8..8ac40eaf 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e202ef069c4742cadfd707f4b144ed2a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a0fb5dc6e2d2199a6663c3d5cee4bedb", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index c99d0be8..f283b9d7 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e202ef069c4742cadfd707f4b144ed2a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a0fb5dc6e2d2199a6663c3d5cee4bedb", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {