From 6c2bd52f79c8cea8f3d34a7f25767be273994555 Mon Sep 17 00:00:00 2001 From: bootx Date: Fri, 16 Feb 2024 21:06:53 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=90=84=E7=A7=8D=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- daxpay-single-sdk/pom.xml | 14 +++++++------- .../daxpay/result/assist/WxAuthUrlResult.java | 4 ++-- .../gateway}/controller/ForwardH5Controller.java | 2 +- .../gateway/controller/UniPayAssistController.java | 4 ++-- .../core/channel/alipay/entity/AliPayConfig.java | 8 ++++---- .../core/record/repair/entity/PayRepairRecord.java | 2 +- .../core/system/config/entity/PayApiConfig.java | 1 + .../src/main/resources/application-dev.yml | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) rename {daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo => daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway}/controller/ForwardH5Controller.java (90%) diff --git a/README.md b/README.md index 698e5a215..7115d1365 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ 在 [Bootx开源文档站](https://bootx.gitee.io/) 下的支付网关(DaxPay)模块下可以进行查阅相关文档，具体链接地址如下： [快速指南](https://bootx.gitee.io/daxpay/guides/overview/项目介绍.html)、 [支付对接](https://bootx.gitee.io/daxpay/gateway/overview/接口清单.html)、 -[平台配置](https://bootx.gitee.io/daxpay/admin/config/平台配置.html) +[操作手册](https://bootx.gitee.io/daxpay/admin/config/平台配置.html) ### 项目地址 后端地址：[https://gitee.com/bootx/dax-pay](https://gitee.com/bootx/dax-pay) @@ -121,14 +121,14 @@ H5前端地址：[https://gitee.com/bootx/dax-pay-h5](https://gitee.com/bootx/da QQ扫码加入QQ交流群

- +

## 🍻 鸣谢 感谢 JetBrains 提供的免费开源 License： -[![JetBrains](_doc/images/jetbrains.png)](https://www.jetbrains.com/?from=bootx) +[![jetbrains](https://jsd.cdn.zzko.cn/gh/xxm1995/bootx-img@master/bootx/jetbrains.y9o7c2ydh80.webp)](https://www.jetbrains.com/?from=bootx) 感谢其他提供灵感和思路的开源项目 diff --git a/daxpay-single-sdk/pom.xml b/daxpay-single-sdk/pom.xml index e6f2bcde2..90a54c32e 100644 --- a/daxpay-single-sdk/pom.xml +++ b/daxpay-single-sdk/pom.xml @@ -10,9 +10,9 @@ jar - bootx-platform - bootx-platform 基于Spring Boot框架打造，针对单体式应用进行专门设计，提供整套服务模块，努力为打造全方位企业级开发解决方案 - https://gitee.com/bootx/bootx-platform + daxpay-single-sdk + daxpay-single-sdk 是 daxpay单商户版的JavaSDK，用于业务系统快速接入到支付网关中 + https://gitee.com/bootx/daxpay @@ -29,14 +29,14 @@ bootx xxm1995@outlook.com bootx - https://gitee.com/bootx/bootx-platform + https://gitee.com/bootx/daxpay - scm:git:git@gitee.com:bootx/bootx-platform.git - scm:git:git@gitee.com:bootx/bootx-platform.git - https://gitee.com/bootx/bootx-platform + scm:git:git@gitee.com:bootx/daxpay.git + scm:git:git@gitee.com:bootx/daxpay.git + https://gitee.com/bootx/daxpay diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/assist/WxAuthUrlResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/assist/WxAuthUrlResult.java index 53f6b8bfb..259ade939 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/assist/WxAuthUrlResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/assist/WxAuthUrlResult.java @@ -11,9 +11,9 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@Schema(title = "微信oauth2授权的url连接") +@Schema(title = "微信oauth2授权的url") public class WxAuthUrlResult { - @Schema(description = "微信oauth2授权的url连接") + @Schema(description = "微信oauth2授权的url") private String url; } diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/controller/ForwardH5Controller.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/ForwardH5Controller.java similarity index 90% rename from daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/controller/ForwardH5Controller.java rename to daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/ForwardH5Controller.java index 7057f9f69..3aaabce1a 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/controller/ForwardH5Controller.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/ForwardH5Controller.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.demo.controller; +package cn.bootx.platform.daxpay.gateway.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayAssistController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayAssistController.java index 5361e2995..d3cdf1606 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayAssistController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayAssistController.java @@ -35,7 +35,7 @@ public class UniPayAssistController { @CountTime @PaymentApi("getWxAuthUrl") - @Operation(summary = "获取微信oauth2授权的url") + @Operation(summary = "获取微信oauth2授权连接") @PostMapping("/getWxAuthUrl") public DaxResult getWxAuthUrl(@RequestBody WxAuthUrlParam param){ return DaxRes.ok(uniPayAssistService.getWxAuthUrl(param)); @@ -43,7 +43,7 @@ public class UniPayAssistController { @CountTime @PaymentApi("getWxAccessToken") - @Operation(summary = "获取微信AccessToken数据") + @Operation(summary = "获取微信AccessToken") @PostMapping("/getWxAccessToken") public ResResult getWxAccessToken(@RequestBody WxAccessTokenParam param){ return Res.ok(uniPayAssistService.getWxAccessToken(param)); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java index 7e1c014cc..749adc2bb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java @@ -59,8 +59,8 @@ public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction