okhttp使用方式有错误，body().toString()修改为body().string()

ecoolper · ecoolper · commit 59fc9134c84a · 2017-05-04T11:02:24.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
@@ -213,7 +213,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     String contentType = response.header("Content-Type");
     if (contentType != null && contentType.startsWith("application/json")) {
       // application/json; encoding=utf-8 下载媒体文件出错
-      throw new WxErrorException(WxError.fromJson(response.body().toString()));
+      throw new WxErrorException(WxError.fromJson(response.body().string()));
     }
 
     String fileName = getFileName(response);
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java
@@ -136,7 +136,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Request request = new Request.Builder().url(uri).post(body).build();
 
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
@@ -141,7 +141,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Request request = new Request.Builder().url(uri).build();
 
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
@@ -156,7 +156,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Request request = new Request.Builder().url(uri).post(body).build();
 
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java
@@ -68,7 +68,12 @@ public Request authenticate(Route route, Response response) throws IOException {
           } catch (IOException e) {
             e.printStackTrace();
           }
-          String resultContent = response.body().toString();
+          String resultContent = null;
+          try {
+            resultContent = response.body().string();
+          } catch (IOException e) {
+            e.printStackTrace();
+          }
           WxError error = WxError.fromJson(resultContent);
           if (error.getErrorCode() != 0) {
             throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java
@@ -66,7 +66,7 @@ public Request authenticate(Route route, Response response) throws IOException {
 
         Request request = new Request.Builder().url(url).get().build();
         Response response = client.newCall(request).execute();
-        String resultContent = response.body().toString();
+        String resultContent = response.body().string();
         WxError error = WxError.fromJson(resultContent);
         if (error.getErrorCode() != 0) {
           throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java
@@ -102,7 +102,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).post(requestBody).build();
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java
@@ -104,7 +104,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Request request = new Request.Builder().url(uri).post(requestBody).build();
 
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
 
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
@@ -104,7 +104,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     RequestBody body =bodyBuilder.build();
     Request request = new Request.Builder().url(uri).post(body).build();
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java
@@ -77,7 +77,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     RequestBody requestBody =new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).post(requestBody).build();
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java
@@ -90,7 +90,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Request request = new Request.Builder().url(uri).post(body).build();
 
     Response response = client.newCall(request).execute();
-    String responseContent = response.body().toString();
+    String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
@@ -92,7 +92,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     Response response = client.newCall(request).execute();
     String contentTypeHeader = response.header("Content-Type");
     if (MimeTypes.MIME_TEXT_PLAIN.equals(contentTypeHeader)) {
-      String responseContent = response.body().toString();
+      String responseContent = response.body().string();
       throw new WxErrorException(WxError.fromJson(responseContent));
     }
     try (InputStream inputStream = new ByteArrayInputStream(response.body().bytes())) {

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public Request authenticate(Route route, Response response) throws IOException {`
`213`	`213`	`String contentType = response.header("Content-Type");`
`214`	`214`	`if (contentType != null && contentType.startsWith("application/json")) {`
`215`	`215`	`// application/json; encoding=utf-8 下载媒体文件出错`
`216`		`- throw new WxErrorException(WxError.fromJson(response.body().toString()));`
	`216`	`+ throw new WxErrorException(WxError.fromJson(response.body().string()));`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`String fileName = getFileName(response);`