From ffcbb2a9eb60b8885b9b654ed4bdcdebe2e43054 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 27 Sep 2017 11:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/api/WxMaQrcodeService.java     | 50 +++----------------
 .../api/impl/WxMaQrcodeServiceImpl.java       | 14 +++---
 .../wx/miniapp/bean/WxMaCodeLineColor.java    | 42 ++++++++++++++++
 .../wx/miniapp/bean/WxMaWxcode.java           |  7 ++-
 .../wx/miniapp/bean/WxMaWxcodeLimit.java      |  7 ++-
 5 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaCodeLineColor.java

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
index c2222bc93..4b3ec5feb 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
@@ -1,5 +1,6 @@
 package cn.binarywang.wx.miniapp.api;
 
+import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import me.chanjar.weixin.common.exception.WxErrorException;
 
 import java.io.File;
@@ -16,6 +17,9 @@ import java.io.File;
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public interface WxMaQrcodeService {
+  String CREATE_QRCODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode";
+  String GET_WXACODE_URL = "https://api.weixin.qq.com/wxa/getwxacode";
+  String GET_WXACODE_UNLIMIT_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit";
 
   /**
    * 接口C
@@ -42,10 +46,8 @@ public interface WxMaQrcodeService {
    * @param width     默认430 二维码的宽度
    * @param autoColor 默认true 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
    * @param lineColor auth_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"}
-   * @return
-   * @throws WxErrorException
    */
-  File createWxCode(String path, int width, boolean autoColor, LineColor lineColor) throws WxErrorException;
+  File createWxCode(String path, int width, boolean autoColor, WxMaCodeLineColor lineColor) throws WxErrorException;
 
   File createWxCode(String path, int width) throws WxErrorException;
 
@@ -65,49 +67,9 @@ public interface WxMaQrcodeService {
    * @param width     默认false 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
    * @param autoColor 默认true 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
    * @param lineColor auth_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"}
-   * @return
-   * @throws WxErrorException
    */
-  File createWxCodeLimit(String scene, String page, int width, boolean autoColor, LineColor lineColor) throws WxErrorException;
+  File createWxCodeLimit(String scene, String page, int width, boolean autoColor, WxMaCodeLineColor lineColor) throws WxErrorException;
 
   File createWxCodeLimit(String scene, String page) throws WxErrorException;
 
-  /**
-   * lineColor 包装类
-   * 用于描述二维码（小程序码）颜色（RGB参数值），详情请查看文档
-   */
-  public static class LineColor {
-
-    private String r = "0", g = "0", b = "0";
-
-    public LineColor(String r, String g, String b) {
-      this.r = r;
-      this.g = g;
-      this.b = b;
-    }
-
-    public String getR() {
-      return r;
-    }
-
-    public void setR(String r) {
-      this.r = r;
-    }
-
-    public String getG() {
-      return g;
-    }
-
-    public void setG(String g) {
-      this.g = g;
-    }
-
-    public String getB() {
-      return b;
-    }
-
-    public void setB(String b) {
-      this.b = b;
-    }
-  }
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
index fd58855b3..806e0e99b 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
@@ -2,6 +2,7 @@ package cn.binarywang.wx.miniapp.api.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
 import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
 import cn.binarywang.wx.miniapp.bean.WxMaQrcode;
 import cn.binarywang.wx.miniapp.bean.WxMaWxcode;
 import cn.binarywang.wx.miniapp.bean.WxMaWxcodeLimit;
@@ -22,9 +23,8 @@ public class WxMaQrcodeServiceImpl implements WxMaQrcodeService {
 
   @Override
   public File createQrcode(String path, int width) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode";
     return this.wxMaService.execute(new QrCodeRequestExecutor(this.wxMaService.getRequestHttp()),
-      url, new WxMaQrcode(path, width));
+      CREATE_QRCODE_URL, new WxMaQrcode(path, width));
   }
 
   @Override
@@ -33,15 +33,14 @@ public class WxMaQrcodeServiceImpl implements WxMaQrcodeService {
   }
 
   @Override
-  public File createWxCode(String path, int width, boolean autoColor, LineColor lineColor) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/wxa/getwxacode";
+  public File createWxCode(String path, int width, boolean autoColor, WxMaCodeLineColor lineColor) throws WxErrorException {
     WxMaWxcode wxMaWxcode = new WxMaWxcode();
     wxMaWxcode.setPath(path);
     wxMaWxcode.setWidth(width);
     wxMaWxcode.setAutoColor(autoColor);
     wxMaWxcode.setLineColor(lineColor);
     return this.wxMaService.execute(new QrCodeRequestExecutor(this.wxMaService.getRequestHttp()),
-      url, wxMaWxcode);
+      GET_WXACODE_URL, wxMaWxcode);
   }
 
   @Override
