From 9497e8f41dc54fc566f16e7008bf570822eea2ef Mon Sep 17 00:00:00 2001
From: MrsLi <1246952759@qq.com>
Date: Thu, 14 Sep 2017 11:21:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93post=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8F=82=E6=95=B0=E4=B8=8D=E8=B5=B7=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicParamsInterceptor.java               | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java b/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
index 842c881..4e43815 100644
--- a/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
+++ b/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
@@ -68,27 +68,7 @@ public Response intercept(Chain chain) throws IOException {
 
         // process post body inject
         if (paramsMap != null && paramsMap.size() > 0 && request.method().equals("POST")) {
-            if (request.body() instanceof FormBody) {
-                FormBody.Builder newFormBodyBuilder = new FormBody.Builder();
-                if (paramsMap.size() > 0) {
-                    Iterator iterator = paramsMap.entrySet().iterator();
-                    while (iterator.hasNext()) {
-                        Map.Entry entry = (Map.Entry) iterator.next();
-                        newFormBodyBuilder.add((String) entry.getKey(), (String) entry.getValue());
-                    }
-                }
-
-                FormBody oldFormBody = (FormBody) request.body();
-                int paramSize = oldFormBody.size();
-                if (paramSize > 0) {
-                    for (int i=0;i<paramSize;i++) {
-                        newFormBodyBuilder.add(oldFormBody.name(i), oldFormBody.value(i));
-                    }
-                }
-
-                requestBuilder.post(newFormBodyBuilder.build());
-                request = requestBuilder.build();
-            } else if (request.body() instanceof MultipartBody) {
+            if (request.body() instanceof MultipartBody) {
                 MultipartBody.Builder multipartBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
 
                 Iterator iterator = paramsMap.entrySet().iterator();
@@ -106,6 +86,28 @@ public Response intercept(Chain chain) throws IOException {
 
                 requestBuilder.post(multipartBuilder.build());
                 request = requestBuilder.build();
+            }else {
+                FormBody.Builder newFormBodyBuilder = new FormBody.Builder();
+                if (paramsMap.size() > 0) {
+                    Iterator iterator = paramsMap.entrySet().iterator();
+                    while (iterator.hasNext()) {
+                        Map.Entry entry = (Map.Entry) iterator.next();
+                        newFormBodyBuilder.add((String) entry.getKey(), (String) entry.getValue());
+                    }
+                }
+                if (request.body() instanceof FormBody) {
+                    FormBody oldFormBody = (FormBody) request.body();
+                    int paramSize = oldFormBody.size();
+                    if (paramSize > 0) {
+                        for (int i=0;i<paramSize;i++) {
+                            newFormBodyBuilder.add(oldFormBody.name(i), oldFormBody.value(i));
+                        }
+                    }
+
+                }
+
+                requestBuilder.post(newFormBodyBuilder.build());
+                request = requestBuilder.build();
             }
 
         }

From 853725d48dfaa8b5dc8632a3a6d98844db613652 Mon Sep 17 00:00:00 2001
From: MrsLi <1246952759@qq.com>
Date: Thu, 14 Sep 2017 11:22:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93post=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8F=82=E6=95=B0=E4=B8=8D=E8=B5=B7=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java b/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
index 4e43815..9c00d26 100644
--- a/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
+++ b/basicparamsinterceptor/src/main/java/com/jkyeo/basicparamsinterceptor/BasicParamsInterceptor.java
@@ -109,7 +109,6 @@ public Response intercept(Chain chain) throws IOException {
                 requestBuilder.post(newFormBodyBuilder.build());
                 request = requestBuilder.build();
             }
-
         }
         return chain.proceed(request);
     }