Pārlūkot izejas kodu

fix: 不提交null请求参数

drake 2 gadi atpakaļ
vecāks
revīzija
8047dd3774

+ 11 - 5
net/src/main/java/com/drake/net/request/BodyRequest.kt

@@ -62,31 +62,37 @@ open class BodyRequest : BaseRequest() {
     }
 
     override fun param(name: String, value: String?, encoded: Boolean) {
+        value ?: return
         if (encoded) {
-            formBody.addEncoded(name, value ?: return)
+            formBody.addEncoded(name, value)
         } else {
-            formBody.add(name, value ?: return)
+            formBody.add(name, value)
         }
     }
 
     override fun param(name: String, value: Number?) {
+        value ?: return
         formBody.add(name, value.toString())
     }
 
     override fun param(name: String, value: Boolean?) {
+        value ?: return
         formBody.add(name, value.toString())
     }
 
     fun param(name: String, value: RequestBody?) {
-        partBody.addFormDataPart(name, null, value ?: return)
+        value ?: return
+        partBody.addFormDataPart(name, null, value)
     }
 
     fun param(name: String, value: ByteString?) {
-        partBody.addFormDataPart(name, null, value?.toRequestBody() ?: return)
+        value ?: return
+        partBody.addFormDataPart(name, null, value.toRequestBody())
     }
 
     fun param(name: String, value: ByteArray?) {
-        partBody.addFormDataPart(name, null, value?.toRequestBody() ?: return)
+        value ?: return
+        partBody.addFormDataPart(name, null, value.toRequestBody())
     }
 
     fun param(name: String, value: File?) {

+ 4 - 0
net/src/main/java/com/drake/net/request/UrlRequest.kt

@@ -19,10 +19,12 @@ package com.drake.net.request
 open class UrlRequest : BaseRequest() {
 
     override fun param(name: String, value: String?) {
+        value ?: return
         httpUrl.setQueryParameter(name, value)
     }
 
     override fun param(name: String, value: String?, encoded: Boolean) {
+        value ?: return
         if (encoded) {
             httpUrl.setEncodedQueryParameter(name, value)
         } else {
@@ -31,10 +33,12 @@ open class UrlRequest : BaseRequest() {
     }
 
     override fun param(name: String, value: Number?) {
+        value ?: return
         httpUrl.setQueryParameter(name, value.toString())
     }
 
     override fun param(name: String, value: Boolean?) {
+        value ?: return
         httpUrl.setQueryParameter(name, value.toString())
     }
 }