From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
index b2ecae3..8539e1c 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java
@@ -83,9 +83,17 @@
.body(body)
.build();
- NotificationConfig config = new RSAAutoCertificateConfig.Builder()
+ NotificationConfig config = /*new RSAAutoCertificateConfig.Builder()
.merchantId(WxMiniConfig.wxProperties.getMchId())
.privateKeyFromPath(WxMiniConfig.wxProperties.getPrivateKeyPath())
+ .merchantSerialNumber(WxMiniConfig.wxProperties.getSerialNumer())
+ .apiV3Key(WxMiniConfig.wxProperties.getApiV3Key())
+ .build(); */
+ new RSAPublicKeyConfig.Builder()
+ .merchantId(WxMiniConfig.wxProperties.getMchId())
+ .privateKeyFromPath(WxMiniConfig.wxProperties.getPrivateKeyPath())
+ .publicKeyFromPath(WxMiniConfig.wxProperties.getPubKeyPath())
+ .publicKeyId(WxMiniConfig.wxProperties.getPayPublicKeyId())
.merchantSerialNumber(WxMiniConfig.wxProperties.getSerialNumer())
.apiV3Key(WxMiniConfig.wxProperties.getApiV3Key())
.build();
@@ -152,13 +160,20 @@
.body(body)
.build();
- NotificationConfig config = new RSAAutoCertificateConfig.Builder()
+ NotificationConfig config = /*new RSAAutoCertificateConfig.Builder()
.merchantId(WxMiniConfig.wxProperties.getMchId())
.privateKeyFromPath(WxMiniConfig.wxProperties.getPrivateKeyPath())
.merchantSerialNumber(WxMiniConfig.wxProperties.getSerialNumer())
.apiV3Key(WxMiniConfig.wxProperties.getApiV3Key())
+ .build();*/
+ new RSAPublicKeyConfig.Builder()
+ .merchantId(WxMiniConfig.wxProperties.getMchId())
+ .privateKeyFromPath(WxMiniConfig.wxProperties.getPrivateKeyPath())
+ .publicKeyFromPath(WxMiniConfig.wxProperties.getPubKeyPath())
+ .publicKeyId(WxMiniConfig.wxProperties.getPayPublicKeyId())
+ .merchantSerialNumber(WxMiniConfig.wxProperties.getSerialNumer())
+ .apiV3Key(WxMiniConfig.wxProperties.getApiV3Key())
.build();
-
NotificationParser parser = new NotificationParser(config);
RefundNotification result = parser.parse(requestParam, RefundNotification.class);
@@ -194,7 +209,7 @@
.publicKeyFromPath(WxMiniConfig.wxProperties.getWechatPubKeyPath()) //寰俊鏀粯鍏挜鐨勫瓨鏀捐矾寰�
.publicKeyId(WxMiniConfig.wxProperties.getWechatPayPublicKeyId()) //寰俊鏀粯鍏挜ID
.merchantSerialNumber(WxMiniConfig.wxProperties.getWechatSerialNumer()) //鍟嗘埛API璇佷功搴忓垪鍙�
- .apiV3Key("7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB") //APIv3瀵嗛挜
+ .apiV3Key(WxMiniConfig.wxProperties.getWechatApiV3Key()) //APIv3瀵嗛挜
.build();
TransferDetailEntityNew entity = wxSuccessCallback(request,config);
--
Gitblit v1.9.3