Http状态码非200时，带上返回结果抛出异常

liujingxing10000 · liujingxing10000 · commit 12919a8cf9e7 · 2019-09-26T11:30:20.000+08:00
diff --git a/rxhttp/src/main/java/rxhttp/wrapper/exception/ExceptionHelper.java b/rxhttp/src/main/java/rxhttp/wrapper/exception/ExceptionHelper.java
@@ -23,8 +23,11 @@ public class ExceptionHelper {
      */
     public static ResponseBody throwIfFatal(@NonNull Response response) throws IOException {
         ResponseBody body = response.body();
-        if (body == null || !response.isSuccessful())
+        if (body == null)
             throw new HttpStatusCodeException(response);
+        if (!response.isSuccessful()) {
+            throw new HttpStatusCodeException(response, body.string());
+        }
         return body;
     }
 }
diff --git a/rxhttp/src/main/java/rxhttp/wrapper/exception/HttpStatusCodeException.java b/rxhttp/src/main/java/rxhttp/wrapper/exception/HttpStatusCodeException.java
@@ -19,17 +19,23 @@
 public final class HttpStatusCodeException extends IOException {
 
     private String statusCode; //Http响应状态吗
+    private String result;    //返回结果
     private String requestMethod; //请求方法，Get/Post等
     private String requestUrl; //请求Url及参数
     private Headers responseHeaders; //响应头
 
-    HttpStatusCodeException(Response response) {
+    public HttpStatusCodeException(Response response) {
+        this(response, null);
+    }
+
+    public HttpStatusCodeException(Response response, String result) {
         super(response.message());
         statusCode = String.valueOf(response.code());
         Request request = response.request();
         requestMethod = request.method();
         requestUrl = request.url().toString() + LogUtil.getRequestParams(request);
         responseHeaders = response.headers();
+        this.result = result;
     }
 
     @Nullable
@@ -54,13 +60,18 @@ public Headers getResponseHeaders() {
         return responseHeaders;
     }
 
+    public String getResult() {
+        return result;
+    }
+
     @Override
     public String toString() {
         return getClass().getName() + ":" +
             " Method=" + requestMethod +
             " Code=" + statusCode +
             "\n\nurl = " + requestUrl +
             "\n\nHeaders = " + responseHeaders +
-            "\nMessage = " + getMessage();
+            "\nMessage = " + getMessage() +
+            "\n\nResult = " + result;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,11 @@ public class ExceptionHelper {`
`23`	`23`	`*/`
`24`	`24`	`public static ResponseBody throwIfFatal(@NonNull Response response) throws IOException {`
`25`	`25`	`ResponseBody body = response.body();`
`26`		`- if (body == null \|\| !response.isSuccessful())`
	`26`	`+ if (body == null)`
`27`	`27`	`throw new HttpStatusCodeException(response);`
	`28`	`+ if (!response.isSuccessful()) {`
	`29`	`+ throw new HttpStatusCodeException(response, body.string());`
	`30`	`+ }`
`28`	`31`	`return body;`
`29`	`32`	`}`
`30`	`33`	`}`