From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
index d30226d..555023c 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
@@ -78,20 +78,24 @@
/**
* 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
*/
- public void load_wxPayService()
- {
- Config config =
- new RSAAutoCertificateConfig.Builder()
- .merchantId(wxPayProperties.getMchId())
- .privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
- .merchantSerialNumber(wxPayProperties.getSerialNumer())
- .apiV3Key(wxPayProperties.getApiV3Key())
- .build();
- this.wxPayService = new JsapiService.Builder().config(config).build();
+ public void load_wxPayService() {
+ try {
+ Config config =
+ new RSAAutoCertificateConfig.Builder()
+ .merchantId(wxPayProperties.getMchId())
+ .privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
+ .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();;
+ this.jsapiExtService = new JsapiServiceExtension.Builder().config(config).build();
+ this.refundService = new RefundService.Builder().config(config).build();
+ this.billDownloadService = new BillDownloadService.Builder().config(config).build();
+ }catch (Exception e){
+ e.printStackTrace();
+
+ }
}
/**
* 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
@@ -101,9 +105,11 @@
WxPayConfig payConfig = new WxPayConfig();
payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
payConfig.setSignType(WxPayConstants.SignType.MD5);
- payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getSubAppId()));
- payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getSubMchId()));
- payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getSubMchKey()));
+ payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getAppId()));
+ payConfig.setSubAppId(StringUtils.trimToNull(wxPayProperties.getSubAppId()));
+ payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getMchId()));
+ payConfig.setSubMchId(StringUtils.trimToNull(wxPayProperties.getSubMchId()));
+ payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getMchKey()));
// payConfig.setKeyPath(StringUtils.trimToNull(wxPayProperties.getKeyPath()));
payConfig.setNotifyUrl(StringUtils.trimToNull(wxPayProperties.getNotifyUrl()));
WxPayService wxPayService = new WxPayServiceImpl();
--
Gitblit v1.9.3