Merge remote-tracking branch 'origin/master' into 6.3.x

This commit is contained in:
William Cheng
2022-11-01 17:42:59 +08:00
1972 changed files with 36976 additions and 6630 deletions

View File

@@ -4,13 +4,13 @@ import io.ktor.client.HttpClient
import io.ktor.client.HttpClientConfig
import io.ktor.client.engine.HttpClientEngine
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.serialization.kotlinx.json.*
import io.ktor.client.request.*
import io.ktor.client.request.forms.FormDataContent
import io.ktor.client.request.forms.MultiPartFormDataContent
import io.ktor.client.request.header
import io.ktor.client.request.parameter
import io.ktor.client.statement.HttpResponse
import io.ktor.serialization.kotlinx.json.json
import io.ktor.http.*
import io.ktor.http.content.PartData
import kotlin.Unit
@@ -142,9 +142,9 @@ open class ApiClient(
}
this.method = requestConfig.method.httpMethod
headers.filter { header -> !UNSAFE_HEADERS.contains(header.key) }.forEach { header -> this.header(header.key, header.value) }
if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH))
if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH)) {
this.setBody(body)
}
}
}

View File

@@ -29,6 +29,7 @@ import kotlinx.serialization.encoding.*
* @param n1
*/
@Serializable
data class Apa (
@SerialName(value = "i0") @Required val i0: kotlin.Int,