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

app/src/main/java/com/github/catvod/bean/ali/Item.java

@@ -87,11 +87,11 @@ public class Item implements Comparable<Item> {
     }
 
     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());
     }
 }

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<String, String> 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<String, List<String>> 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<Vod> 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);
     }
-}
+}

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;
+            if (matcher.find()) text = matcher.group(1) + " " + text;
-            return Integer.parseInt(text.replaceAll("\\D+", ""));
+            return text.replaceAll("\\D+", "");
         } catch (Exception e) {
-            return -1;
+            return "";
         }
     }
 }

jar/custom_spider.jar.md5

@@ -1 +1 @@
-e202ef069c4742cadfd707f4b144ed2a
+a0fb5dc6e2d2199a6663c3d5cee4bedb

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": [
     {

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": [
     {