diff --git a/README.md b/README.md index 0144be7dcb898e7573733d8d2327d389e945abea..8232e535c015e855aa67499512af762302893b66 100644 --- a/README.md +++ b/README.md @@ -178,17 +178,17 @@ 点击此处展开查看贡献次数最多的几位小伙伴 1. [chanjarster (Daniel Qian)](https://github.com/chanjarster) -1. [binarywang (Binary Wang)](https://github.com/binarywang) -1. [007gzs](https://github.com/007gzs) -1. [Silloy](https://github.com/silloy) -1. [mgcnrx11](https://github.com/mgcnrx11) -1. [0katekate0 (Wang_Wong)](https://github.com/0katekate0) -1. [yuanqixun](https://github.com/yuanqixun) -1. [kakotor](https://github.com/kakotor) -1. [aimilin6688 (Jonk)](https://github.com/aimilin6688) -1. [lkqm (Mario Luo)](https://github.com/lkqm) -1. [kareanyi (MillerLin)](https://github.com/kareanyi) - +2. [binarywang (Binary Wang)](https://github.com/binarywang) +3. [007gzs](https://github.com/007gzs) +4. [Silloy](https://github.com/silloy) +5. [mgcnrx11](https://github.com/mgcnrx11) +6. [0katekate0 (Wang_Wong)](https://github.com/0katekate0) +7. [yuanqixun](https://github.com/yuanqixun) +8. [kakotor](https://github.com/kakotor) +9. [aimilin6688 (Jonk)](https://github.com/aimilin6688) +10. [lkqm (Mario Luo)](https://github.com/lkqm) +11. [kareanyi (MillerLin)](https://github.com/kareanyi) +12. [Bincent (Hongbin.hsu)](https://gitee.com/bincent) ### GitHub Stargazers over time diff --git a/pom.xml b/pom.xml index 009fbaedaa6aaaeb588eef0d06ed1368c9c6979f..975da84f65b7f9bf33ac0042752fff49d8fa27cf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.binarywang wx-java - 4.5.4.B + 4.5.5.B pom WxJava - Weixin/Wechat Java SDK 微信开发Java SDK @@ -12,7 +12,7 @@ The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt @@ -102,6 +102,11 @@ wangkaikate@163.com https://github.com/0katekate0 + + Bincent + hongbin.hsu@qq.com + https://gitee.com/bincent + @@ -139,12 +144,12 @@ com.github.binarywang qrcode-utils - 1.1 + 1.3 org.jodd jodd-http - 6.2.1 + 6.3.0 provided @@ -192,17 +197,17 @@ com.google.guava guava - 32.0.0-jre + 32.1.2-jre com.google.code.gson gson - 2.8.9 + 2.10.1 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.0 + 2.15.2 @@ -287,7 +292,7 @@ org.redisson redisson - 3.12.0 + 3.23.3 true provided @@ -355,7 +360,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.1.0 attach-sources @@ -368,7 +373,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.5.0 attach-javadocs @@ -386,7 +391,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.1.0 sign-artifacts diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java index 2bddaa975e19e74d9d70a74ae91e5c95c725b624..e2ba3088bee2b4995a8811983e00a6fa84812ac4 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java @@ -1032,7 +1032,7 @@ public interface WxPayService { * @param sideLength 要生成的二维码的边长,如果为空,则取默认值400 * @return 生成的二维码的字节数组 byte [ ] */ - byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength); + byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception; /** *
@@ -1061,7 +1061,7 @@ public interface WxPayService {
    * @param sideLength 要生成的二维码的边长,如果为空,则取默认值400
    * @return 生成的二维码的字节数组 byte [ ]
    */
-  byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength);
+  byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception;
 
   /**
    * 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 00046c8713b97d9ed291401b1f84a9643584193c..3027c5b7df91a000a74ceb295b3e40d68e1a2cf6 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -840,7 +840,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   }
 
   @Override
-  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) {
+  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception {
     String content = this.createScanPayQrcodeMode1(productId);
     return this.createQrcode(content, logoFile, sideLength);
   }
@@ -870,11 +870,11 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   }
 
   @Override
-  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) {
+  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception {
     return this.createQrcode(codeUrl, logoFile, sideLength);
   }
 
-  private byte[] createQrcode(String content, File logoFile, Integer sideLength) {
+  private byte[] createQrcode(String content, File logoFile, Integer sideLength) throws Exception {
     if (sideLength == null || sideLength < 1) {
       return QrcodeUtils.createQrcode(content, logoFile);
     }