From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java b/server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java
index a420a14..e9edac5 100644
--- a/server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java
+++ b/server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java
@@ -12,6 +12,9 @@
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
import com.wechat.pay.java.core.Config;
import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+import com.wechat.pay.java.core.RSAPublicKeyConfig;
+import com.wechat.pay.java.core.http.HostName;
+import com.wechat.pay.java.core.notification.RSAPublicKeyNotificationConfig;
import com.wechat.pay.java.service.billdownload.BillDownloadService;
import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiService;
import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension;
@@ -78,27 +81,28 @@
*/
public void load_wxPayService() {
try {
-// Config config =
-// new RSAPublicKeyConfig.Builder()
-// .merchantId(wxPayProperties.getMchId())
-// .privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
-// .publicKeyFromPath(wxPayProperties.getPubKeyPath())
-// .publicKeyId("PUB_KEY_ID_0117000719222024112700219100000508")
-// .merchantSerialNumber(wxPayProperties.getSerialNumer())
-// .apiV3Key(wxPayProperties.getApiV3Key())
-// .build();
-
-
Config config =
- new RSAAutoCertificateConfig.Builder()
+ new RSAPublicKeyConfig.Builder()
.merchantId(wxPayProperties.getMchId())
.privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
-// .publicKeyFromPath(wxPayProperties.getPubKeyPath())
-// .publicKeyId("PUB_KEY_ID_0117000719222024112700219100000508")
+ .publicKeyFromPath(wxPayProperties.getPubKeyPath())
+ .publicKeyId(wxPayProperties.getPayPublicKeyId())
.merchantSerialNumber(wxPayProperties.getSerialNumer())
.apiV3Key(wxPayProperties.getApiV3Key())
.build();
+
+
+// Config config =
+// new RSAAutoCertificateConfig.Builder()
+// .merchantId(wxPayProperties.getMchId())
+// .privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
+//// .publicKeyFromPath(wxPayProperties.getPubKeyPath())
+//// .publicKeyId("PUB_KEY_ID_0117000719222024112700219100000508")
+// .merchantSerialNumber(wxPayProperties.getSerialNumer())
+// .apiV3Key(wxPayProperties.getApiV3Key())
+// .build();
// this.wxPayService = new JsapiService.Builder().config(config).build();
+
this.jsapiExtService = new JsapiServiceExtension.Builder().config(config).build();
this.refundService = new RefundService.Builder().config(config).build();
this.billDownloadService = new BillDownloadService.Builder().config(config).build();
--
Gitblit v1.9.3