shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: rm CIO

Browse Source 
Signed-off-by: 白池 <whitechi73@outlook.com>
This commit is contained in:
白池 2024-03-08 01:19:26 +08:00
parent a06708bf95
commit 69cdbad643
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@ -202,8 +202,7 @@ dependencies {
implementation(kotlinx("io-jvm", "0.1.16")) implementation(kotlinx("io-jvm", "0.1.16"))
implementation(ktor("client", "core")) implementation(ktor("client", "core"))
implementation(ktor("client", "content-negotiation")) implementation(ktor("client", "okhttp"))
implementation(ktor("client", "cio"))
implementation(ktor("serialization", "kotlinx-json")) implementation(ktor("serialization", "kotlinx-json"))
implementation(project(":xposed")) implementation(project(":xposed"))

3
xposed/build.gradle.kts
View File

@ -82,8 +82,7 @@ dependencies {
implementation(kotlinx("serialization-protobuf", "1.6.2")) implementation(kotlinx("serialization-protobuf", "1.6.2"))
implementation(ktor("client", "core")) implementation(ktor("client", "core"))
implementation(ktor("client", "content-negotiation")) implementation(ktor("client", "okhttp"))
implementation(ktor("client", "cio"))
implementation(ktor("serialization", "kotlinx-json")) implementation(ktor("serialization", "kotlinx-json"))
implementation(ktor("network", "tls-certificates")) implementation(ktor("network", "tls-certificates"))

34
xposed/src/main/java/moe/fuqiuluo/shamrock/tools/KtorClient.kt
View File

@ -1,43 +1,15 @@
package moe.fuqiuluo.shamrock.tools package moe.fuqiuluo.shamrock.tools
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.okhttp.OkHttp
import io.ktor.client.plugins.HttpTimeout import io.ktor.client.plugins.HttpTimeout
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.serialization.kotlinx.json.json
import kotlinx.serialization.json.Json
val GlobalClient: HttpClient by lazy { val GlobalClient by lazy {
HttpClient { HttpClient(OkHttp) {
//install(HttpCookies)
install(HttpTimeout) { install(HttpTimeout) {
requestTimeoutMillis = 15000 requestTimeoutMillis = 15000
connectTimeoutMillis = 15000 connectTimeoutMillis = 15000
socketTimeoutMillis = 15000 socketTimeoutMillis = 15000
} }
install(ContentNegotiation) {
json(Json {
prettyPrint = true
isLenient = true
})
}
}
}
val GlobalClientNoRedirect: HttpClient by lazy {
HttpClient {
//install(HttpCookies)
followRedirects = false
install(HttpTimeout) {
requestTimeoutMillis = 15000
connectTimeoutMillis = 15000
socketTimeoutMillis = 15000
}
install(ContentNegotiation) {
json(Json {
prettyPrint = true
isLenient = true
})
}
} }
} }