From 5a5ae53d09e205331f292c32aac76a26639d843d Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 19 Jan 2026 14:57:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 intc-admin/src/main/resources/application-dev.yml     |  6 +++---
 .../com/intc/weixin/config/WxPayConfiguration.java    | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/intc-admin/src/main/resources/application-dev.yml b/intc-admin/src/main/resources/application-dev.yml
index eea7279..7f1baa1 100644
--- a/intc-admin/src/main/resources/application-dev.yml
+++ b/intc-admin/src/main/resources/application-dev.yml
@@ -368,9 +368,9 @@ wx:
     api-v3-key: lms8a288e6694a429a2f15c718b1b17e
     # 证书序列号（V3版本必填）
     cert-serial-no: 6EFD85369A957FB27680825035E456065FD575D2
-    # 私钥路径（V3版本选填）
-    private-key-path: classpath:cert/apiclient_key.pem
-    # 私钥内容（V3版本选填，与private-key-path二选一）
+    # 私钥路径（V3版本选填，与private-content二选一）
+    # private-key-path: classpath:cert/apiclient_key.pem
+    # 私钥内容（V3版本选填，与private-key-path二选一，推荐使用此方式）
     private-content: "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDLEVxkdX6NJtDo\nzXOzkxn7kqR3MMc05/duLON4yjmLhTPQD8iiDoCOEuZEy8dLloi1OlXO3zu/F5jd\n9ynk8x++Px5A8gBQ16GZAMH18BQDzcFzy0EPe9ckiN3IXO8GT8Ht9oP430ugxF6t\nGM7Ixh93v48n7tUOZTISX5TzZCbXOiITH40b++/LB2LaMo9xAC4dEQs+2S4x5gO9\nPAh637ZAtVlbYxmJMYxzUM09KyXAoDlmO6YlO25EBkei7ZbyQob698s35+rSeq93\noFfUiegEL35SWeuuwp8ZFFvq24EUW7/n4U50/rS5hIFerEfcrFj2yPhP3sQtd4I+\nFjaEKzQLAgMBAAECggEBALxeUV9a4labUCT0GETWyr5j7C4oUFHSb+KCv0uYA0NZ\n/5McYRd67mNcQsBEa43BiPTbtSdeSnTbtdEI6pLXuHVo5W6HTiWvsNZWLpYt6tMQ\ndUgtnh932D2qvFiVZKBtMc7E4uzkbaonHk/heEgkCKKzTl9Tm81rr8P9aBVSrPjt\n6Xs7lORsD9bCoweYwfcrHELb+sLek/dOd9eCyabq7r5FV4EqOwJhw8btD7xgjw+o\nuVF3kWyhLSEwjpN/oo4w5r4yVPlMnSTn7MtTRFyJcU/w5YBk8MedGSTKRIvzPv4s\nRWU3ChTP5evGAh/FnpP6JGEhyvYGW0DqmuJUXK1n0fECgYEA/sSCT6Z+HSlwu/ui\nOSlDDFKZ/ci7vJcuksgf5Tw5Kj0fBVhgImO8hTS9nqCQx73JJTsUpTzyYOVxUd9b\nAqp42dgVbDYTmkfBi0xAZpnQD4Z4LUj6OkS2k3+2CPNN+jQpibGjGy11NDV/U8EQ\nP/9ioz+PoqwENG6wsaCT9LOC2DkCgYEAzAzUXJdH5T2LpSeO8e2NHtW6flemsJJ0\n+m0O03OWxQr6KNjFpNkTFoK6A2NYOiyqMZcQb+viHGFTFpFHkozo3QPaXpZsz3BC\ny9nQzqDbP3/MtfksE/MXOOw0qtdqT3csIxiXZqIjGYqAU08xcKyItZJGnIh/aKYn\nyobDnKkCRmMCgYB9mvbAPE6bJA4/r/03/17eGW9wjuH4RfUhSudmxn1MlNvRb9Pd\nwJx2dB00sucOg0RDRdCU8upw2U44Vk1xkAiLJpzRQAwEGXKTseFidFz++oYPlZZA\n2hXFvMZLvWDphYQhLeJDiPLq7aE78siHNOs1nyW6xuI/037r5EZt838ECQKBgQDC\n3+XY3+ob92Fsw5DzYIoMTtajXxalP9pUaN9l9tihKtCrPgvUWjSupP79yV0zggCx\nB7L9EOyLai+uN+WBAu5KVimxeDxHCNHiWg3fqSR7SpS5nlUIYHtnM79BAiZX6lrO\n0eeWb3bSJ8JSzilLkJunvSGO0ZXM3hLWi0o6TfcMPQKBgQDlmSC6/Ja4M+lGZEMx\nraCryScSi1kj3KkZFcGQEEejltpet2u06af/qA+tmMW7uxjLj5R80yqsYmUqS6Md\npHc1U7XsqU2MinqVJz47H8WZwYMDDLjNOI2f4coqbtBBOA6GKt+gYYqYxkpvVanT\noShAmWqOcPsioBVCFRVGvMlcNA==\n-----END PRIVATE KEY-----\n"
 
   # 支付选项列表配置
diff --git a/intc-modules/intc-weixin/src/main/java/com/intc/weixin/config/WxPayConfiguration.java b/intc-modules/intc-weixin/src/main/java/com/intc/weixin/config/WxPayConfiguration.java
index 0093cc8..d709d42 100644
--- a/intc-modules/intc-weixin/src/main/java/com/intc/weixin/config/WxPayConfiguration.java
+++ b/intc-modules/intc-weixin/src/main/java/com/intc/weixin/config/WxPayConfiguration.java
@@ -50,12 +50,13 @@ public class WxPayConfiguration {
             payConfig.setKeyPath(wxPayProperties.getKeyPath());
         }
 
-        if (wxPayProperties.getPrivateKeyPath() != null) {
-            payConfig.setPrivateKeyPath(wxPayProperties.getPrivateKeyPath());
-        }
-
-        if (wxPayProperties.getPrivateContent() != null) {
+        // 私钥配置：优先使用privateContent，避免文件不存在的问题
+        if (wxPayProperties.getPrivateContent() != null && !wxPayProperties.getPrivateContent().isEmpty()) {
             payConfig.setPrivateCertContent(wxPayProperties.getPrivateContent().getBytes());
+            log.info("使用私钥内容配置");
+        } else if (wxPayProperties.getPrivateKeyPath() != null) {
+            payConfig.setPrivateKeyPath(wxPayProperties.getPrivateKeyPath());
+            log.info("使用私钥路径配置: {}", wxPayProperties.getPrivateKeyPath());
         }
 
         WxPayService wxPayService = new WxPayServiceImpl();