From 4c64196bec37bad751efce076d0e90eadd31fb53 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 28 Nov 2025 02:01:14 +0000 Subject: [PATCH 1/3] Initial plan From c19db501298fa8bd10f34fa4dd720252c49930c4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 28 Nov 2025 02:05:17 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DV3=E6=96=B0=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=AE=8C=E5=85=A8=E5=85=AC=E9=92=A5=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8BpublicKey=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../com/github/binarywang/wxpay/config/WxPayConfig.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java index ba62a8a502..c0e9101a21 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java @@ -377,6 +377,12 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException { Verifier certificatesVerifier; if (this.fullPublicKeyModel) { // 使用完全公钥模式时，只加载公钥相关配置，避免下载平台证书使灰度切换无法达到100%覆盖 + if (publicKey == null) { + throw new WxPayException("完全公钥模式下，请确保公钥配置（publicKeyPath/publicKeyString/publicKeyContent）已设置"); + } + if (StringUtils.isBlank(this.publicKeyId)) { + throw new WxPayException("完全公钥模式下，请确保publicKeyId已设置"); + } certificatesVerifier = VerifierBuilder.buildPublicCertVerifier(this.publicKeyId, publicKey); } else { certificatesVerifier = VerifierBuilder.build( From 9f9d4c9448b7733f296e0f5725533830367359b5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 28 Nov 2025 02:06:56 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E7=9A=84publicKeyId=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../java/com/github/binarywang/wxpay/config/WxPayConfig.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java index c0e9101a21..f4a1c3d008 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java @@ -378,10 +378,7 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException { if (this.fullPublicKeyModel) { // 使用完全公钥模式时，只加载公钥相关配置，避免下载平台证书使灰度切换无法达到100%覆盖 if (publicKey == null) { - throw new WxPayException("完全公钥模式下，请确保公钥配置（publicKeyPath/publicKeyString/publicKeyContent）已设置"); - } - if (StringUtils.isBlank(this.publicKeyId)) { - throw new WxPayException("完全公钥模式下，请确保publicKeyId已设置"); + throw new WxPayException("完全公钥模式下，请确保公钥配置（publicKeyPath/publicKeyString/publicKeyContent）及publicKeyId已设置"); } certificatesVerifier = VerifierBuilder.buildPublicCertVerifier(this.publicKeyId, publicKey); } else {