diff --git a/ufile-sample-java/pom.xml b/ufile-sample-java/pom.xml index e0de777..1fe65c2 100644 --- a/ufile-sample-java/pom.xml +++ b/ufile-sample-java/pom.xml @@ -55,7 +55,7 @@ cn.ucloud.ufile ufile-client-java - 2.6.2 + 2.6.4 diff --git a/ufile/pom.xml b/ufile/pom.xml index 375e326..0b9b38b 100644 --- a/ufile/pom.xml +++ b/ufile/pom.xml @@ -7,7 +7,7 @@ cn.ucloud.ufile ufile pom - 2.6.3 + 2.6.4 ufile-core diff --git a/ufile/ufile-client-java/apidocs.zip b/ufile/ufile-client-java/apidocs.zip index 02184f7..425b1f2 100644 Binary files a/ufile/ufile-client-java/apidocs.zip and b/ufile/ufile-client-java/apidocs.zip differ diff --git a/ufile/ufile-client-java/pom.xml b/ufile/ufile-client-java/pom.xml index aee352e..5a8403e 100644 --- a/ufile/ufile-client-java/pom.xml +++ b/ufile/ufile-client-java/pom.xml @@ -6,11 +6,11 @@ ufile cn.ucloud.ufile - 2.6.3 + 2.6.4 ufile-client-java - 2.6.3 + 2.6.4 @@ -26,7 +26,7 @@ cn.ucloud.ufile ufile-core - 2.6.3 + 2.6.4 diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java index 348a355..662db55 100644 --- a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java +++ b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java @@ -398,6 +398,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class); } catch (Exception e) { errorBean = new UfileErrorBean(); + errorBean.setErrMsg(content); } errorBean.setResponseCode(response.code()); errorBean.setxSessionId(response.header("X-SessionId")); diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java index 3ab5ac5..4f2dbed 100644 --- a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java +++ b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java @@ -404,6 +404,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class); } catch (Exception e) { errorBean = new UfileErrorBean(); + errorBean.setErrMsg(content); } errorBean.setResponseCode(response.code()); errorBean.setxSessionId(response.header("X-SessionId")); diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java index 4f5b970..866d258 100644 --- a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java +++ b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java @@ -269,6 +269,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class); } catch (Exception e) { errorBean = new UfileErrorBean(); + errorBean.setErrMsg(content); } errorBean.setResponseCode(response.code()); errorBean.setxSessionId(response.header("X-SessionId")); diff --git a/ufile/ufile-core/apidocs.zip b/ufile/ufile-core/apidocs.zip index 2aaff0e..ef50422 100644 Binary files a/ufile/ufile-core/apidocs.zip and b/ufile/ufile-core/apidocs.zip differ diff --git a/ufile/ufile-core/pom.xml b/ufile/ufile-core/pom.xml index 42ebf9d..e3d3567 100644 --- a/ufile/ufile-core/pom.xml +++ b/ufile/ufile-core/pom.xml @@ -6,11 +6,11 @@ cn.ucloud.ufile ufile - 2.6.3 + 2.6.4 ufile-core - 2.6.3 + 2.6.4 diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java index f31bc33..047d9fb 100644 --- a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java +++ b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java @@ -6,7 +6,7 @@ * @date: 2018/11/22 15:00 */ public class UfileConstants { - public static final String SDK_VERSION = "2.6.3"; + public static final String SDK_VERSION = "2.6.4"; /** * 默认分片大小（4MB） */ diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java index 7aa9db4..52c8e8d 100644 --- a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java +++ b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java @@ -11,6 +11,7 @@ import cn.ucloud.ufile.http.HttpClient; import cn.ucloud.ufile.http.response.ResponseParser; import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; import okhttp3.Call; import okhttp3.Callback; import okhttp3.OkHttpClient; @@ -288,8 +289,14 @@ public T parseHttpResponse(Response response) throws UfileClientException, Ufile public UfileErrorBean parseErrorResponse(Response response) throws UfileClientException { try { String content = response.body().string(); - content = (content == null || content.length() == 0) ? "{}" : content; - UfileErrorBean errorBean = new Gson().fromJson(content, UfileErrorBean.class); + content = (content == null || content.length() == 0) ? "" : content; + UfileErrorBean errorBean = null; + try { + errorBean = new Gson().fromJson(content, UfileErrorBean.class); + } catch (JsonParseException e) { + errorBean = new UfileErrorBean(); + errorBean.setErrMsg(content); + } errorBean.setResponseCode(response.code()); errorBean.setxSessionId(response.header("X-SessionId")); return errorBean; diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java index 8fcf2e3..8012bb3 100644 --- a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java +++ b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java @@ -45,17 +45,19 @@ public Response intercept(Chain chain) throws IOException { JLog.T(TAG, "[response-code]:" + response.code()); JLog.T(TAG, "[response-headers]:" + response.headers().toString()); - /* 获得返回的body，注意此处不要使用responseBody.string()获取返回数据，原因在于这个方法会消耗返回结果的数据(buffer) */ -// ResponseBody responseBody = response.body(); + if (JLog.SHOW_TEST) { + /* 获得返回的body，注意此处不要使用responseBody.string()获取返回数据，原因在于这个方法会消耗返回结果的数据(buffer) */ + ResponseBody responseBody = response.body(); - /* 为了不消耗buffer，我们这里使用source先获得buffer对象，然后clone()后使用 */ -// BufferedSource source = responseBody.source(); -// source.request(Long.MAX_VALUE); // Buffer the entire body. -// /* 获得返回的数据 */ -// Buffer buffer = source.buffer(); -// if (buffer.size() < 1024) -// /* 使用前clone() 下，避免直接消耗 */ -// JLog.T(TAG, "[response-body]:" + buffer.clone().readString(Charset.forName("UTF-8"))); + /* 为了不消耗buffer，我们这里使用source先获得buffer对象，然后clone()后使用 */ + BufferedSource source = responseBody.source(); + source.request(Long.MAX_VALUE); // Buffer the entire body. + /* 获得返回的数据 */ + Buffer buffer = source.buffer(); + if (buffer.size() < 2 << 10) + /* 使用前clone() 下，避免直接消耗 */ + JLog.T(TAG, "[response-body]:" + buffer.clone().readString(Charset.forName("UTF-8"))); + } return response; }