From 30613a2fdd4e4e01924167368f9e5e846bbb41d0 Mon Sep 17 00:00:00 2001 From: xiafang Date: Wed, 1 Mar 2023 09:24:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?enhance:=20=E4=BC=98=E5=8C=96=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81Docker=E5=86=85=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #94 --- .../felord/payment/wechat/InMemoryWechatTenantService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java index 78bc9fd..e4ba13e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java @@ -20,9 +20,9 @@ package cn.felord.payment.wechat; import cn.felord.payment.wechat.v3.KeyPairFactory; import cn.felord.payment.wechat.v3.WechatMetaBean; import lombok.AllArgsConstructor; -import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; import java.util.Map; import java.util.Set; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class InMemoryWechatTenantService implements WechatTenantService { private final WechatPayProperties wechatPayProperties; - + private final ResourceLoader resourceLoader; @Override public Set loadTenants() { Map v3Map = wechatPayProperties.getV3(); @@ -51,7 +51,7 @@ public class InMemoryWechatTenantService implements WechatTenantService { String certAbsolutePath = v3.getCertAbsolutePath(); String mchId = v3.getMchId(); Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) : - new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); + resourceLoader.getResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, mchId); wechatMetaBean.setV3(v3); wechatMetaBean.setTenantId(tenantId); From 5e63779f3638aac017dcc3e86bbcbb1d63efb6d7 Mon Sep 17 00:00:00 2001 From: xiafang Date: Wed, 1 Mar 2023 09:29:36 +0800 Subject: [PATCH 02/11] 1.0.18 --- README.md | 2 +- docs/README.md | 2 +- docs/quick_start.md | 2 +- payment-spring-boot-autoconfigure/pom.xml | 4 ++-- payment-spring-boot-starter/pom.xml | 4 ++-- pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bf2fbd7..ca89197 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Starter，支持微信优惠券，代金券、商家券、智慧商圈、商家 cn.felord payment-spring-boot-starter - 1.0.17.RELEASE + 1.0.18.RELEASE ``` diff --git a/docs/README.md b/docs/README.md index 7dc84d4..748e750 100644 --- a/docs/README.md +++ b/docs/README.md @@ -35,7 +35,7 @@ cn.felord payment-spring-boot-starter - 1.0.17.RELEASE + 1.0.18.RELEASE ``` ## 采用技术 diff --git a/docs/quick_start.md b/docs/quick_start.md index 3350856..ac4e6b2 100644 --- a/docs/quick_start.md +++ b/docs/quick_start.md @@ -4,7 +4,7 @@ cn.felord payment-spring-boot-starter - 1.0.17.RELEASE + 1.0.18.RELEASE ``` > 基于 **Spring Boot 2.x** diff --git a/payment-spring-boot-autoconfigure/pom.xml b/payment-spring-boot-autoconfigure/pom.xml index 5633c86..3c85483 100644 --- a/payment-spring-boot-autoconfigure/pom.xml +++ b/payment-spring-boot-autoconfigure/pom.xml @@ -22,11 +22,11 @@ cn.felord payment-spring-boot - 1.0.17.RELEASE + 1.0.18.RELEASE payment-spring-boot-autoconfigure - 1.0.17.RELEASE + 1.0.18.RELEASE jar 4.0.0 diff --git a/payment-spring-boot-starter/pom.xml b/payment-spring-boot-starter/pom.xml index d02ac7a..9469996 100644 --- a/payment-spring-boot-starter/pom.xml +++ b/payment-spring-boot-starter/pom.xml @@ -22,11 +22,11 @@ cn.felord payment-spring-boot - 1.0.17.RELEASE + 1.0.18.RELEASE payment-spring-boot-starter - 1.0.17.RELEASE + 1.0.18.RELEASE jar 4.0.0 diff --git a/pom.xml b/pom.xml index 40fe902..a6954b9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,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.17.RELEASE + 1.0.18.RELEASE pom 4.0.0 From 997f0047084695424d7b14f0002197c668689825 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 6 Mar 2023 22:31:55 +0800 Subject: [PATCH 03/11] =?UTF-8?q?enhance:=20=E5=A2=9E=E5=BC=BA=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=8A=A0=E8=BD=BD=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../felord/payment/wechat/InMemoryWechatTenantService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java index e4ba13e..e35272b 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java @@ -23,6 +23,7 @@ import lombok.AllArgsConstructor; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; +import org.springframework.util.ResourceUtils; import java.util.Map; import java.util.Set; @@ -38,6 +39,7 @@ import java.util.stream.Collectors; public class InMemoryWechatTenantService implements WechatTenantService { private final WechatPayProperties wechatPayProperties; private final ResourceLoader resourceLoader; + @Override public Set loadTenants() { Map v3Map = wechatPayProperties.getV3(); @@ -51,7 +53,8 @@ public class InMemoryWechatTenantService implements WechatTenantService { String certAbsolutePath = v3.getCertAbsolutePath(); String mchId = v3.getMchId(); Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) : - resourceLoader.getResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); + resourceLoader.getResource(certPath == null ? "classpath:wechat/apiclient_cert.p12" : + certPath.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX) ? certPath : ResourceUtils.CLASSPATH_URL_PREFIX + certPath); WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, mchId); wechatMetaBean.setV3(v3); wechatMetaBean.setTenantId(tenantId); From f7ba4dd306c0d621e46d3ca42fde9d8bc80fdf2c Mon Sep 17 00:00:00 2001 From: xiafang Date: Wed, 8 Mar 2023 13:39:11 +0800 Subject: [PATCH 04/11] 1.0.18 --- .../payment/wechat/WechatTenantServiceConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java index a34e312..575c93e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java @@ -22,6 +22,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ResourceLoader; /** * The type Wechat tenant service configuration. @@ -42,7 +43,7 @@ public class WechatTenantServiceConfiguration { */ @Bean @ConditionalOnMissingBean - public WechatTenantService wechatTenantService(WechatPayProperties wechatPayProperties) { - return new InMemoryWechatTenantService(wechatPayProperties); + public WechatTenantService wechatTenantService(WechatPayProperties wechatPayProperties, ResourceLoader resourceLoader) { + return new InMemoryWechatTenantService(wechatPayProperties, resourceLoader); } } From f630301bc3a5fdd131a045a7e99e790894762e3d Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 10 Mar 2023 22:30:47 +0800 Subject: [PATCH 05/11] =?UTF-8?q?docs:=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=88=B0dromara=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ca89197..34ab5b6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

