lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-04 20:57:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Wechat-Group/WxJava into develop

Browse Source
This commit is contained in:
Binary Wang 2019-10-30 22:05:53 +08:00
commit 4ff65a0ccb
15 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WxJava - Weixin/Wechat Java SDK</name> <name>WxJava - Weixin/Wechat Java SDK</name>
<description>微信开发Java SDK</description> <description>微信开发Java SDK</description>

2
spring-boot-starters/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>wx-java-spring-boot-starters</artifactId> <artifactId>wx-java-spring-boot-starters</artifactId>

2
spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wx-java-spring-boot-starters</artifactId> <artifactId>wx-java-spring-boot-starters</artifactId>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wx-java-spring-boot-starters</artifactId> <artifactId>wx-java-spring-boot-starters</artifactId>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wx-java-spring-boot-starters</artifactId> <artifactId>wx-java-spring-boot-starters</artifactId>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wx-java-spring-boot-starters</artifactId> <artifactId>wx-java-spring-boot-starters</artifactId>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
weixin-java-common/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<artifactId>weixin-java-common</artifactId> <artifactId>weixin-java-common</artifactId>

2
weixin-java-cp/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<artifactId>weixin-java-cp</artifactId> <artifactId>weixin-java-cp</artifactId>

2
weixin-java-miniapp/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<artifactId>weixin-java-miniapp</artifactId> <artifactId>weixin-java-miniapp</artifactId>

2
weixin-java-mp/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<artifactId>weixin-java-mp</artifactId> <artifactId>weixin-java-mp</artifactId>

2
weixin-java-open/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<artifactId>weixin-java-open</artifactId> <artifactId>weixin-java-open</artifactId>

4
weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
View File

@ -231,7 +231,7 @@ public interface WxOpenMaService extends WxMaService {
* *
* @return * @return
*/ */
public WxOpenResult getWebViewDomainInfo() throws WxErrorException; public WxOpenMaWebDomainResult getWebViewDomainInfo() throws WxErrorException;
/** /**
* 设置小程序的业务域名 * 设置小程序的业务域名
@ -249,7 +249,7 @@ public interface WxOpenMaService extends WxMaService {
* @param domainList * @param domainList
* @return * @return
*/ */
WxOpenResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException; WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException;
/** /**
* 获取小程序的信息 * 获取小程序的信息

6
weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
View File

@ -110,7 +110,7 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ
* @return * @return
*/ */
@Override @Override
public WxOpenResult getWebViewDomainInfo() throws WxErrorException { public WxOpenMaWebDomainResult getWebViewDomainInfo() throws WxErrorException {
return setWebViewDomainInfo("get", null); return setWebViewDomainInfo("get", null);
} }
@ -141,9 +141,9 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ
* @return * @return
*/ */
@Override @Override
public WxOpenResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException { public WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException {
String response = this.setWebViewDomain(action, domainList); String response = this.setWebViewDomain(action, domainList);
return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class); return WxMaGsonBuilder.create().fromJson(response, WxOpenMaWebDomainResult.class);
} }

18
weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java Normal file
View File

@ -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<String> webviewdomainList;
}

2
weixin-java-pay/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>wx-java</artifactId> <artifactId>wx-java</artifactId>
<version>3.5.7.B</version> <version>3.5.8.B</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>