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-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
index 5ec3240..9c7a018 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
@@ -22,6 +22,7 @@
import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.PlutusFactory;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
@@ -30,7 +31,6 @@
import com.java110.utils.util.StringUtil;
import org.bouncycastle.util.encoders.Base64;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -186,14 +186,14 @@
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);
JSONObject paramObj = JSONObject.parseObject(paramOut);
logger.debug("缁熶竴涓嬪崟杩斿洖" + paramOut);
- if (paramObj.getString("paramObj") != "00") {
+ if (!"00".equals(paramObj.getString("status"))) {
throw new IllegalArgumentException("鏀粯澶辫触" + paramObj.getString("error"));
}
--
Gitblit v1.8.0