From 7b0e7c62dab0061d2aa167b46f8a838f363f579a Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 17 一月 2022 17:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
index 0565dcf..661cf3b 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java
@@ -14,7 +14,7 @@
import com.java110.vo.ResultVo;
import org.bouncycastle.util.encoders.Base64;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -85,8 +85,9 @@
paramMap.put("tradeAmount", PayUtil.moneyToIntegerStr(payAmount));
paramMap.put("payTypeId", "0");
String privateKey = CommunitySettingFactory.getRemark(smallWeChatDtos.get(0).getObjId(), "PLUTUS_PRIVATE_KEY");
+ String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
- String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDtos.get(0).getPayPassword());
+ String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDtos.get(0).getPayPassword(),devId);
System.out.println(param);
String str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
@@ -105,7 +106,7 @@
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
//瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDtos.get(0).getPayPassword());
//鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
String paramOut = new String(bb);
@@ -140,8 +141,9 @@
paramMap.put("sn", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("outTradeId", orderNum);
String privateKey = CommunitySettingFactory.getRemark(smallWeChatDtos.get(0).getObjId(), "PLUTUS_PRIVATE_KEY");
+ String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
- String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDtos.get(0).getPayPassword());
+ String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDtos.get(0).getPayPassword(),devId);
System.out.println(param);
String str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
@@ -160,7 +162,7 @@
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
//瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDtos.get(0).getPayPassword());
//鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
String paramOut = new String(bb);
--
Gitblit v1.8.0