From fe729234647c83f8029beba4e31dc8d364a6427b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 27 八月 2025 16:04:35 +0800
Subject: [PATCH] 修BUG
---
server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java | 62 +++++++++++++++++++-----------
1 files changed, 39 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..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;
@@ -31,7 +34,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 +51,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 +65,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("");
@@ -80,13 +82,26 @@
public void load_wxPayService() {
try {
Config config =
- new RSAAutoCertificateConfig.Builder()
+ new RSAPublicKeyConfig.Builder()
.merchantId(wxPayProperties.getMchId())
.privateKeyFromPath(wxPayProperties.getPrivateKeyPath())
+ .publicKeyFromPath(wxPayProperties.getPubKeyPath())
+ .publicKeyId(wxPayProperties.getPayPublicKeyId())
.merchantSerialNumber(wxPayProperties.getSerialNumer())
.apiV3Key(wxPayProperties.getApiV3Key())
.build();
- this.wxPayService = new JsapiService.Builder().config(config).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();
@@ -100,22 +115,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 +151,7 @@
// }
+ //杞处涓氬姟
public void load_transferToUser()
{
TransferToUser transferToUser = new TransferToUser(
--
Gitblit v1.9.3