From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayNotifyAdapt.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayNotifyAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayNotifyAdapt.java
index 88cb76f..e44891d 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayNotifyAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayNotifyAdapt.java
@@ -21,6 +21,7 @@
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.payment.adapt.IPayNotifyAdapt;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.PlutusFactory;
import com.java110.core.factory.WechatFactory;
import com.java110.dto.smallWeChat.SmallWeChatDto;
@@ -28,10 +29,9 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
-import org.apache.commons.codec.digest.DigestUtils;
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.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -85,16 +85,23 @@
String signature = json.getString("signature");
String content = json.getString("content");
+
+ String appId = WechatFactory.getAppId(wId);
+ SmallWeChatDto smallWeChatDto = getSmallWechat(appId);
+ if (smallWeChatDto == null) {
+ throw new IllegalArgumentException("鏈厤缃叕浼楀彿鎴栬�呭皬绋嬪簭淇℃伅");
+ }
+ String publicKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(),"PLUTUS_PUBLIC_KEY");
//楠岀
- Boolean verify = PlutusFactory.verify256(param, org.bouncycastle.util.encoders.Base64.decode(signature));
+ Boolean verify = PlutusFactory.verify256(content, org.bouncycastle.util.encoders.Base64.decode(signature),publicKey);
//楠岀鎴愬姛
if (!verify) {
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
//瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDto.getPayPassword());
//鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
- String paramOut = new String(bb);
+ String paramOut = new String(bb);
try {
JSONObject map = JSONObject.parseObject(paramOut);
logger.info("銆愰摱鑱旀敮浠樺洖璋冦�� 鍥炶皟鏁版嵁锛� \n" + map);
@@ -127,16 +134,10 @@
smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
- TreeMap<String, String> paramMap = new TreeMap<String, String>();
- for (String key : map.keySet()) {
-// if ("wId".equals(key)) {
-// continue;
-// }
- paramMap.put(key, map.get(key).toString());
- }
+
//String sign = PayUtil.createChinaUmsSign(paramMap, smallWeChatDto.getPayPassword());
//JSONObject billPayment = JSONObject.parseObject(map.getString("billPayment"));
- String outTradeNo = map.get("outTransId").toString();
+ String outTradeNo = map.getString("outTransId");
//鏌ヨ鐢ㄦ埛ID
JSONObject paramIn = new JSONObject();
--
Gitblit v1.8.0