diff --git a/app/build.gradle b/app/build.gradle index 990ec829..2da283c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,7 +85,7 @@ 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-netty:2.3.13' + implementation 'io.ktor:ktor-server-jetty: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 a60a780b..73a140fa 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -68,6 +68,7 @@ -dontwarn org.eclipse.jetty.npn.NextProtoNego$ServerProvider -dontwarn org.eclipse.jetty.npn.NextProtoNego -dontwarn reactor.blockhound.integration.BlockHoundIntegration + # Ktor Server @@ -91,4 +92,13 @@ } --keepattributes SourceFile,LineNumberTable \ No newline at end of file +-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 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 4855cf73..38dbad6d 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.netty.Netty +import io.ktor.server.jetty.Jetty import io.ktor.server.plugins.callloging.CallLogging import io.ktor.server.response.respondBytesWriter import io.ktor.server.response.respondText @@ -32,13 +32,14 @@ object KtorServer { private val infos = mutableMapOf>() var ser: io.ktor.server.engine.ApplicationEngine? = null var port = 10010 + //每个片1MB private val partSize = 1024 * 1024 * 1 fun init() { do { try { - ser = embeddedServer(Netty, port) { + ser = embeddedServer(Jetty, port) { install(CallLogging) diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 458a4a50..3e9b3c47 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 0f58bce0..3014fe32 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -17225c9a50847a636efd8fc8d70090f3 +433aa9783b078958774623d1922795cd diff --git a/json/test.json b/json/test.json index 42644877..bf1d55b0 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;17225c9a50847a636efd8fc8d70090f3", + "spider": "https://gh.llkk.cc/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;433aa9783b078958774623d1922795cd", "lives": [ { "name": "电视直播",