From 443cf0b8902a41dc2abffb7f4aef5f024e2f384b Mon Sep 17 00:00:00 2001
From: caolin <1149034574@qq.com>
Date: Thu, 24 Aug 2023 02:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jwl/driver/server/controller/AppletPayController.java    | 5 ++---
 .../com/jwl/driver/server/controller/H5PayController.java    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jwl/driver/server/controller/AppletPayController.java b/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
index 2ea1897..55cfa51 100644
--- a/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
@@ -73,13 +73,12 @@ public class AppletPayController {
 
     /** 构建service */
     private JsapiServiceExtension createService() {
-        String privateKeyPath = Thread.currentThread().getContextClassLoader().getResource("wechatPay/apiclient_key.pem").getPath();
 
         Config config =
                 new RSAAutoCertificateConfig.Builder()
                         .merchantId(wechatPayConfig.getMchId())
-//                        .privateKeyFromPath(wechatPayConfig.getPrivateKeyPath())
-                        .privateKeyFromPath(privateKeyPath)
+                        .privateKeyFromPath(wechatPayConfig.getPrivateKeyPath())
+//                        .privateKeyFromPath(privateKeyPath)
                         .merchantSerialNumber(wechatPayConfig.getMchSerialNo())
                         .apiV3Key(wechatPayConfig.getApiV3Key())
                         .build();
diff --git a/src/main/java/com/jwl/driver/server/controller/H5PayController.java b/src/main/java/com/jwl/driver/server/controller/H5PayController.java
index 13e51ef..abc436a 100644
--- a/src/main/java/com/jwl/driver/server/controller/H5PayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/H5PayController.java
@@ -73,13 +73,12 @@ public class H5PayController {
     }
 
     private H5Service createService() {
-        String privateKeyPath = Thread.currentThread().getContextClassLoader().getResource("wechatPay/apiclient_key.pem").getPath();
 
         Config config =
                 new RSAAutoCertificateConfig.Builder()
                         .merchantId(wechatPayConfig.getMchId())
-//                        .privateKeyFromPath(wechatPayConfig.getPrivateKeyPath())
-                        .privateKeyFromPath(privateKeyPath)
+                        .privateKeyFromPath(wechatPayConfig.getPrivateKeyPath())
+//                        .privateKeyFromPath(privateKeyPath)
                         .merchantSerialNumber(wechatPayConfig.getMchSerialNo())
                         .apiV3Key(wechatPayConfig.getApiV3Key())
                         .build();