最全最好用的微信支付V3 Spring Boot 组件

- - + + @@ -13,8 +13,8 @@ - - + + @@ -48,27 +48,27 @@ Starter，支持微信优惠券，代金券、商家券、智慧商圈、商家 ## JDK问题 -**推荐使用Open JDK**，原因参见[FBI Warning](https://github.com/NotFound403/payment-spring-boot/issues/5) +**推荐使用Open JDK**，原因参见[FBI Warning](https://github.com/dromara/payment-spring-boot/issues/5) ## 文档地址 -- [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot) +- [payment-spring-boot GitHub文档](https://dromara.github.io/payment-spring-boot) ## API清单 -目前已经实现绝大部分微信支付直连商户和服务商的接口，具体的API明细可查看[API清单](https://notfound403.github.io/payment-spring-boot/#/wechat_v3_api) +目前已经实现绝大部分微信支付直连商户和服务商的接口，具体的API明细可查看[API清单](https://dromara.github.io/payment-spring-boot/#/wechat_v3_api) > 随着版本迭代功能会增加，也可通过API注册表类`WechatPayV3Type`进行API接口检索。 ## CHANGELOG -更新日志[CHANGELOG](https://notfound403.github.io/payment-spring-boot/#/changelog) +更新日志[CHANGELOG](https://dromara.github.io/payment-spring-boot/#/changelog) ## 使用入门 ### 集成配置 -关于集成配置请详细阅读[payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot) -中[快速接入](https://notfound403.github.io/payment-spring-boot/#/quick_start)章节 +关于集成配置请详细阅读[payment-spring-boot GitHub文档](https://dromara.github.io/payment-spring-boot) +中[快速接入](https://dromara.github.io/payment-spring-boot/#/quick_start)章节 ### 调用示例 @@ -347,7 +347,7 @@ public class CallbackController { ## 仓库地址 -- [GitHub](https://github.com/NotFound403/payment-spring-boot) +- [GitHub](https://github.com/dromara/payment-spring-boot) - [Gitee](https://gitee.com/felord/payment-spring-boot) ## QQ交流群 From aef8ef9ac31f021c9f63147e27f78c02cd45c163 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 10 Mar 2023 22:32:52 +0800 Subject: [PATCH 06/11] =?UTF-8?q?factor:=E7=A7=BB=E9=99=A4=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E7=9A=84V2=E9=80=80=E6=AC=BEAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/wechat/v2/model/RefundModel.java | 43 ------------------- .../wechat/v2/model/RefundQueryModel.java | 25 ----------- 2 files changed, 68 deletions(-) delete mode 100644 payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundModel.java delete mode 100644 payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundQueryModel.java diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundModel.java deleted file mode 100644 index 8f094c6..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundModel.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.felord.payment.wechat.v2.model; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author felord.cn - * @since 1.0.4.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class RefundModel extends BaseModel { - - private String appid; - private String mchId; - private String signType="MD5"; - private String transactionId; - private String outTradeNo; - private String outRefundNo; - private Integer totalFee; - private Integer refundFee; - private String refundFeeType="CNY"; - private String refundDesc; - private String refundAccount; - private String notifyUrl; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundQueryModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundQueryModel.java deleted file mode 100644 index 6c9c415..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/RefundQueryModel.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.felord.payment.wechat.v2.model; - -/** - * @author felord.cn - * @since 1.0.4.RELEASE - */ -public class RefundQueryModel { -} From 8578300d1c6d0f0562371d29bc2b613058b7ba05 Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 24 Mar 2023 13:40:22 +0800 Subject: [PATCH 07/11] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/wechat_v3_api.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/wechat_v3_api.md b/docs/wechat_v3_api.md index 65a92b6..c8de1c8 100644 --- a/docs/wechat_v3_api.md +++ b/docs/wechat_v3_api.md @@ -9,8 +9,8 @@ #### 基础支付 - [x] `WechatDirectPayApi` 基础支付，通过`WechatApiProvider#directPayApi`初始化 - - [x] `jsPay` APP下单 - - [x] `appPay` JSAPI/小程序下单 + - [x] `jsPay` JSAPI/小程序下单 + - [x] `appPay` APP下单 - [x] `h5Pay` H5下单 - [x] `nativePay` Native下单 - [x] 查询订单 @@ -24,8 +24,8 @@ - [x] `downloadTradeBill` 申请交易账单，直接下载为gzip或者txt文件 - [x] `downloadFundFlowBill` 申请资金账单，直接下载为gzip或者txt文件 - [x] `WechatCombinePayApi` 合单支付，通过`WechatApiProvider#combinePayApi`初始化 - - [x] `jsPay` 合单APP下单 - - [x] `appPay` 合单JSAPI/小程序下单 + - [x] `jsPay` 合单JSAPI/小程序下单 + - [x] `appPay` 合单APP下单 - [x] `h5Pay` 合单H5下单 - [x] `nativePay` 合单Native下单 - [x] `queryTransactionByOutTradeNo` 查询订单，**合单支付目前只支持商户订单号查询** From e6e704cc281a98bf7fbd3c475bd3daf1f69df8ee Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 24 Mar 2023 13:43:34 +0800 Subject: [PATCH 08/11] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/_sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_sidebar.md b/docs/_sidebar.md index 6be5292..1214bf2 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -2,6 +2,6 @@ * [项目简介](README.md) * [快速接入](quick_start.md) * [JavaDoc](apidocs/index.html ':ignore') -* [微信支付V3接口文档](wechat_v3_api.md) +* [Payment微信支付V3接口文档](wechat_v3_api.md) * [日常踩坑](stackoverflow.md) * [更新日志](changelog.md) From dc6e48d5387d922f28284a82db6a17a75de0ddec Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 5 May 2023 12:20:06 +0800 Subject: [PATCH 09/11] =?UTF-8?q?enhance:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E6=9C=BA?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5=E4=B8=8D?= =?UTF-8?q?=E5=81=9C=E6=9C=BA=E7=BB=B4=E6=8A=A4=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=8F=82=E6=95=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/wechat/WechatPayConfiguration.java | 4 +--- .../payment/wechat/v3/WechatMetaContainer.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java index f2c77c5..56b3a04 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java @@ -43,9 +43,7 @@ public class WechatPayConfiguration { @Bean @ConditionalOnMissingBean WechatMetaContainer wechatMetaContainer(WechatTenantService wechatTenantService) { - WechatMetaContainer container = new WechatMetaContainer(); - container.addWechatMetas(wechatTenantService.loadTenants()); - return container; + return new WechatMetaContainer(wechatTenantService); } /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java index 5109bec..d82c0ca 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java @@ -17,6 +17,9 @@ package cn.felord.payment.wechat.v3; +import cn.felord.payment.wechat.WechatTenantService; +import lombok.AllArgsConstructor; + import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; @@ -27,10 +30,11 @@ import java.util.concurrent.ConcurrentSkipListSet; * @author felord.cn * @since 1.0.0.RELEASE */ +@AllArgsConstructor public class WechatMetaContainer { private final Map wechatMetaBeanMap = new ConcurrentHashMap<>(); private final Set tenantIds = new ConcurrentSkipListSet<>(); - + private final WechatTenantService wechatTenantService; /** * Add wechat metas. @@ -66,7 +70,14 @@ public class WechatMetaContainer { * @return the wechat meta */ public WechatMetaBean getWechatMeta(String tenantId) { - return Objects.requireNonNull(this.wechatMetaBeanMap.get(tenantId)); + WechatMetaBean wechatMetaBean = this.wechatMetaBeanMap.get(tenantId); + if (Objects.nonNull(wechatMetaBean)) { + return wechatMetaBean; + } else { + this.addWechatMetas(wechatTenantService.loadTenants()); + return Objects.requireNonNull(this.wechatMetaBeanMap.get(tenantId), + "cant obtain the config with tenant: "+tenantId); + } } /** From 730c15b6b83799d53829922f3364359fa564ce34 Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 5 May 2023 12:33:21 +0800 Subject: [PATCH 10/11] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a6954b9..eae2276 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ - payment-spring-boot-1.0.14.RELEASE + payment-spring-boot-1.0.18.RELEASE https://github.com/NotFound403/payment-spring-boot scm:git:https://github.com/NotFound403/payment-spring-boot.git scm:git:https://github.com/NotFound403/payment-spring-boot.git From 4271491bc363a3a1c00977d5e3d12b896c60b7ed Mon Sep 17 00:00:00 2001 From: xiafang Date: Fri, 5 May 2023 12:41:23 +0800 Subject: [PATCH 11/11] Merge README.md --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 34ab5b6..1677836 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,17 @@ - + 点击立即微信咨询 - - 点击加入QQ交流群 + + 点击加入QQ交流①群（满） + + + 点击加入QQ交流②群

@@ -348,10 +351,5 @@ public class CallbackController { ## 仓库地址 - [GitHub](https://github.com/dromara/payment-spring-boot) -- [Gitee](https://gitee.com/felord/payment-spring-boot) - -## QQ交流群 - -为了交流解惑，新建QQ群，可通过扫码进入。 - -![QQ交流群](./docs/img/qqun.png) +- [Gitee](https://gitee.com/dromara/payment-spring-boot) +