From ba30c2bf42ea76571085a057eaf730c21872cfde Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Tue, 11 Jul 2023 20:15:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=BE=AE=E4=BF=A1=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=99p12=E8=AF=81=E4=B9=A6,=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E4=B8=AD=E8=AF=81=E4=B9=A6=E7=9B=B4=E6=8E=A5=E4=BB=A5=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=96=B9=E5=BC=8F=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlipayConfigController.java | 10 +++++----- .../daxpay/controller/CashierController.java | 2 +- .../channel/wechat/entity/WeChatPayConfig.java | 18 ++---------------- .../dto/channel/wechat/WeChatPayConfigDto.java | 8 -------- .../channel/wechat/WeChatPayConfigParam.java | 8 +------- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java index e09e0dd9e..573af7d19 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java @@ -9,7 +9,6 @@ import cn.bootx.platform.daxpay.core.channel.alipay.service.AlipayConfigService; import cn.bootx.platform.daxpay.dto.channel.alipay.AlipayConfigDto; import cn.bootx.platform.daxpay.param.channel.alipay.AlipayConfigParam; import cn.bootx.platform.daxpay.param.channel.alipay.AlipayConfigQuery; -import cn.hutool.core.codec.Base64; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -17,6 +16,7 @@ import lombok.SneakyThrows; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -64,9 +64,9 @@ public class AlipayConfigController { } @SneakyThrows - @Operation(summary = "将文件转换成base64") - @PostMapping("/toBase64") - public ResResult toBase64(MultipartFile file){ - return Res.ok(Base64.encode(file.getBytes())); + @Operation(summary = "读取证书文件内容") + @PostMapping("/readPem") + public ResResult readPem(MultipartFile file){ + return Res.ok(new String(file.getBytes(), StandardCharsets.UTF_8)); } } diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java index 4b694f6c0..6a80d5893 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/CashierController.java @@ -31,7 +31,7 @@ public class CashierController { private final CashierService cashierService; - @Operation(summary = "发起支付(单渠道,包括聚合付款码方式)") + @Operation(summary = "发起支付(单渠道)") @PostMapping("/singlePay") public ResResult singlePay(@RequestBody CashierSinglePayParam cashierSinglePayParam) { return Res.ok(cashierService.singlePay(cashierSinglePayParam)); diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java index bcc772438..97361a90e 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java @@ -77,28 +77,14 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction< @DbColumn(comment = "APPID对应的接口密码") private String appSecret; - /** .p12证书Base64 */ + /** API证书中p12证书Base64 */ @TableField(updateStrategy = FieldStrategy.IGNORED) @BigField @EncryptionField @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) - @DbColumn(comment = "API 证书中的 p12 文件存储的 id") + @DbColumn(comment = "API证书中p12证书Base64") private String p12; - /** cert.pem证书的Base64 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @BigField - @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) - @DbColumn(comment = "cert.pem证书的Base64") - private String certPem; - - /** key.pem的私钥Base64 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) - @BigField - @DbColumn(comment = "私钥key.pem的Base64") - private String keyPem; - /** 应用域名，回调中会使用此参数 */ @DbColumn(comment = "应用域名") private String domain; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java index 5c5e47cef..476a63a63 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java @@ -47,14 +47,6 @@ public class WeChatPayConfigDto extends BaseDto implements Serializable { @SensitiveInfo private String p12; - @Schema(description = "API 证书中的 cert.pem 证书") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String certPem; - - @Schema(description = "API 证书中的 key.pem 私钥") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String keyPem; - @Schema(description = "应用域名，回调中会使用此参数") private String domain; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java index bf6e944db..9f21347c0 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java @@ -46,15 +46,9 @@ public class WeChatPayConfigParam { @Schema(description = "APPID对应的接口密码，用于获取接口调用凭证access_token时使用") private String appSecret; - @Schema(description = "API 证书中的 p12 文件id") + @Schema(description = "API 证书中的 p12 文件") private String p12; - @Schema(description = "API 证书中的 cert.pem 证书") - private String certPem; - - @Schema(description = "API 证书中的 key.pem 私钥") - private String keyPem; - @Schema(description = "应用域名，回调中会使用此参数") private String domain;