diff --git a/app/build.gradle b/app/build.gradle index 2da283c0..580098cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,7 @@ plugins { id 'com.android.application' id 'ru.cleverpumpkin.proguard-dictionaries-generator' id 'org.jetbrains.kotlin.android' + } java { toolchain { @@ -85,7 +86,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" implementation 'io.ktor:ktor-server-core:2.3.13' - implementation 'io.ktor:ktor-server-jetty:2.3.13' + + implementation 'io.ktor:ktor-server-netty:2.3.13' implementation 'io.ktor:ktor-server-call-logging:2.3.13' implementation("org.slf4j:slf4j-android:1.7.36") diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 73a140fa..dd60b5e0 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -94,11 +94,9 @@ -keepattributes SourceFile,LineNumberTable -# Please add these rules to your existing keep rules in order to suppress warnings. -# This is generated automatically by the Android Gradle plugin. --dontwarn java.lang.Module --dontwarn javax.naming.ldap.LdapName --dontwarn javax.naming.ldap.Rdn --dontwarn org.eclipse.jetty.alpn.ALPN$Provider --dontwarn org.eclipse.jetty.alpn.ALPN$ServerProvider --dontwarn org.eclipse.jetty.alpn.ALPN \ No newline at end of file +-keepattributes Signature,InnerClasses +-keepclasseswithmembers class io.netty.** { + *; +} +-dontwarn io.netty.** +-dontwarn sun.** \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/utils/ktorServer.kt b/app/src/main/java/com/github/catvod/utils/ktorServer.kt index 38dbad6d..01320600 100644 --- a/app/src/main/java/com/github/catvod/utils/ktorServer.kt +++ b/app/src/main/java/com/github/catvod/utils/ktorServer.kt @@ -11,7 +11,7 @@ import io.ktor.server.application.call import io.ktor.server.application.install import io.ktor.server.engine.embeddedServer -import io.ktor.server.jetty.Jetty +import io.ktor.server.netty.Netty import io.ktor.server.plugins.callloging.CallLogging import io.ktor.server.response.respondBytesWriter import io.ktor.server.response.respondText @@ -39,7 +39,7 @@ object KtorServer { do { try { - ser = embeddedServer(Jetty, port) { + ser = embeddedServer(Netty, port) { install(CallLogging) diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 3e9b3c47..ab380f32 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 3014fe32..82468380 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -433aa9783b078958774623d1922795cd +8a9fee904fd090f7eb5ec9eb73fc257a diff --git a/json/test.json b/json/test.json index bf1d55b0..4aae7f90 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;433aa9783b078958774623d1922795cd", + "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;8a9fee904fd090f7eb5ec9eb73fc257a", "lives": [ { "name": "电视直播",