Merge branch 'release/1.9.1'

This commit is contained in:
Sutra Zhou 2021-05-06 15:30:17 +08:00
commit 91f4aa7de8
10 changed files with 11 additions and 11 deletions

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>weixin4j</name> <name>weixin4j</name>
<url>https://github.com/foxinmy/weixin4j</url> <url>https://github.com/foxinmy/weixin4j</url>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-base</artifactId> <artifactId>weixin4j-base</artifactId>
<name>weixin4j-base</name> <name>weixin4j-base</name>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<packaging>war</packaging> <packaging>war</packaging>
<artifactId>weixin4j-example</artifactId> <artifactId>weixin4j-example</artifactId>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-mp</artifactId> <artifactId>weixin4j-mp</artifactId>
<name>weixin4j-mp</name> <name>weixin4j-mp</name>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>weixin4j-pay</name> <name>weixin4j-pay</name>

View File

@ -158,7 +158,7 @@ public class PayPackageBuilder {
public static PayPackageBuilder h5Pay(String body, String outTradeNo, double totalFee, String createIp, public static PayPackageBuilder h5Pay(String body, String outTradeNo, double totalFee, String createIp,
String notifyUrl, String wapUrl, String wapName){ String notifyUrl, String wapUrl, String wapName){
PayPackageBuilder instance = new PayPackageBuilder(); PayPackageBuilder instance = new PayPackageBuilder();
instance.mchPayPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.APP, instance.mchPayPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.MWEB,
null, null, null, null); null, null, null, null);
SceneInfoApp app = SceneInfoApp.createWapAPP(wapName, wapUrl); SceneInfoApp app = SceneInfoApp.createWapAPP(wapName, wapUrl);
instance.mchPayPackage.setSceneInfo(String.format("{\"h5_info\":\"%s\"}", app.getSceneInfo())); instance.mchPayPackage.setSceneInfo(String.format("{\"h5_info\":\"%s\"}", app.getSceneInfo()));

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-qy</artifactId> <artifactId>weixin4j-qy</artifactId>
<name>weixin4j-qy</name> <name>weixin4j-qy</name>

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-server</artifactId> <artifactId>weixin4j-server</artifactId>
<name>weixin4j-server</name> <name>weixin4j-server</name>
@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId> <artifactId>netty-codec-http</artifactId>
<version>4.1.42.Final</version> <version>4.1.59.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-serverX</artifactId> <artifactId>weixin4j-serverX</artifactId>
<name>weixin4j-serverX</name> <name>weixin4j-serverX</name>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.foxinmy</groupId> <groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId> <artifactId>weixin4j</artifactId>
<version>1.9.0</version> <version>1.9.1</version>
</parent> </parent>
<artifactId>weixin4j-wxa</artifactId> <artifactId>weixin4j-wxa</artifactId>
<name>weixin4j-wxa</name> <name>weixin4j-wxa</name>