update: 移除一处无用代码 & 其他内部接口优化

wyouflf · Oct 19, 2019 · aa2d8f1 · aa2d8f1
1 parent a9fdbab
commit aa2d8f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/xutils/src/main/java/org/xutils/http/RequestParams.java b/xutils/src/main/java/org/xutils/http/RequestParams.java
@@ -399,8 +399,9 @@ private HttpRequest getHttpRequest() {
     @Override
     public String toString() {
         String url = this.getUri();
+        String baseParamsStr = super.toString();
         return TextUtils.isEmpty(url) ?
-                super.toString() :
-                url + (url.contains("?") ? "&" : "?") + super.toString();
+                baseParamsStr :
+                url + (url.contains("?") ? "&" : "?") + baseParamsStr;
     }
 }
diff --git a/xutils/src/main/java/org/xutils/http/app/DefaultParamsBuilder.java b/xutils/src/main/java/org/xutils/http/app/DefaultParamsBuilder.java
@@ -44,9 +44,11 @@ public String buildCacheKey(RequestParams params, String[] cacheKeys) {
             for (String key : cacheKeys) {
                 List<KeyValue> kvList = params.getParams(key);
                 if (kvList != null && !kvList.isEmpty()) {
-                    String value = kvList.get(0).getValueStrOrNull();
-                    if (value != null) {
-                        result.append(key).append("=").append(value).append("&");
+                    for (KeyValue kv : kvList) {
+                        String value = kv.getValueStrOrNull();
+                        if (value != null) {
+                            result.append(key).append("=").append(value).append("&");
+                        }
                     }
                 }
             }

diff --git a/xutils/src/main/java/org/xutils/http/request/HttpRequest.java b/xutils/src/main/java/org/xutils/http/request/HttpRequest.java
@@ -30,7 +30,6 @@
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -474,8 +473,6 @@ private static String toGMTString(Date date) {
                 "EEE, dd MMM y HH:mm:ss 'GMT'", Locale.US);
         TimeZone gmtZone = TimeZone.getTimeZone("GMT");
         sdf.setTimeZone(gmtZone);
-        GregorianCalendar gc = new GregorianCalendar(gmtZone);
-        gc.setTimeInMillis(date.getTime());
         return sdf.format(date);
     }
 }