diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 4a3998b16..64cd7541f 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 783d5c099..1605e66ec 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -6,7 +6,7 @@ pigx-cloud-dependencies-parent com.pig4cloud - Hoxton.SR5 + Hoxton.SR7 @@ -17,18 +17,17 @@ pigx 公共版本控制 - 3.9.0 + 3.10.0-SNAPSHOT 3.3.2 - 3.0.0 + 3.2.0 1.1.21 - 8.0.20 + 8.0.21 1.5.22 - 3.7.0 - 1.2.0 + 3.8.0 + 2.6.3 3.0.3 2.3.6.RELEASE - 0.9.7.RELEASE - 1.2.69 + 1.2.73 3.0.52.ALL @@ -169,13 +168,13 @@ com.github.javen205 - IJPay + IJPay-WxPay ${ijpay.version} - com.alipay.sdk - alipay-sdk-java - ${aliyun.version} + com.github.javen205 + IJPay-AliPay + ${ijpay.version} @@ -189,12 +188,6 @@ spring-security-oauth2 ${security.oauth.version} - - - io.projectreactor.netty - reactor-netty - ${reactor.netty.version} - @@ -227,7 +220,7 @@ io.spring.javaformat spring-javaformat-maven-plugin - 0.0.22 + 0.0.23 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 0d644fdf5..89ed5533c 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 60e725c33..1c5fed0fe 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index b360490ea..11ddcf45d 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 3.9.0 + 3.10.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index db1dc542c..9061faa4d 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 2a4090a8f..75977be37 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index d8765613e..0bd9ba237 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-gray diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index b64180218..d30092c5b 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index b04ac458e..7f4a87091 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-log diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index 244573cbb..67bc68268 100755 --- a/pigx-common/pigx-common-oss/pom.xml +++ b/pigx-common/pigx-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-oss diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 15ffdbf50..494b0ba8b 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 7a352506c..6fc686880 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 89e6e074a..b1e5f877d 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 6093ab176..12dc88fa9 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-swagger diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index e627b12e6..eca868462 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.9.0 + 3.10.0-SNAPSHOT pigx-common-transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 3ab3f2c4b..850f9b27f 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 8d9d4553e..f9ba8acd1 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index dd8847ae6..1a1b99f1f 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index adf4dc207..a682e1501 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.9.0 + 3.10.0-SNAPSHOT pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 552b0f8b0..f8471d2ab 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.9.0 + 3.10.0-SNAPSHOT pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 785999106..fc92b88e1 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 76b2499a5..1ecbc0e1e 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-codegen diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java index 41ac0a1d5..b4c20b280 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java @@ -117,14 +117,14 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 3b03948bf..593c00630 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT 4.0.0 diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index e86dc6aab..2211aee24 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-monitor diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 73b76e236..cd1f9bd17 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-mp-platform diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java index 0b7b883af..9004e9ffd 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java @@ -16,8 +16,8 @@ package com.pig4cloud.pigx.mp.config; +import me.chanjar.weixin.common.enums.TicketType; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; -import me.chanjar.weixin.mp.enums.TicketType; import org.springframework.data.redis.core.RedisTemplate; import java.util.concurrent.TimeUnit; diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java index be253cbd8..7a9eb2a48 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java @@ -95,8 +95,7 @@ public class WxMaterialController { public R materialNewsUpload(@RequestBody JSONObject data) { try { JSONArray jSONArray = data.getJSONArray("articles"); - List articles = jSONArray - .toList(WxMpMaterialNews.WxMpMaterialNewsArticle.class); + List articles = jSONArray.toList(WxMpNewsArticle.class); WxMpMaterialNews news = new WxMpMaterialNews(); news.setArticles(articles); @@ -127,15 +126,14 @@ public class WxMaterialController { try { String mediaId = data.getStr("mediaId"); JSONArray jSONArray = data.getJSONArray("articles"); - List articles = jSONArray - .toList(WxMpMaterialNews.WxMpMaterialNewsArticle.class); + List articles = jSONArray.toList(WxMpNewsArticle.class); String appId = data.getStr("appId"); WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId); WxMpMaterialService wxMpMaterialService = wxMpService.getMaterialService(); WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate = new WxMpMaterialArticleUpdate(); wxMpMaterialArticleUpdate.setMediaId(mediaId); int index = 0; - for (WxMpMaterialNews.WxMpMaterialNewsArticle article : articles) { + for (WxMpNewsArticle article : articles) { wxMpMaterialArticleUpdate.setIndex(index); wxMpMaterialArticleUpdate.setArticles(article); wxMpMaterialService.materialNewsUpdate(wxMpMaterialArticleUpdate); diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index d4915cb4a..691963f7b 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-oa-platform diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 51ca6d583..17b8e3112 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-pay-platform @@ -80,11 +80,11 @@ com.github.javen205 - IJPay + IJPay-WxPay - com.alipay.sdk - alipay-sdk-java + com.github.javen205 + IJPay-AliPay com.github.binarywang diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java index 192da4a24..29c16c4fd 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java @@ -6,10 +6,10 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.annotation.SqlParser; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jpay.alipay.AliPayApiConfig; -import com.jpay.alipay.AliPayApiConfigKit; -import com.jpay.weixin.api.WxPayApiConfig; -import com.jpay.weixin.api.WxPayApiConfigKit; +import com.ijpay.alipay.AliPayApiConfig; +import com.ijpay.alipay.AliPayApiConfigKit; +import com.ijpay.wxpay.WxPayApiConfig; +import com.ijpay.wxpay.WxPayApiConfigKit; import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; @@ -75,9 +75,9 @@ public class PayConfigParmaInitRunner { // 支付宝支付 if (PayChannelNameEnum.ALIPAY_WAP.getName().equals(channel.getChannelId())) { - AliPayApiConfig aliPayApiConfig = AliPayApiConfig.New().setAppId(channel.getAppId()) + AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder().setAppId(channel.getAppId()) .setPrivateKey(params.getStr("privateKey")).setCharset(CharsetUtil.UTF_8) - .setAlipayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl")) + .setAliPayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl")) .setSignType("RSA2").build(); AliPayApiConfigKit.putApiConfig(aliPayApiConfig); @@ -86,14 +86,13 @@ public class PayConfigParmaInitRunner { // 微信支付 if (PayChannelNameEnum.WEIXIN_MP.getName().equals(channel.getChannelId())) { - WxPayApiConfig wx = WxPayApiConfig.New().setAppId(channel.getAppId()) - .setMchId(channel.getChannelMchId()).setPaternerKey(params.getStr("paternerKey")) - .setPayModel(WxPayApiConfig.PayModel.BUSINESSMODEL); + WxPayApiConfig wx = WxPayApiConfig.builder().appId(channel.getAppId()).mchId(channel.getChannelMchId()) + .partnerKey(params.getStr("paternerKey")).build(); String subMchId = params.getStr("subMchId"); if (StrUtil.isNotBlank(subMchId)) { - wx.setPayModel(WxPayApiConfig.PayModel.SERVICEMODE); - wx.setSubMchId(subMchId); + wx.setSlAppId(channel.getAppId()); + wx.setSlMchId(subMchId); } WxPayApiConfigKit.putApiConfig(wx); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java index f2be300c8..f62363640 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jpay.weixin.api.WxPayApiConfigKit; +import com.ijpay.wxpay.WxPayApiConfigKit; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.annotation.Inner; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java index 82e06d4f8..c9d277f9d 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java @@ -19,9 +19,9 @@ package com.pig4cloud.pigx.pay.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jpay.alipay.AliPayApi; -import com.jpay.ext.kit.HttpKit; -import com.jpay.ext.kit.PaymentKit; +import com.ijpay.alipay.AliPayApi; +import com.ijpay.core.kit.HttpKit; +import com.ijpay.core.kit.WxPayKit; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.annotation.Inner; @@ -141,7 +141,7 @@ public class PayNotifyRecordController { public String wxCallbak(HttpServletRequest request) { String xmlMsg = HttpKit.readData(request); log.info("微信订单回调信息:{}", xmlMsg); - Map params = PaymentKit.xmlToMap(xmlMsg); + Map params = WxPayKit.xmlToMap(xmlMsg); return weChatCallback.handle(params); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java index b3f743418..fd6e2ad37 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java @@ -24,8 +24,8 @@ import cn.hutool.core.util.StrUtil; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jpay.alipay.AliPayApiConfig; -import com.jpay.alipay.AliPayApiConfigKit; +import com.ijpay.alipay.AliPayApiConfig; +import com.ijpay.alipay.AliPayApiConfigKit; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; @@ -116,7 +116,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand } try { - return AlipaySignature.rsaCheckV1(params, apiConfig.getAlipayPublicKey(), CharsetUtil.UTF_8, "RSA2"); + return AlipaySignature.rsaCheckV1(params, apiConfig.getAliPayPublicKey(), CharsetUtil.UTF_8, "RSA2"); } catch (AlipayApiException e) { log.error("支付宝验签失败", e); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java index ec828685d..0a81a5390 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java @@ -21,8 +21,8 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.extra.servlet.ServletUtil; import com.alipay.api.AlipayApiException; import com.alipay.api.domain.AlipayTradeWapPayModel; -import com.jpay.alipay.AliPayApi; -import com.jpay.alipay.AliPayApiConfigKit; +import com.ijpay.alipay.AliPayApi; +import com.ijpay.alipay.AliPayApiConfigKit; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.config.PayCommonProperties; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java index d9c54441a..da00cd4d2 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java @@ -18,9 +18,13 @@ package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.extra.servlet.ServletUtil; -import com.jpay.ext.kit.PaymentKit; -import com.jpay.weixin.api.WxPayApi; -import com.jpay.weixin.api.WxPayApiConfigKit; +import com.ijpay.core.enums.SignType; +import com.ijpay.core.enums.TradeType; +import com.ijpay.core.kit.WxPayKit; +import com.ijpay.wxpay.WxPayApi; +import com.ijpay.wxpay.WxPayApiConfig; +import com.ijpay.wxpay.WxPayApiConfigKit; +import com.ijpay.wxpay.model.UnifiedOrderModel; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.config.PayCommonProperties; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; @@ -29,8 +33,8 @@ import com.pig4cloud.pigx.pay.mapper.PayGoodsOrderMapper; import com.pig4cloud.pigx.pay.mapper.PayTradeOrderMapper; import com.pig4cloud.pigx.pay.utils.OrderStatusEnum; import com.pig4cloud.pigx.pay.utils.PayChannelNameEnum; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -44,19 +48,16 @@ import java.util.Map; */ @Slf4j @Service("WEIXIN_MP") +@RequiredArgsConstructor public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler { - @Autowired - private PayCommonProperties payCommonProperties; + private final PayCommonProperties payCommonProperties; - @Autowired - private PayTradeOrderMapper tradeOrderMapper; + private final PayTradeOrderMapper tradeOrderMapper; - @Autowired - private PayGoodsOrderMapper goodsOrderMapper; + private final PayGoodsOrderMapper goodsOrderMapper; - @Autowired - private HttpServletRequest request; + private final HttpServletRequest request; /** * 创建交易订单 @@ -86,18 +87,23 @@ public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler { @Override public Object pay(PayGoodsOrder goodsOrder, PayTradeOrder tradeOrder) { String ip = ServletUtil.getClientIP(request); - Map params = WxPayApiConfigKit.getWxPayApiConfig() - .setAttach(TenantContextHolder.getTenantId().toString()).setBody(goodsOrder.getGoodsName()) - .setSpbillCreateIp(ip).setTotalFee(goodsOrder.getAmount()).setOpenId(goodsOrder.getUserId()) - .setTradeType(WxPayApi.TradeType.JSAPI) - .setNotifyUrl(payCommonProperties.getWxPayConfig().getNotifyUrl()) - .setOutTradeNo(tradeOrder.getOrderId()).build(); + WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); + + // 预订单参数 + Map params = UnifiedOrderModel.builder().appid(wxPayApiConfig.getAppId()) + .mch_id(wxPayApiConfig.getMchId()).nonce_str(WxPayKit.generateStr()).body(goodsOrder.getGoodsName()) + .attach(TenantContextHolder.getTenantId().toString()).out_trade_no(tradeOrder.getOrderId()) + .total_fee(goodsOrder.getAmount()).spbill_create_ip(ip) + .notify_url(payCommonProperties.getWxPayConfig().getNotifyUrl()) + .trade_type(TradeType.JSAPI.getTradeType()).openid(goodsOrder.getUserId()).build() + .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256); String xmlResult = WxPayApi.pushOrder(false, params); log.info(xmlResult); - Map resultMap = PaymentKit.xmlToMap(xmlResult); + Map resultMap = WxPayKit.xmlToMap(xmlResult); String prepayId = resultMap.get("prepay_id"); - return PaymentKit.prepayIdCreateSign(prepayId); + return WxPayKit.prepayIdCreateSign(prepayId, wxPayApiConfig.getAppId(), wxPayApiConfig.getPartnerKey(), + SignType.HMACSHA256); } /** diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java index f92c72fdc..7c478f607 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java @@ -20,8 +20,8 @@ package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.EnumUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jpay.ext.kit.PaymentKit; -import com.jpay.weixin.api.WxPayApiConfigKit; +import com.ijpay.core.kit.WxPayKit; +import com.ijpay.wxpay.WxPayApiConfigKit; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; @@ -91,7 +91,7 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public Boolean verifyNotify(Map params) { - if (!PaymentKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey())) { + if (!WxPayKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getApiKey())) { log.warn("微信支付回调验签失败", params); return null; } @@ -128,7 +128,7 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand Map xml = new HashMap<>(4); xml.put("return_code", "SUCCESS"); xml.put("return_msg", "OK"); - return PaymentKit.toXml(xml); + return WxPayKit.toXml(xml); } /** diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index 094f1f62b..44d853f6c 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-sentinel-dashboard diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index ef30254f6..c4cf08ab2 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -29,7 +29,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index f7d43a047..b3d149d2f 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.9.0 + 3.10.0-SNAPSHOT pigx-tx-manager diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 795eb94b9..0668510b5 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT pigx-visual diff --git a/pom.xml b/pom.xml index 3297723d0..ea760fb51 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.9.0 + 3.10.0-SNAPSHOT ${project.artifactId} pom @@ -33,17 +33,17 @@ - 2.3.1.RELEASE - Hoxton.SR5 + 2.3.2.RELEASE + Hoxton.SR7 2.2.1.RELEASE UTF-8 1.8 1.8 3.8.1 - 0.0.22 + 0.0.23 2.2.5 - 2.2.3 - 5.3.7 + 2.2.4 + 5.3.10 1.2.0 2.9.2 2.0.3