diff --git a/app/build.gradle b/app/build.gradle index c0a2f0c4..58996cd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,9 +86,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" implementation 'io.ktor:ktor-server-core:2.3.4' implementation 'io.ktor:ktor-server-netty:2.3.4' - implementation 'io.ktor:ktor-client-content-negotiation:2.3.4' - implementation 'io.ktor:ktor-server-content-negotiation:2.3.4' - implementation 'io.ktor:ktor-client-logging-jvm:2.3.4' + + implementation 'io.ktor:ktor-server-call-logging:2.3.4' //implementation 'wang.harlon.quickjs:wrapper-java:1.0.0' // implementation(ext: 'aar', name: 'quickjs', group: 'fongmi', version: 'release') // api 'wang.harlon.quickjs:wrapper-android:2.0.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8e7d01ab..6a8c2f8b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -78,4 +78,6 @@ -dontwarn org.eclipse.jetty.npn.NextProtoNego$Provider -dontwarn org.eclipse.jetty.npn.NextProtoNego$ServerProvider -dontwarn org.eclipse.jetty.npn.NextProtoNego --dontwarn reactor.blockhound.integration.BlockHoundIntegration \ No newline at end of file +-dontwarn reactor.blockhound.integration.BlockHoundIntegration +-dontwarn org.slf4j** +-dontwarn org.slf4j.** \ 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 24c4dd8b..4b1d7a2c 100644 --- a/app/src/main/java/com/github/catvod/utils/ktorServer.kt +++ b/app/src/main/java/com/github/catvod/utils/ktorServer.kt @@ -8,8 +8,10 @@ import io.ktor.http.HttpHeaders import io.ktor.http.HttpStatusCode import io.ktor.server.application.ApplicationCall 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.plugins.callloging.CallLogging import io.ktor.server.response.respondBytesWriter import io.ktor.server.response.respondText import io.ktor.server.routing.get @@ -32,6 +34,7 @@ object KtorServer { private val partSize = 1024 * 1024 * 1 private val server by lazy { embeddedServer(Netty, port) { + install(CallLogging) routing { @@ -107,7 +110,8 @@ object KtorServer { } // 解析范围请求 - val (startPoint, endPoint) = parseRangePoint(rangeHeader + val (startPoint, endPoint) = parseRangePoint( + rangeHeader ) SpiderDebug.log("startPoint: $startPoint; endPoint: $endPoint") val contentLength = getContentLength(url, headers) diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 96201dba..ca281ce8 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 e195de78..676c334e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -26a0a9482a83ef213e4e1222307b5258 +dd6c6d1e9aa097c900a0769c1f181147 diff --git a/json/test.json b/json/test.json index 40921ea0..195d8cf8 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;26a0a9482a83ef213e4e1222307b5258", + "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;dd6c6d1e9aa097c900a0769c1f181147", "lives": [ { "name": "电视直播",