From 88df988360971a850c30131146d3bfbf2bd21e09 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Fri, 18 Dec 2020 09:31:28 +0800 Subject: [PATCH 1/4] Update for next development version --- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- weixin4j-example/pom.xml | 2 +- weixin4j-mp/pom.xml | 2 +- weixin4j-pay/pom.xml | 2 +- weixin4j-qy/pom.xml | 2 +- weixin4j-server/pom.xml | 2 +- weixin4j-serverX/pom.xml | 2 +- weixin4j-wxa/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 30a2a960..59ac23f0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 7896570a..7975ae11 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-base weixin4j-base diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index 2d99f744..18aecf14 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT war weixin4j-example diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index 7efb0316..c960e2c4 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-mp weixin4j-mp diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 94f9b840..8c5fd6e1 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -5,7 +5,7 @@ weixin4j com.foxinmy - 1.9.0 + 1.9.1-SNAPSHOT 4.0.0 weixin4j-pay diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 5dd69798..7038a9b1 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-qy weixin4j-qy diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index e8c8cca9..5d4a140e 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-server weixin4j-server diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index 892d1adf..ffa115c0 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-serverX weixin4j-serverX diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index ddbefdbd..eec40947 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.0 + 1.9.1-SNAPSHOT weixin4j-wxa weixin4j-wxa From 598b5926e90909bc6e1b57c53fca76461158d652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 21:25:34 +0000 Subject: [PATCH 2/4] Bump netty-codec-http in /weixin4j-server Bumps [netty-codec-http](https://github.com/netty/netty) from 4.1.42.Final to 4.1.59.Final. - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.42.Final...netty-4.1.59.Final) Signed-off-by: dependabot[bot] --- weixin4j-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index 5d4a140e..a21fa253 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -16,7 +16,7 @@ io.netty netty-codec-http - 4.1.42.Final + 4.1.59.Final javax.servlet From 3939caad46550fa1e5a2160b78fee684a6c36ad9 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 6 May 2021 15:14:08 +0800 Subject: [PATCH 3/4] Fix TradeType of PayPackageBuilder#h5Pay. --- .../main/java/com/foxinmy/weixin4j/pay/PayPackageBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/PayPackageBuilder.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/PayPackageBuilder.java index 0b820600..1216adc4 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/PayPackageBuilder.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/PayPackageBuilder.java @@ -158,7 +158,7 @@ public class PayPackageBuilder { public static PayPackageBuilder h5Pay(String body, String outTradeNo, double totalFee, String createIp, String notifyUrl, String wapUrl, String wapName){ 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); SceneInfoApp app = SceneInfoApp.createWapAPP(wapName, wapUrl); instance.mchPayPackage.setSceneInfo(String.format("{\"h5_info\":\"%s\"}", app.getSceneInfo())); From dc53565ddce466df6a4d81d0b9fd08f0b68372a7 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 6 May 2021 15:17:16 +0800 Subject: [PATCH 4/4] Update versions for release --- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- weixin4j-example/pom.xml | 2 +- weixin4j-mp/pom.xml | 2 +- weixin4j-pay/pom.xml | 2 +- weixin4j-qy/pom.xml | 2 +- weixin4j-server/pom.xml | 2 +- weixin4j-serverX/pom.xml | 2 +- weixin4j-wxa/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 59ac23f0..4710d7bf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 7975ae11..cb24f6a1 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-base weixin4j-base diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index 18aecf14..a5639f6a 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 war weixin4j-example diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index c960e2c4..e33e2df5 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-mp weixin4j-mp diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 8c5fd6e1..e28e51c8 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -5,7 +5,7 @@ weixin4j com.foxinmy - 1.9.1-SNAPSHOT + 1.9.1 4.0.0 weixin4j-pay diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 7038a9b1..267d9581 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-qy weixin4j-qy diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index a21fa253..e87af0da 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-server weixin4j-server diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index ffa115c0..611aad32 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-serverX weixin4j-serverX diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index eec40947..cc04275b 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1-SNAPSHOT + 1.9.1 weixin4j-wxa weixin4j-wxa