From cfaf819cb87cec28fcc4341c560185ee3fb3baf6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 21 八月 2025 19:22:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 322a247..a420a14 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
@@ -78,15 +78,27 @@
      */
     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()
                             .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.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