🐛 调整get请求无需传参时候的末尾带?号导致接口调用失败问题

stars-one · May 7, 2023 · dd5371c · dd5371c
1 parent 809e281
commit dd5371c
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/main/kotlin/com/starsone/controls/utils/net/NetworkUtil.kt b/src/main/kotlin/com/starsone/controls/utils/net/NetworkUtil.kt
@@ -169,9 +169,14 @@ object NetworkUtil {
             """$t=$u"""
         }.joinToString("&")
 
-        var finalUrl = url + param
-        if (!url.endsWith("?")) {
-            finalUrl = url + "?" + param
+        val finalUrl = if (url.endsWith("?")) {
+            url + param
+        } else {
+            if (param.isBlank()) {
+                url
+            } else {
+                "$url?$param"
+            }
         }
         val builder = Request.Builder()
                 .url(finalUrl)
@@ -197,10 +202,16 @@ object NetworkUtil {
             """$t=$u"""
         }.joinToString("&")
 
-        var finalUrl = url + param
-        if (!url.endsWith("?")) {
-            finalUrl = url + "?" + param
+        val finalUrl = if (url.endsWith("?")) {
+            url + param
+        } else {
+            if (param.isBlank()) {
+                url
+            } else {
+                "$url?$param"
+            }
         }
+
         val builder = Request.Builder()
                 .url(finalUrl)
         headers.forEach { (t, u) ->
@@ -249,7 +260,6 @@ object NetworkUtil {
     }
 
 
-
     /**
      * 回调函数
      *