From 086c7d40ef82cc0577066aa52f713d8e35aa6182 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Mon, 5 Aug 2024 10:09:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AF=81=E4=B9=A6=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/bootx/platform/common/core/util/CertUtil.java | 7 ++++--- .../core/channel/alipay/service/AliPayCallbackService.java | 2 -- .../core/channel/alipay/service/AliPaySyncService.java | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bootx-platform/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java b/bootx-platform/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java index b8a3444bd..8b20b94cb 100644 --- a/bootx-platform/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java +++ b/bootx-platform/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java @@ -4,10 +4,11 @@ import cn.hutool.core.codec.Base64Encoder; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; -import javax.security.cert.X509Certificate; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.security.PublicKey; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; /** * 证书工具类 @@ -23,8 +24,8 @@ public class CertUtil { */ @SneakyThrows public String getCertByContent(String certContent) { - X509Certificate cert = X509Certificate - .getInstance(new ByteArrayInputStream(certContent.getBytes(StandardCharsets.UTF_8))); + CertificateFactory cf = CertificateFactory. getInstance("X.509"); + Certificate cert = cf.generateCertificate(new ByteArrayInputStream(certContent.getBytes(StandardCharsets.UTF_8))); PublicKey publicKey = cert.getPublicKey(); return Base64Encoder.encode(publicKey.getEncoded()); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCallbackService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCallbackService.java index aba59fa52..c3b0fbacb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCallbackService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCallbackService.java @@ -20,7 +20,6 @@ import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayConstants; import com.alipay.api.internal.util.AlipaySignature; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -92,7 +91,6 @@ public class AliPayCallbackService { /** * 验证信息格式是否合法 */ - @SneakyThrows public boolean verifyNotify() { Map params =PaymentContextLocal.get().getCallbackInfo().getCallbackParam(); String callReq = JSONUtil.toJsonStr(params); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPaySyncService.java index bca42da11..d051bc063 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPaySyncService.java @@ -165,8 +165,6 @@ public class AliPaySyncService { model.setOutBizNo(transferOrder.getTransferNo()); request.setBizModel(model); AlipayFundTransCommonQueryResponse response = alipayClient.execute(request); - System.out.println(response.getBody()); return new TransferSyncResult().setStatus(TransferStatusEnum.FAIL.getCode()); } - }