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 | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 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 08bf046..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
@@ -31,7 +31,7 @@
public static WxMaService wxMaService;
/********寰俊灏忕▼搴忔敮浠�**********/
public static JsapiService wxPayService;
- public static WxPayService wxPayV2Service;
+// public static WxPayService wxPayV2Service;
public static RefundService refundService;
public static JsapiServiceExtension jsapiExtService;
public static BillDownloadService billDownloadService;
@@ -48,8 +48,7 @@
void init() {
this.load_WxMaService();
this.load_wxPayService();
- this.load_wxPayV2Service();
- this.load_transferToUser();
+// this.load_wxPayV2Service();
this.load_transferToUser();
this.wxProperties = wxPayProperties;
}
@@ -63,8 +62,8 @@
config.setAppid(StringUtils.trimToNull(wxPayProperties.getSubAppId()));
config.setSecret(StringUtils.trimToNull(wxPayProperties.getSubAppSecret()));
}else {
- config.setAppid(StringUtils.trimToNull(wxPayProperties.getAppId()));
- config.setSecret(StringUtils.trimToNull(wxPayProperties.getAppSecret()));
+// config.setAppid(StringUtils.trimToNull(wxPayProperties.getAppId()));
+// config.setSecret(StringUtils.trimToNull(wxPayProperties.getAppSecret()));
}
config.setMsgDataFormat("JSON");
//config.setToken("");
@@ -79,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();
@@ -100,22 +111,22 @@
/**
* 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
*/
- public void load_wxPayV2Service()
- {
- WxPayConfig payConfig = new WxPayConfig();
- payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
- payConfig.setSignType(WxPayConstants.SignType.MD5);
- 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();
- wxPayService.setConfig(payConfig);
- this.wxPayV2Service = wxPayService;
- }
+// public void load_wxPayV2Service()
+// {
+// WxPayConfig payConfig = new WxPayConfig();
+// payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
+// payConfig.setSignType(WxPayConstants.SignType.MD5);
+// 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();
+// wxPayService.setConfig(payConfig);
+// this.wxPayV2Service = wxPayService;
+// }
/**
@@ -136,6 +147,7 @@
// }
+ //杞处涓氬姟
public void load_transferToUser()
{
TransferToUser transferToUser = new TransferToUser(
--
Gitblit v1.9.3