@@ -55,8 +54,7 @@ public class WxMaQrcodeServiceImpl implements WxMaQrcodeService {
   }
 
   @Override
-  public File createWxCodeLimit(String scene, String page, int width, boolean autoColor, LineColor lineColor) throws WxErrorException {
-    String url = "http://api.weixin.qq.com/wxa/getwxacodeunlimit";
+  public File createWxCodeLimit(String scene, String page, int width, boolean autoColor, WxMaCodeLineColor lineColor) throws WxErrorException {
     WxMaWxcodeLimit wxMaWxcodeLimit = new WxMaWxcodeLimit();
     wxMaWxcodeLimit.setScene(scene);
     wxMaWxcodeLimit.setPage(page);
@@ -64,7 +62,7 @@ public class WxMaQrcodeServiceImpl implements WxMaQrcodeService {
     wxMaWxcodeLimit.setAutoColor(autoColor);
     wxMaWxcodeLimit.setLineColor(lineColor);
     return this.wxMaService.execute(new QrCodeRequestExecutor(this.wxMaService.getRequestHttp()),
-      url, wxMaWxcodeLimit);
+      GET_WXACODE_UNLIMIT_URL, wxMaWxcodeLimit);
   }
 
   @Override
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaCodeLineColor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaCodeLineColor.java
new file mode 100644
index 000000000..5312d9736
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaCodeLineColor.java
@@ -0,0 +1,42 @@
+package cn.binarywang.wx.miniapp.bean;
+
+/**
+ * <pre>
+ * lineColor 包装类
+ * 用于描述二维码（小程序码）颜色（RGB参数值），
+ * 详情请查看文档 https://mp.weixin.qq.com/debug/wxadoc/dev/api/qrcode.html
+ * </pre>
+ */
+public class WxMaCodeLineColor {
+  private String r = "0", g = "0", b = "0";
+
+  public WxMaCodeLineColor(String r, String g, String b) {
+    this.r = r;
+    this.g = g;
+    this.b = b;
+  }
+
+  public String getR() {
+    return r;
+  }
+
+  public void setR(String r) {
+    this.r = r;
+  }
+
+  public String getG() {
+    return g;
+  }
+
+  public void setG(String g) {
+    this.g = g;
+  }
+
+  public String getB() {
+    return b;
+  }
+
+  public void setB(String b) {
+    this.b = b;
+  }
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
index 9ea674ed9..faf78f588 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
@@ -1,6 +1,5 @@
 package cn.binarywang.wx.miniapp.bean;
 
-import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
 
@@ -19,7 +18,7 @@ public class WxMaWxcode extends WxMaQrcodeWrapper implements Serializable {
   private boolean autoColor = true;
 
   @SerializedName("line_color")
-  private WxMaQrcodeService.LineColor lineColor = new WxMaQrcodeService.LineColor("0", "0", "0");
+  private WxMaCodeLineColor lineColor = new WxMaCodeLineColor("0", "0", "0");
 
   public static WxMaWxcode fromJson(String json) {
     return WxMaGsonBuilder.create().fromJson(json, WxMaWxcode.class);
@@ -53,11 +52,11 @@ public class WxMaWxcode extends WxMaQrcodeWrapper implements Serializable {
     this.autoColor = autoColor;
   }
 
-  public WxMaQrcodeService.LineColor getLineColor() {
+  public WxMaCodeLineColor getLineColor() {
     return lineColor;
   }
 
-  public void setLineColor(WxMaQrcodeService.LineColor lineColor) {
+  public void setLineColor(WxMaCodeLineColor lineColor) {
     this.lineColor = lineColor;
   }
 
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java
index 7619fe46f..864a082e8 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java
@@ -1,6 +1,5 @@
 package cn.binarywang.wx.miniapp.bean;
 
-import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
 
@@ -20,7 +19,7 @@ public class WxMaWxcodeLimit extends WxMaQrcodeWrapper implements Serializable {
   private boolean autoColor = true;
 
   @SerializedName("line_color")
-  private WxMaQrcodeService.LineColor lineColor = new WxMaQrcodeService.LineColor("0", "0", "0");
+  private WxMaCodeLineColor lineColor = new WxMaCodeLineColor("0", "0", "0");
 
   public static WxMaWxcodeLimit fromJson(String json) {
     return WxMaGsonBuilder.create().fromJson(json, WxMaWxcodeLimit.class);
@@ -58,11 +57,11 @@ public class WxMaWxcodeLimit extends WxMaQrcodeWrapper implements Serializable {
     this.autoColor = autoColor;
   }
 
-  public WxMaQrcodeService.LineColor getLineColor() {
+  public WxMaCodeLineColor getLineColor() {
     return lineColor;
   }
 
-  public void setLineColor(WxMaQrcodeService.LineColor lineColor) {
+  public void setLineColor(WxMaCodeLineColor lineColor) {
     this.lineColor = lineColor;
   }
 }