From f3c1422354ecba119c66020511bffd8de681286a Mon Sep 17 00:00:00 2001
From: superffan <33724896+superffan@users.noreply.github.com>
Date: Fri, 24 Jan 2025 21:27:34 +0800
Subject: [PATCH] =?UTF-8?q?:art:=E3=80=90=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E3=80=91spring-boot-starter=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E9=92=A5ID=E5=92=8C=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E7=AD=89=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxjava/pay/config/WxPayAutoConfiguration.java    |  2 ++
 .../wxjava/pay/properties/WxPayProperties.java       | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
index 9a9672de1..e401a8cfb 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
@@ -57,6 +57,8 @@ public class WxPayAutoConfiguration {
     payConfig.setPrivateCertPath(StringUtils.trimToNull(this.properties.getPrivateCertPath()));
     payConfig.setCertSerialNo(StringUtils.trimToNull(this.properties.getCertSerialNo()));
     payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
+    payConfig.setPublicKeyId(StringUtils.trimToNull(this.properties.getPublicKeyId()));
+    payConfig.setPublicKeyPath(StringUtils.trimToNull(this.properties.getPublicKeyPath()));
 
     wxPayService.setConfig(payConfig);
     return wxPayService;
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
index 232bd33c4..a1a8cc229 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
@@ -73,7 +73,17 @@ public class WxPayProperties {
    * apiv3 商户apiclient_cert.pem
    */
   private String privateCertPath;
-  
+
+  /**
+   * 公钥ID
+   */
+  private String publicKeyId;
+
+  /**
+   * pub_key.pem证书文件的绝对路径或者以classpath:开头的类路径.
+   */
+  private String publicKeyPath;
+
   /**
    * 微信支付是否使用仿真测试环境.
    * 默认不使用