diff --git a/app/build.gradle b/app/build.gradle index 5dab3ec..57db186 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.github.catvod.demo" - minSdk 21 + minSdk 17 targetSdk 33 } @@ -32,9 +32,9 @@ android { } dependencies { - implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:3.12.13' implementation 'com.google.code.gson:gson:2.9.1' implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' - implementation 'com.google.zxing:core:3.5.0' + implementation 'com.google.zxing:core:3.3.0' implementation 'org.jsoup:jsoup:1.15.3' } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index 7f9eacb..e7f1828 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -4,7 +4,6 @@ import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import java.lang.reflect.Type; @@ -134,7 +133,6 @@ public class Result { return toString(); } - @NotNull @Override public String toString() { return new Gson().toJson(this); diff --git a/app/src/main/java/com/github/catvod/spider/Proxy.java b/app/src/main/java/com/github/catvod/spider/Proxy.java index 43db924..9a3e016 100644 --- a/app/src/main/java/com/github/catvod/spider/Proxy.java +++ b/app/src/main/java/com/github/catvod/spider/Proxy.java @@ -5,7 +5,7 @@ import com.github.catvod.crawler.SpiderDebug; import com.github.catvod.net.OkHttpUtil; import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; +import java.io.UnsupportedEncodingException; import java.util.Map; import java.util.Objects; @@ -13,10 +13,10 @@ public class Proxy extends Spider { private static int port = -1; - public static Object[] proxy(Map params) { + public static Object[] proxy(Map params) throws UnsupportedEncodingException { switch (Objects.requireNonNull(params.get("do"))) { case "ck": - return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes(StandardCharsets.UTF_8))}; + return new Object[]{200, "text/plain; charset=utf-8", new ByteArrayInputStream("ok".getBytes("UTF-8"))}; case "ali": return Ali.vod(params); default: diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index 1f178b4..9884556 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -15,10 +15,7 @@ import org.json.JSONException; import org.json.JSONObject; import java.math.BigInteger; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -130,10 +127,10 @@ public class Misc { } public static String MD5(String src) { - return MD5(src, StandardCharsets.UTF_8); + return MD5(src, "UTF-8"); } - public static String MD5(String src, Charset charset) { + public static String MD5(String src, String charset) { try { MessageDigest md = MessageDigest.getInstance("MD5"); byte[] messageDigest = md.digest(src.getBytes(charset)); @@ -141,7 +138,7 @@ public class Misc { StringBuilder sb = new StringBuilder(no.toString(16)); while (sb.length() < 32) sb.insert(0, "0"); return sb.toString().toLowerCase(); - } catch (NoSuchAlgorithmException e) { + } catch (Exception e) { return ""; } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6a6c24e..7b02def 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 120a4bb..3b7a01f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -940f5635d30de6ef9025c334afaf706b +efc8d7ab428b7bb8459f6d5614388ee2