Ver código fonte

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

master
Binary Wang 5 anos atrás
pai
commit
4ff65a0ccb
15 arquivos alterados com 35 adições e 17 exclusões
  1. +1
    -1
      pom.xml
  2. +1
    -1
      spring-boot-starters/pom.xml
  3. +1
    -1
      spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
  4. +1
    -1
      spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
  5. +1
    -1
      spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
  6. +1
    -1
      spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
  7. +1
    -1
      weixin-java-common/pom.xml
  8. +1
    -1
      weixin-java-cp/pom.xml
  9. +1
    -1
      weixin-java-miniapp/pom.xml
  10. +1
    -1
      weixin-java-mp/pom.xml
  11. +1
    -1
      weixin-java-open/pom.xml
  12. +2
    -2
      weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
  13. +3
    -3
      weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
  14. +18
    -0
      weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java
  15. +1
    -1
      weixin-java-pay/pom.xml

+ 1
- 1
pom.xml Ver arquivo

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


+ 1
- 1
spring-boot-starters/pom.xml Ver arquivo

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


+ 1
- 1
spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml Ver arquivo

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



+ 1
- 1
spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml Ver arquivo

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



+ 1
- 1
spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml Ver arquivo

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



+ 1
- 1
spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml Ver arquivo

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



+ 1
- 1
weixin-java-common/pom.xml Ver arquivo

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

<artifactId>weixin-java-common</artifactId>


+ 1
- 1
weixin-java-cp/pom.xml Ver arquivo

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

<artifactId>weixin-java-cp</artifactId>


+ 1
- 1
weixin-java-miniapp/pom.xml Ver arquivo

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

<artifactId>weixin-java-miniapp</artifactId>


+ 1
- 1
weixin-java-mp/pom.xml Ver arquivo

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

<artifactId>weixin-java-mp</artifactId>


+ 1
- 1
weixin-java-open/pom.xml Ver arquivo

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

<artifactId>weixin-java-open</artifactId>


+ 2
- 2
weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java Ver arquivo

@@ -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<String> domainList) throws WxErrorException;
WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException;

/**
* 获取小程序的信息


+ 3
- 3
weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java Ver arquivo

@@ -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<String> domainList) throws WxErrorException {
public WxOpenMaWebDomainResult setWebViewDomainInfo(String action, List<String> domainList) throws WxErrorException {
String response = this.setWebViewDomain(action, domainList);
return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class);
return WxMaGsonBuilder.create().fromJson(response, WxOpenMaWebDomainResult.class);
}




+ 18
- 0
weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaWebDomainResult.java Ver arquivo

@@ -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;

}

+ 1
- 1
weixin-java-pay/pom.xml Ver arquivo

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



Carregando…
Cancelar
Salvar