From af805ef132e8033c768bd6f734f6682ee341f4c2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 十一月 2025 09:06:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java
index 834edae..c94b99e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java
@@ -127,8 +127,8 @@
    */
   public static PublicKey loadPublicKeyFromString(String keyString) {
     try {
-      keyString = keyString.replace("-----BEGIN PUBLIC KEY-----", "")
-          .replace("-----END PUBLIC KEY-----", "")
+      keyString = keyString.replace("-----BEGIN CERTIFICATE-----", "")
+          .replace("-----END CERTIFICATE-----", "")
           .replaceAll("\\s+", "");
       return KeyFactory.getInstance("RSA").generatePublic(
           new X509EncodedKeySpec(Base64.getDecoder().decode(keyString)));

--
Gitblit v1.7.1