From 89a5c79e7af54d4260616fba6366c9e6453eddbf Mon Sep 17 00:00:00 2001
From: Sutra Zhou <zhoushuqun@gmail.com>
Date: Sat, 26 May 2018 19:41:59 +0800
Subject: [PATCH] Delete WxaCodeError.

---
 .../foxinmy/weixin4j/wxa/api/QrCodeApi.java   | 15 +------
 .../weixin4j/wxa/api/WxaCodeError.java        | 39 -------------------
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/WxaCodeError.java

diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
index 4f0890a4..15e74e35 100644
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
+++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
@@ -1,7 +1,6 @@
 package com.foxinmy.weixin4j.wxa.api;
 
 import java.awt.Color;
-import java.io.IOException;
 
 import com.alibaba.fastjson.JSON;
 import com.foxinmy.weixin4j.exception.WeixinException;
@@ -144,20 +143,10 @@ public class QrCodeApi extends WxaApi {
 	}
 
 	private byte[] toImageBytes(WeixinResponse response) throws WeixinException {
-		try {
-			return readImageBytes(response);
-		} catch (IOException e) {
-			throw new WeixinException(e);
-		} catch (WxaCodeError e) {
-			throw new WeixinException(Integer.toString(e.getErrcode()), e.getErrmsg());
-		}
-	}
-
-	private byte[] readImageBytes(WeixinResponse response) throws IOException, WxaCodeError {
 		final String contentType = response.getHeaders().getContentType();
 		if (contentType != null && contentType.equals(ContentType.APPLICATION_JSON.getMimeType().getType())) {
-			WxaCodeError wxaCodeError = JSON.parseObject(response.getContent(), WxaCodeError.class);
-			throw wxaCodeError;
+			final WxaApiResult r = response.getAsObject(WxaApiResult.TYPE_REFERENCE);
+			throw r.toWeixinException();
 		} else {
 			return response.getContent();
 		}
diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/WxaCodeError.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/WxaCodeError.java
deleted file mode 100644
index ff31c025..00000000
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/WxaCodeError.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.foxinmy.weixin4j.wxa.api;
-
-class WxaCodeError extends Exception {
-
-	private static final long serialVersionUID = 2018052201L;
-
-	private int errcode;
-	private String errmsg;
-
-	public WxaCodeError() {
-	}
-
-	public WxaCodeError(int errcode, String errmsg) {
-		this.errcode = errcode;
-		this.errmsg = errmsg;
-	}
-
-	public int getErrcode() {
-		return errcode;
-	}
-
-	public void setErrcode(int errcode) {
-		this.errcode = errcode;
-	}
-
-	public String getErrmsg() {
-		return errmsg;
-	}
-
-	public void setErrmsg(String errmsg) {
-		this.errmsg = errmsg;
-	}
-
-	@Override
-	public String getMessage() {
-		return errmsg;
-	}
-
-}