binarywang#395 修复获取小程序二维码data format error的问题

binarywang · binarywang · commit 0714cbe8e2b1 · 2017-12-07T11:54:17.000+08:00
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/AbstractWxMaQrcodeWrapper.java
@@ -8,10 +8,12 @@
  * @author Element
  */
 public abstract class AbstractWxMaQrcodeWrapper {
+  public String toJson() {
+    return WxMaGsonBuilder.create().toJson(this);
+  }
 
   @Override
   public String toString() {
-    return WxMaGsonBuilder.create().toJson(this);
+    return this.toJson();
   }
-
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
@@ -37,17 +37,17 @@ public File execute(String uri, AbstractWxMaQrcodeWrapper ticket) throws WxError
     HttpPost httpPost = new HttpPost(uri);
     if (requestHttp.getRequestHttpProxy() != null) {
       httpPost.setConfig(
-          RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build()
+        RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build()
       );
     }
-    httpPost.setEntity(new StringEntity(ticket.toString()));
+    httpPost.setEntity(new StringEntity(ticket.toJson()));
 
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost);
          InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);) {
       Header[] contentTypeHeader = response.getHeaders("Content-Type");
       if (contentTypeHeader != null && contentTypeHeader.length > 0
-          && ContentType.APPLICATION_JSON.getMimeType()
-          .equals(ContentType.parse(contentTypeHeader[0].getValue()).getMimeType())) {
+        && ContentType.APPLICATION_JSON.getMimeType()
+        .equals(ContentType.parse(contentTypeHeader[0].getValue()).getMimeType())) {
         String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
         throw new WxErrorException(WxError.fromJson(responseContent));
       }

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@`
`8`	`8`	`* @author Element`
`9`	`9`	`*/`
`10`	`10`	`public abstract class AbstractWxMaQrcodeWrapper {`
	`11`	`+ public String toJson() {`
	`12`	`+ return WxMaGsonBuilder.create().toJson(this);`
	`13`	`+ }`
`11`	`14`
`12`	`15`	`@Override`
`13`	`16`	`public String toString() {`
`14`		`- return WxMaGsonBuilder.create().toJson(this);`
	`17`	`+ return this.toJson();`
`15`	`18`	`}`
`16`		`-`
`17`	`19`	`}`