From f394a62fadc2f64a8cf96e9d7d4b05501689041a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 27 Oct 2019 17:12:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=833.5.8.B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- spring-boot-starters/pom.xml | 2 +- .../wx-java-miniapp-spring-boot-starter/pom.xml | 2 +- spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml | 2 +- spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml | 2 +- spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-miniapp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- weixin-java-open/pom.xml | 2 +- weixin-java-pay/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index efb61efa..d4bd8535 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B pom WxJava - Weixin/Wechat Java SDK 微信开发Java SDK diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 0bad4baf..12b9092e 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -6,7 +6,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B pom wx-java-spring-boot-starters diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml index f03fbd55..27b26fdf 100644 --- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml +++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ wx-java-spring-boot-starters com.github.binarywang - 3.5.7.B + 3.5.8.B 4.0.0 diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml index bc9c18e6..286f52e6 100644 --- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml +++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ wx-java-spring-boot-starters com.github.binarywang - 3.5.7.B + 3.5.8.B 4.0.0 diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml index 22cde91b..0b90cbf1 100644 --- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml +++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ wx-java-spring-boot-starters com.github.binarywang - 3.5.7.B + 3.5.8.B 4.0.0 diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml index d9d7fcd6..791e8829 100644 --- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml +++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ wx-java-spring-boot-starters com.github.binarywang - 3.5.7.B + 3.5.8.B 4.0.0 diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index e12a0d42..a9610f93 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 6716dd14..2f49e02d 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -7,7 +7,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B weixin-java-cp diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml index c75b0750..e70da6cc 100644 --- a/weixin-java-miniapp/pom.xml +++ b/weixin-java-miniapp/pom.xml @@ -7,7 +7,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B weixin-java-miniapp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 9c8b4612..867d3b87 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -7,7 +7,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B weixin-java-mp diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml index 90b88a74..c72de36b 100644 --- a/weixin-java-open/pom.xml +++ b/weixin-java-open/pom.xml @@ -7,7 +7,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B weixin-java-open diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml index 3ce30e30..22cd1e14 100644 --- a/weixin-java-pay/pom.xml +++ b/weixin-java-pay/pom.xml @@ -5,7 +5,7 @@ com.github.binarywang wx-java - 3.5.7.B + 3.5.8.B 4.0.0 From 70e6016d4ab435541e32eb7a7570bab24a9b4b09 Mon Sep 17 00:00:00 2001 From: S Date: Wed, 30 Oct 2019 20:27:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20#1259=20=E4=BC=98=E5=8C=96=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E5=B9=B3=E5=8F=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/open/api/WxOpenMaService.java | 4 ++-- .../open/api/impl/WxOpenMaServiceImpl.java | 6 +++--- .../bean/result/WxOpenMaWebDomainResult.java | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java index 8bec5b2c..78177a3c 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java @@ -231,7 +231,7 @@ public interface WxOpenMaService extends WxMaService { * * @return */ - public WxOpenResult getWebViewDomainInfo() throws WxErrorException; + public WxOpenMaWebDomainResult getWebViewDomainInfo() throws WxErrorException; /** * 设置小程序的业务域名 @@ -249,7 +249,7 @@ public interface WxOpenMaService extends WxMaService { * @param domainList * @return */ - WxOpenResult setWebViewDomainInfo(String action, List domainList) throws WxErrorException; + WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List domainList) throws WxErrorException; /** * 获取小程序的信息 diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java index 0d1554b5..230968d5 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java @@ -110,7 +110,7 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ * @return */ @Override - public WxOpenResult getWebViewDomainInfo() throws WxErrorException { + public WxOpenMaWebDomainResult getWebViewDomainInfo() throws WxErrorException { return setWebViewDomainInfo("get", null); } @@ -141,9 +141,9 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ * @return */ @Override - public WxOpenResult setWebViewDomainInfo(String action, List domainList) throws WxErrorException { + public WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List domainList) throws WxErrorException { String response = this.setWebViewDomain(action, domainList); - return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class); + return WxMaGsonBuilder.create().fromJson(response, WxOpenMaWebDomainResult.class); } diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java new file mode 100644 index 00000000..4ff878e9 --- /dev/null +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java @@ -0,0 +1,18 @@ +package me.chanjar.weixin.open.bean.result; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +public class WxOpenMaWebDomainResult extends WxOpenResult { + + private static final long serialVersionUID = -2182687859448940313L; + + @SerializedName("webviewdomain") + List webviewdomainList; + +}