From e1ec5f1b7cf7206390a9986c9feedc5a2881a7bb Mon Sep 17 00:00:00 2001 From: xiafang Date: Tue, 3 Jan 2023 15:32:50 +0800 Subject: [PATCH] =?UTF-8?q?upgrade:=20spring=20boot=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.7.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 18 ++++++++++++------ docs/README.md | 2 +- docs/changelog.md | 11 +++++++++++ docs/quick_start.md | 2 +- payment-spring-boot-autoconfigure/pom.xml | 4 ++-- .../wechat/v3/WechatBrandProfitsharingApi.java | 4 ---- payment-spring-boot-starter/pom.xml | 4 ++-- pom.xml | 4 ++-- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 5f2256e..9a5b36f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Maven Central Repo Deployment](https://github.com/NotFound403/payment-spring-boot/actions/workflows/main.yml/badge.svg)](https://github.com/NotFound403/payment-spring-boot/actions/workflows/main.yml) + # 最好用的微信支付V3 Spring Boot 组件 为了满足业务中出现app支付、公众号支付、小程序支付等多appid并存的场景，对原有的进行了增强开发出了多租户版本。 @@ -11,9 +13,16 @@ cn.felord payment-spring-boot-starter - 1.0.14.RELEASE + 1.0.15.RELEASE ``` +## JDK问题 + +**推荐使用Open JDK**，原因参见[FBI Warning](https://github.com/NotFound403/payment-spring-boot/issues/5) + +## 文档地址 +- [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot) +- [payment-spring-boot Gitee文档](https://felord.gitee.io/payment-spring-boot) ## 目前已经实现所有服务商和直连商户接口 @@ -27,12 +36,13 @@ - 实现微信支付V3 商家券 - 实现微信支付V3 批量转账到零钱 -更多参考[changelog](https://notfound403.github.io/payment-spring-boot/#/changelog) +更新日志参考[changelog](https://notfound403.github.io/payment-spring-boot/#/changelog) ## 核心API结构 ![](https://asset.felord.cn/blog/20220613092244.png) - `WechatPartnerProfitsharingApi` 微信支付服务商V3分账 +- `WechatBrandProfitsharingApi` 微信支付服务商V3连锁品牌分账 - `WechatPayCallback` 微信支付V3回调通知工具封装 - `WechatAllocationApi` 微信支付V2分账（未来会移除） - `WechatMarketingFavorApi` 微信支付代金券V3 @@ -61,10 +71,6 @@ ## 仓库地址 - [GitHub](https://github.com/NotFound403/payment-spring-boot) - [Gitee](https://gitee.com/felord/payment-spring-boot) - -## 文档地址 -- [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot) -- [payment-spring-boot Gitee文档](https://felord.gitee.io/payment-spring-boot) ## QQ交流群 为了交流解惑，新建QQ群，可通过扫码进入。 diff --git a/docs/README.md b/docs/README.md index b0e8261..5c6cc28 100644 --- a/docs/README.md +++ b/docs/README.md @@ -35,7 +35,7 @@ cn.felord payment-spring-boot-starter - 1.0.14.RELEASE + 1.0.15.RELEASE ``` ## 采用技术 diff --git a/docs/changelog.md b/docs/changelog.md index 688df4f..d646be1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,14 @@ +## 1.0.15.RELEASE +### 微信支付 +- feat: 增加服务商退款API +- feat: 微信服务商分账-连锁品牌分账 [#82](https://github.com/NotFound403/payment-spring-boot/issues/82) +- fix: 多租户证书无法复用的问题，刷新时正确移除证书 [#77](https://github.com/NotFound403/payment-spring-boot/issues/77) +- fix: 批量转账到零钱API入参NPE问题修复 [#85](https://github.com/NotFound403/payment-spring-boot/issues/85) +- fix: 商家券-修改批次预算API请求方法应该为Patch [#79](https://github.com/NotFound403/payment-spring-boot/issues/79) +- enhance: 部分时间格式优化，更好地兼容Java Time API +- enhance: 微信代金券样式的背景颜色枚举更新 [#84](https://github.com/NotFound403/payment-spring-boot/issues/84) +- upgrade: Spring Boot 版本升级到2.7.4 + ## 1.0.14.RELEASE ### 微信支付 - fix: 批量转账到零钱查询BUG [#I5E2X7](https://gitee.com/felord/payment-spring-boot/issues/I5E2X7) diff --git a/docs/quick_start.md b/docs/quick_start.md index e3e18f3..a53bf3d 100644 --- a/docs/quick_start.md +++ b/docs/quick_start.md @@ -4,7 +4,7 @@ cn.felord payment-spring-boot-starter - 1.0.14.RELEASE + 1.0.15.RELEASE ``` > 基于 **Spring Boot 2.x** diff --git a/payment-spring-boot-autoconfigure/pom.xml b/payment-spring-boot-autoconfigure/pom.xml index 1c89273..ad8d5c7 100644 --- a/payment-spring-boot-autoconfigure/pom.xml +++ b/payment-spring-boot-autoconfigure/pom.xml @@ -5,11 +5,11 @@ cn.felord payment-spring-boot - 1.0.14.RELEASE + 1.0.15.RELEASE payment-spring-boot-autoconfigure - 1.0.14.RELEASE + 1.0.15.RELEASE jar 4.0.0 diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBrandProfitsharingApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBrandProfitsharingApi.java index b25ee73..e18252b 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBrandProfitsharingApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBrandProfitsharingApi.java @@ -1,15 +1,12 @@ package cn.felord.payment.wechat.v3; import cn.felord.payment.wechat.WechatPayProperties; -import cn.felord.payment.wechat.enumeration.ReceiverType; import cn.felord.payment.wechat.enumeration.TarType; import cn.felord.payment.wechat.enumeration.WeChatServer; import cn.felord.payment.wechat.enumeration.WechatPayV3Type; import cn.felord.payment.wechat.v3.model.ecommerce.BrandReceiver; import cn.felord.payment.wechat.v3.model.ecommerce.BrandReceiverDeleteParams; import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceFinishOrder; -import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceReceiver; -import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceReceiverDeleteParams; import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceReturnOrderParams; import cn.felord.payment.wechat.v3.model.profitsharing.BrandProfitsharingOrder; import cn.felord.payment.wechat.v3.model.profitsharing.PartnerProfitsharingBillParams; @@ -17,7 +14,6 @@ import cn.felord.payment.wechat.v3.model.profitsharing.PartnerQueryOrderParams; import cn.felord.payment.wechat.v3.model.profitsharing.PartnerReturnOrdersParams; import com.fasterxml.jackson.databind.node.ObjectNode; import org.springframework.core.io.Resource; -import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/payment-spring-boot-starter/pom.xml b/payment-spring-boot-starter/pom.xml index a9e02c7..56d079f 100644 --- a/payment-spring-boot-starter/pom.xml +++ b/payment-spring-boot-starter/pom.xml @@ -5,11 +5,11 @@ cn.felord payment-spring-boot - 1.0.14.RELEASE + 1.0.15.RELEASE payment-spring-boot-starter - 1.0.14.RELEASE + 1.0.15.RELEASE jar 4.0.0 diff --git a/pom.xml b/pom.xml index 71595b3..31e60fd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.felord payment-spring-boot - 1.0.14.RELEASE + 1.0.15.RELEASE pom 4.0.0 @@ -71,7 +71,7 @@ UTF-8 UTF-8 1.8 - 2.7.4 + 2.7.7 4.31.7.ALL 1.67