From 2161f7d6e894f0a9756a0fc69c5e5adbbd61ecac Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Thu, 6 May 2021 15:30:19 +0800 Subject: [PATCH 01/18] 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 4710d7bf..f89e5275 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index cb24f6a1..f1939a9d 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-base weixin4j-base diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index a5639f6a..fbe6f645 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT war weixin4j-example diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index e33e2df5..6a5d6a0e 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-mp weixin4j-mp diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index e28e51c8..bb5a18f2 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -5,7 +5,7 @@ weixin4j com.foxinmy - 1.9.1 + 1.9.2-SNAPSHOT 4.0.0 weixin4j-pay diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 267d9581..6448b89e 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-qy weixin4j-qy diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index e87af0da..5f726435 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-server weixin4j-server diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index 611aad32..dd611991 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-serverX weixin4j-serverX diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index cc04275b..179d11dc 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.1 + 1.9.2-SNAPSHOT weixin4j-wxa weixin4j-wxa From baa9e350ca42d202e7a1c9ab1ccbcccfd38639f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 01:21:19 +0000 Subject: [PATCH 02/18] Bump httpclient from 4.3.6 to 4.5.13 in /weixin4j-base Bumps httpclient from 4.3.6 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- weixin4j-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index f1939a9d..19941996 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -38,7 +38,7 @@ org.apache.httpcomponents httpclient - 4.3.6 + 4.5.13 true From f1dfd5798584d6bf1db3e70ac4675a2b93b09792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 01:25:36 +0000 Subject: [PATCH 03/18] Bump httpclient from 4.3.6 to 4.5.13 in /weixin4j-server Bumps httpclient from 4.3.6 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:development ... 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 5f726435..bb380f27 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -43,7 +43,7 @@ org.apache.httpcomponents httpclient - 4.3.6 + 4.5.13 test From d489ce6ce507e7c9bbf5a584d5c7cfcb4a1a2a4a Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Fri, 4 Jun 2021 09:36:29 +0800 Subject: [PATCH 04/18] Move httpclient version definition to root pom.xml. --- pom.xml | 5 +++++ weixin4j-base/pom.xml | 1 - weixin4j-server/pom.xml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f89e5275..b650866d 100644 --- a/pom.xml +++ b/pom.xml @@ -307,6 +307,11 @@ + + org.apache.httpcomponents + httpclient + 4.5.13 + org.bouncycastle bcprov-jdk16 diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 19941996..a2a95f56 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -38,7 +38,6 @@ org.apache.httpcomponents httpclient - 4.5.13 true diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index bb380f27..e61c0ca8 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -43,7 +43,6 @@ org.apache.httpcomponents httpclient - 4.5.13 test From a2ab1a07c88681f86e6bb8e4fc99a73ec16876a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 16:43:33 +0000 Subject: [PATCH 05/18] Bump logback-core from 1.1.8 to 1.2.0 in /weixin4j-wxa Bumps logback-core from 1.1.8 to 1.2.0. --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- weixin4j-wxa/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index 179d11dc..bc44651d 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -42,7 +42,7 @@ ch.qos.logback logback-core - 1.1.8 + 1.2.0 test From 72d623995d200e922757ddb1684c8c0562071345 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sat, 7 Aug 2021 21:58:47 +0800 Subject: [PATCH 06/18] Set maven plugin default locales from en to zh_CN. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b650866d..9cfcce82 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ UTF-8 1.6 1.6 + zh_CN 1.2.31 From 754c4ebb16886ed2edc3b4debcffe79c322fbd3e Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sat, 7 Aug 2021 22:32:32 +0800 Subject: [PATCH 07/18] Extend the maven plguins from oxerr parent. --- pom.xml | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 9cfcce82..6611b383 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,11 @@ 4.0.0 + + org.oxerr + oxerr-parent + 1.1.0 + com.foxinmy weixin4j 1.9.2-SNAPSHOT @@ -50,7 +55,6 @@ weixin4j-example - UTF-8 1.6 1.6 zh_CN @@ -58,20 +62,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin - 2.6 ${project.build.sourceEncoding} @@ -110,10 +103,6 @@ - - com.amashchenko.maven.plugin - gitflow-maven-plugin - @@ -150,19 +139,11 @@ public - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} http://docs.oracle.com/javase/7/docs/api - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - org.apache.maven.plugins maven-gpg-plugin @@ -176,11 +157,6 @@ - - org.apache.maven.plugins - maven-site-plugin - 3.9.1 - org.apache.maven.plugins maven-surefire-plugin @@ -208,11 +184,6 @@ - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.15.0 - From ce4019b20b12861d59eb196bc8f6b50701ccd768 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sat, 7 Aug 2021 22:42:34 +0800 Subject: [PATCH 08/18] Set findbugs-maven-plugin version. --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 6611b383..0d121108 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,11 @@ + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + From 987dffb167125d07414564614f8d6d3643200bd4 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sat, 7 Aug 2021 22:48:08 +0800 Subject: [PATCH 09/18] Revise maven test skipping setting. --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0d121108..53238ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 1.6 1.6 + true zh_CN 1.2.31 @@ -157,14 +158,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.18 - - true - - org.apache.maven.plugins maven-assembly-plugin From bf8ca3a22710365110faa9efe0a2b86d040939b2 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sat, 7 Aug 2021 23:41:29 +0800 Subject: [PATCH 10/18] Revise maven test skip settings. --- pom.xml | 1 - weixin4j-base/pom.xml | 3 ++ weixin4j-mp/pom.xml | 3 ++ weixin4j-pay/pom.xml | 108 +++++++++++++++++++++------------------- weixin4j-qy/pom.xml | 3 ++ weixin4j-server/pom.xml | 3 ++ 6 files changed, 69 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 53238ab4..00a98ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ 1.6 1.6 - true zh_CN 1.2.31 diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index a2a95f56..9b2d379d 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -11,6 +11,9 @@ weixin4j-base 微信开发基础工程 https://github.com/foxinmy/weixin4j/tree/master/weixin4j-base + + true + diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index 6a5d6a0e..b3b9da03 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -11,6 +11,9 @@ weixin4j-mp https://github.com/foxinmy/weixin4j/tree/master/weixin4j-mp 微信公众平台API + + true + diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index bb5a18f2..0533be55 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -1,53 +1,59 @@ - - - weixin4j - com.foxinmy - 1.9.2-SNAPSHOT - - 4.0.0 - weixin4j-pay - weixin4j-pay - https://github.com/foxinmy/weixin4j/tree/master/weixin4j-pay - 微信支付商户平台API - - - kit-lee - Kit lee - ryuji.cn@gmail.com - https://github.com/kit-lee - - kit_21cn@21cn.com - https://github.com/kit-lee/weixin4j - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - - - com.foxinmy - weixin4j-base - ${project.version} - - - - javax.xml.bind - jaxb-api - 2.2.11 - provided - - - junit - junit - - + + + weixin4j + com.foxinmy + 1.9.2-SNAPSHOT + + 4.0.0 + weixin4j-pay + weixin4j-pay + https://github.com/foxinmy/weixin4j/tree/master/weixin4j-pay + 微信支付商户平台API + + true + + + + kit-lee + Kit lee + ryuji.cn@gmail.com + https://github.com/kit-lee + + kit_21cn@21cn.com + https://github.com/kit-lee/weixin4j + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + + + com.foxinmy + weixin4j-base + ${project.version} + + + + javax.xml.bind + jaxb-api + 2.2.11 + provided + + + junit + junit + + diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 6448b89e..3990cc3d 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -11,6 +11,9 @@ weixin4j-qy https://github.com/foxinmy/weixin4j/tree/master/weixin4j-qy 微信企业号API + + true + diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index e61c0ca8..ad4191da 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -12,6 +12,9 @@ weixin4j-server https://github.com/foxinmy/weixin4j/tree/master/weixin4j-server 微信消息netty服务器 + + true + io.netty From 8d5960980a8641a3f2785769f01838b6d9d04ad3 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sun, 8 Aug 2021 01:21:43 +0800 Subject: [PATCH 11/18] Add how to use for wxa. --- .../foxinmy/weixin4j/wxa/WXBizDataCrypt.java | 10 +++--- weixin4j-wxa/src/site/markdown/index.md | 31 +++++++++++++++++++ weixin4j-wxa/src/site/site.xml | 21 +++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 weixin4j-wxa/src/site/markdown/index.md create mode 100644 weixin4j-wxa/src/site/site.xml diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/WXBizDataCrypt.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/WXBizDataCrypt.java index 2e2fc943..42feca96 100644 --- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/WXBizDataCrypt.java +++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/WXBizDataCrypt.java @@ -15,12 +15,12 @@ import com.alibaba.fastjson.JSONObject; */ public class WXBizDataCrypt { - private final String appid; + private final String appId; private final String sessionKey; - public WXBizDataCrypt(String appid, String sessionKey) { - this.appid = appid; + public WXBizDataCrypt(String appId, String sessionKey) { + this.appId = appId; this.sessionKey = sessionKey; } @@ -40,8 +40,8 @@ public class WXBizDataCrypt { final String decryptedText = new String(decryptedBytes, Charset.forName("UTF-8")); final JSONObject decrypted = JSON.parseObject(decryptedText); - final String appId = decrypted.getJSONObject("watermark").getString("appid"); - if (!appId.equals(this.appid)) { + final String watermarkAppId = decrypted.getJSONObject("watermark").getString("appid"); + if (!watermarkAppId.equals(this.appId)) { throw new IllegalArgumentException("Invalid Buffer"); } diff --git a/weixin4j-wxa/src/site/markdown/index.md b/weixin4j-wxa/src/site/markdown/index.md new file mode 100644 index 00000000..22fa80a0 --- /dev/null +++ b/weixin4j-wxa/src/site/markdown/index.md @@ -0,0 +1,31 @@ +## 欢迎来到 weixin4j-wxa +微信小程序 API 支持 + +### 如何使用 + +```java +var appId = "YOUR APP ID"; +var appSecret = "YOUR APP SECRET"; +var wxAccount = new WeixinAccount(appId, appSecret); +var wxa = new WeixinAppFacade(wxAccount); +var jsCode = request.getParameter("jsCode"); +var session = wxa.getLoginApi().jscode2session(jsCode); +``` + +*更多 API 见 [WeixinAppFacade JavaDoc](apidocs/index.html?com/foxinmy/weixin4j/wxa/WeixinAppFacade.html)。* + +### 解密数据 +客户端 API +[`wx.getUserInfo(Object object)`](https://developers.weixin.qq.com/miniprogram/dev/api/open-api/user-info/wx.getUserInfo.html) +[`wx.getUserProfile(Object object)`](https://developers.weixin.qq.com/miniprogram/dev/api/open-api/user-info/wx.getUserProfile.html) +等请求后得到的加密数据，可以通过下面的方法来解密。 + +客户端将获得的加密数据发往业务服务器，业务服务器收到加密数据后，使用登录 API 获得的 `sessionKey` 解密并进行后续操作： + +```java +var encryptedData = request.getParameter("encryptedData"); +var iv = request.getParameter("iv"); +var sessionKey = session.getSessionKey(); +var wxBizDataCrypt = new WXBizDataCrypt(appId, sessionKey); +var decryptedData = wxBizDataCrypt.decryptData(encryptedData, iv); +``` diff --git a/weixin4j-wxa/src/site/site.xml b/weixin4j-wxa/src/site/site.xml new file mode 100644 index 00000000..7a2d5ea6 --- /dev/null +++ b/weixin4j-wxa/src/site/site.xml @@ -0,0 +1,21 @@ + + + + 微信小程序 + + + 微信小程序 + 微信小程序 + data:image/svg+xml;charset=UTF-8,%3csvg width='36' height='36' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M27.4362985 16.6454925c-.7072239 1.1607165-1.8835821 2.0505075-3.2927761 2.4601791-.0354627.0102687-.0705672.0212538-.1062687.0309254-.2176716.0618508-.4409552.0997015-.6622089.0997015-.9763582 0-1.5276418-.6594627-1.2315224-1.4730746.216597-.5949851.785194-1.097194 1.4791642-1.3296717 1.0755821-.3922388 1.8271044-1.2868059 1.8271044-2.3277612 0-1.4026268-1.3645373-2.5397014-3.0476417-2.5397014-1.6832239 0-3.0476418 1.1370746-3.0476418 2.5397014v7.788418c0 1.8730746-1.0852538 3.515582-2.709015 4.4445373-.8851343.506388-1.9277612.8040597-3.0475224.8040597-3.1743283 0-5.75665667-2.3545075-5.75665667-5.248597 0-.9211941.26340299-1.7863881.72238806-2.5397015.71032836-1.1658508 1.89397011-2.0586269 3.31164181-2.4656717.001194-.0003582.0022686-.0007164.0034627-.0010746.2390447-.0743881.4869253-.1157015.7313433-.1157015.9806567 0 1.5345671.6625672 1.2371343 1.4797612-.2015523.553791-.7443582 1.0306866-1.377194 1.2844179-.0755821.025194-.1491344.0534925-.2217314.0833433-1.0052537.4150448-1.6980298 1.2762985-1.6980298 2.2746269 0 1.4026268 1.3644179 2.539582 3.0476417 2.539582 1.6831045 0 3.0475224-1.1369552 3.0475224-2.539582v-7.788418c0-1.873194 1.0851344-3.515582 2.709015-4.44465667.8851343-.50638806 1.9277612-.8040597 3.0476418-.8040597 3.1742089 0 5.7566567 2.35450747 5.7566567 5.24871637 0 .9210747-.2635224 1.7863881-.7225075 2.5397015M18 2C9.16346269 2 2 9.16346269 2 18c0 8.8365373 7.16346269 16 16 16 8.8365373 0 16-7.1634627 16-16 0-8.83653731-7.1634627-16-16-16' fill='%2307C160' fill-rule='evenodd'/%3e%3c/svg%3e + https://developers.weixin.qq.com/miniprogram/dev/framework/server-ability/backend-api.html + + + + + + + From 5ecd87336e470848155d3139cf5ef96251ed31db Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sun, 8 Aug 2021 01:23:45 +0800 Subject: [PATCH 12/18] Revise doc. --- weixin4j-wxa/src/site/markdown/index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weixin4j-wxa/src/site/markdown/index.md b/weixin4j-wxa/src/site/markdown/index.md index 22fa80a0..99071e80 100644 --- a/weixin4j-wxa/src/site/markdown/index.md +++ b/weixin4j-wxa/src/site/markdown/index.md @@ -20,7 +20,9 @@ var session = wxa.getLoginApi().jscode2session(jsCode); [`wx.getUserProfile(Object object)`](https://developers.weixin.qq.com/miniprogram/dev/api/open-api/user-info/wx.getUserProfile.html) 等请求后得到的加密数据，可以通过下面的方法来解密。 -客户端将获得的加密数据发往业务服务器，业务服务器收到加密数据后，使用登录 API 获得的 `sessionKey` 解密并进行后续操作： +客户端将获得的加密数据发往业务服务器，业务服务器收到加密数据后， +使用[登录凭证校验 API](apidocs/index.html?com/foxinmy/weixin4j/wxa/api/LoginApi.html) +获得的 `sessionKey` 解密并进行后续操作： ```java var encryptedData = request.getParameter("encryptedData"); From 1edd1440b1864c75c93bcc03cb8fe68e00afc66b Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Sun, 8 Aug 2021 02:04:05 +0800 Subject: [PATCH 13/18] Fix scm URL. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00a98ed4..d831489b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - https://github.com/foxinmy/weixin4j + https://github.com/foxinmy/weixin4j/tree/master scm:git:git://github.com/foxinmy/weixin4j.git scm:git:git@github.com:foxinmy/weixin4j.git HEAD From b08c9df31dcdebc7842d28e993aeb0bf70ca3112 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Mon, 16 Aug 2021 17:49:24 +0800 Subject: [PATCH 14/18] Upgrade jedis from 2.8.1 to 3.6.3. --- pom.xml | 5 +++++ weixin4j-base/pom.xml | 1 - .../java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d831489b..24a6cdd6 100644 --- a/pom.xml +++ b/pom.xml @@ -292,6 +292,11 @@ 4.13.1 test + + redis.clients + jedis + 3.6.3 + diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 9b2d379d..3ab94260 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -64,7 +64,6 @@ redis.clients jedis - 2.8.1 true diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java index de084bd4..84a3f238 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/cache/RedisCacheStorager.java @@ -8,7 +8,7 @@ import com.foxinmy.weixin4j.util.SerializationUtils; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; -import redis.clients.util.Pool; +import redis.clients.jedis.util.Pool; /** * 用Redis保存缓存对象(推荐使用) From 17f5374096d9d3086bbc11d184ff7ad77a222c6a Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Mon, 16 Aug 2021 18:50:08 +0800 Subject: [PATCH 15/18] Upgrade dependencies. --- maven-version-rules.xml | 23 +++++++++++++++++ pom.xml | 55 ++++++++++++++++++++++++++++++++++++++-- weixin4j-base/pom.xml | 6 +---- weixin4j-example/pom.xml | 3 --- weixin4j-mp/pom.xml | 1 - weixin4j-pay/pom.xml | 1 - weixin4j-server/pom.xml | 3 --- weixin4j-serverX/pom.xml | 6 ----- weixin4j-wxa/pom.xml | 6 ++--- 9 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 maven-version-rules.xml diff --git a/maven-version-rules.xml b/maven-version-rules.xml new file mode 100644 index 00000000..b3872f47 --- /dev/null +++ b/maven-version-rules.xml @@ -0,0 +1,23 @@ + + + .*(-|\.)(alpha|Alpha|ALPHA|beta|Beta|BETA|rc|RC).* + + + + + .*-alpha[\.\-].* + .*-b[0-9]+ + + + + + .*-b.* + + + + diff --git a/pom.xml b/pom.xml index 24a6cdd6..adaf509e 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ 1.6 1.6 zh_CN - 1.2.31 @@ -103,6 +102,13 @@ + + org.codehaus.mojo + versions-maven-plugin + + file:///${session.executionRootDirectory}/maven-version-rules.xml + + @@ -276,6 +282,16 @@ + + javax.servlet.jsp + jsp-api + 2.2 + + + javax.xml.bind + jaxb-api + 2.3.1 + org.apache.httpcomponents httpclient @@ -286,10 +302,45 @@ bcprov-jdk16 1.46 + + org.springframework + spring-context + 5.3.9 + + + org.springframework + spring-webmvc + 5.3.9 + + + com.alibaba + fastjson + 1.2.78 + + + com.squareup.okhttp3 + okhttp + 4.9.1 + + + ch.qos.logback + logback-core + 1.2.5 + + + io.netty + netty-all + 4.1.67.Final + + + commons-codec + commons-codec + 1.15 + junit junit - 4.13.1 + 4.13.2 test diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 3ab94260..375e5f48 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -26,7 +26,6 @@ com.alibaba fastjson - ${fastjson.version} junit @@ -35,7 +34,7 @@ commons-httpclient commons-httpclient - 3.0 + 3.1 true @@ -46,13 +45,11 @@ io.netty netty-all - 4.1.42.Final true com.squareup.okhttp3 okhttp - 3.4.1 true @@ -80,7 +77,6 @@ javax.xml.bind jaxb-api - 2.2.11 provided diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index fbe6f645..005133ba 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -76,7 +76,6 @@ org.springframework spring-webmvc - 4.1.3.RELEASE javax.servlet @@ -87,7 +86,6 @@ javax.servlet.jsp jsp-api - 2.1 provided @@ -103,7 +101,6 @@ com.squareup.okhttp3 okhttp - 3.3.1 diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index b3b9da03..480fad38 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -32,7 +32,6 @@ javax.xml.bind jaxb-api - 2.2.11 provided diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 0533be55..b7e60605 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -48,7 +48,6 @@ javax.xml.bind jaxb-api - 2.2.11 provided diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index ad4191da..a3f3e53d 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -30,13 +30,11 @@ com.alibaba fastjson - ${fastjson.version} javax.xml.bind jaxb-api - 2.2.11 provided @@ -51,7 +49,6 @@ org.springframework spring-context - 4.2.0.RELEASE true diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index dd611991..d91226b5 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -12,9 +12,6 @@ weixin4j-serverX https://github.com/foxinmy/weixin4j/tree/master/weixin4j-serverX 微信消息接入服务(spring mvc实现) - - 4.2.0.RELEASE - junit @@ -23,13 +20,11 @@ org.springframework spring-webmvc - ${spring.version} javax.xml.bind jaxb-api - 2.2.11 provided @@ -47,7 +42,6 @@ javax.servlet.jsp jsp-api provided - 2.1 diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index bc44651d..ab687ec2 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -21,19 +21,18 @@ - com.foxinmy + ${project.groupId} weixin4j-base ${project.version} - com.foxinmy + ${project.groupId} weixin4j-mp ${project.version} commons-codec commons-codec - 1.10 junit @@ -42,7 +41,6 @@ ch.qos.logback logback-core - 1.2.0 test From aff957f27a0d7fd454548bfe910ca04a4a9f3167 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Mon, 16 Aug 2021 19:00:01 +0800 Subject: [PATCH 16/18] Push down maven-jar-plugin settings to sub projects. --- pom.xml | 27 --------------------------- weixin4j-base/pom.xml | 27 +++++++++++++++++++++++++++ weixin4j-mp/pom.xml | 25 +++++++++++++++++++++++++ weixin4j-pay/pom.xml | 25 +++++++++++++++++++++++++ weixin4j-qy/pom.xml | 25 +++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index adaf509e..9467089c 100644 --- a/pom.xml +++ b/pom.xml @@ -75,33 +75,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - default-jar - package - - jar - - - target/classes - - *.properties - *.xml - *.txt - **/*.md - - - true - - true - - - - org.codehaus.mojo versions-maven-plugin diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 375e5f48..89b875c1 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -15,6 +15,33 @@ true + + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + package + + jar + + + target/classes + + *.properties + *.xml + *.txt + **/*.md + + + true + + + + + + src/main/resources diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index 480fad38..ba6e29a1 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -20,6 +20,31 @@ org.apache.maven.plugins maven-assembly-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + package + + jar + + + target/classes + + *.properties + *.xml + *.txt + **/*.md + + + true + + + + + diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index b7e60605..13bb7d24 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -36,6 +36,31 @@ org.apache.maven.plugins maven-assembly-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + package + + jar + + + target/classes + + *.properties + *.xml + *.txt + **/*.md + + + true + + + + + diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 3990cc3d..270cdde4 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -20,6 +20,31 @@ org.apache.maven.plugins maven-assembly-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + package + + jar + + + target/classes + + *.properties + *.xml + *.txt + **/*.md + + + true + + + + + From 234ffc9319ff64dd25ef399ab520643297361375 Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Mon, 16 Aug 2021 19:09:42 +0800 Subject: [PATCH 17/18] Add coverage report. --- pom.xml | 24 ++++++++++++ weixin4j-coverage/pom.xml | 77 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 weixin4j-coverage/pom.xml diff --git a/pom.xml b/pom.xml index 9467089c..975930c6 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ weixin4j-serverX weixin4j-pay weixin4j-example + weixin4j-coverage 1.6 @@ -82,6 +83,24 @@ file:///${session.executionRootDirectory}/maven-version-rules.xml + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + + report + verify + + report + + + + @@ -160,6 +179,11 @@ findbugs-maven-plugin 3.0.5 + + org.jacoco + jacoco-maven-plugin + 0.8.7 + diff --git a/weixin4j-coverage/pom.xml b/weixin4j-coverage/pom.xml new file mode 100644 index 00000000..9a2af207 --- /dev/null +++ b/weixin4j-coverage/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + + com.foxinmy + weixin4j + 1.9.2-SNAPSHOT + + + weixin4j-coverage + weixin4j-coverage + pom + Compute aggregated test code coverage. + + + true + + + + + ${project.groupId} + weixin4j-base + ${project.version} + + + ${project.groupId} + weixin4j-mp + ${project.version} + + + ${project.groupId} + weixin4j-qy + ${project.version} + + + ${project.groupId} + weixin4j-wxa + ${project.version} + + + ${project.groupId} + weixin4j-server + ${project.version} + + + ${project.groupId} + weixin4j-serverX + ${project.version} + + + ${project.groupId} + weixin4j-pay + ${project.version} + + + + + + + org.jacoco + jacoco-maven-plugin + + + + report-aggregate + + + + + + + + From baec32d7e8a524b36847bc34f6161ba6fd7f3c3a Mon Sep 17 00:00:00 2001 From: Sutra Zhou Date: Mon, 16 Aug 2021 19:10:10 +0800 Subject: [PATCH 18/18] Update versions for release --- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- weixin4j-coverage/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 975930c6..4df3d954 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index 89b875c1..bb2053d0 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-base weixin4j-base diff --git a/weixin4j-coverage/pom.xml b/weixin4j-coverage/pom.xml index 9a2af207..56c4018f 100644 --- a/weixin4j-coverage/pom.xml +++ b/weixin4j-coverage/pom.xml @@ -8,7 +8,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-coverage diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index 005133ba..6abc1c1d 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 war weixin4j-example diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index ba6e29a1..61161c5e 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-mp weixin4j-mp diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml index 13bb7d24..cda1166c 100644 --- a/weixin4j-pay/pom.xml +++ b/weixin4j-pay/pom.xml @@ -8,7 +8,7 @@ weixin4j com.foxinmy - 1.9.2-SNAPSHOT + 1.10.0 4.0.0 weixin4j-pay diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 270cdde4..866faf8d 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-qy weixin4j-qy diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index a3f3e53d..bbc47dc6 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-server weixin4j-server diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml index d91226b5..f9f8c6df 100644 --- a/weixin4j-serverX/pom.xml +++ b/weixin4j-serverX/pom.xml @@ -6,7 +6,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-serverX weixin4j-serverX diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml index ab687ec2..6a433666 100644 --- a/weixin4j-wxa/pom.xml +++ b/weixin4j-wxa/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.9.2-SNAPSHOT + 1.10.0 weixin4j-wxa weixin4j-wxa