dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-05 20:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 签名字符串对嵌套对象处理考虑不全

Browse Source
This commit is contained in:
bootx
2024-02-08 23:46:10 +08:00
parent 5ea91081eb
commit 9aeeee0ac0
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daxpay-single-sdk/src/main/java/cn/bootx/platform/daxpay/sdk/util/PaySignUtil.java
View File

@@ -1,5 +1,6 @@
package cn.bootx.platform.daxpay.sdk.util;
import cn.bootx.platform.daxpay.sdk.param.SortMapParam;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.digest.HmacAlgorithm;
@@ -38,6 +39,7 @@ public class PaySignUtil {
/**
* 将参数转换为map对象. 使用ChatGPT生成, 仅局限于对请求支付相关参数进行签名
*/
@SuppressWarnings({"unchecked", "rawtypes"})
@SneakyThrows
private void toMap(Object object, Map<String, String> map) {
Class<?> clazz = object.getClass();
@@ -53,6 +55,12 @@ public class PaySignUtil {
String fieldValueString = String.valueOf(fieldValue);
map.put(fieldName, fieldValueString);
}
// map类型
else if (Map.class.isAssignableFrom(field.getType())) {
Map<String, String> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
m.putAll((Map) fieldValue);
toMap(fieldValue, m);
}
// 集合类型
else if (Collection.class.isAssignableFrom(field.getType())) {
Collection<?> collection = (Collection<?>) fieldValue;
@@ -67,11 +75,17 @@ public class PaySignUtil {
.collect(Collectors.toList());
map.put(fieldName, JSONUtil.toJsonStr(maps));
}
// 其他类型
} else {
}
// 可以转换为MAP并进行排序的类型
else if (SortMapParam.class.isAssignableFrom(field.getType())) {
Map<String, String> nestedMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
toMap(fieldValue, nestedMap);
String nestedJson = JSONUtil.toJsonStr(map);
String nestedJson = JSONUtil.toJsonStr(nestedMap);
map.put(fieldName, nestedJson);
}
else {
// 其他类型
String nestedJson = JSONUtil.toJsonStr(fieldValue);
map.put(fieldName, nestedJson);
}
}

13
daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PaySignUtil.java
View File

@@ -41,6 +41,7 @@ public class PaySignUtil {
/**
* 将参数转换为map对象. 使用ChatGPT生成, 仅局限于对请求支付相关参数进行签名
*/
@SuppressWarnings({"unchecked", "rawtypes"})
@SneakyThrows
private void toMap(Object object, Map<String, String> map) {
Class<?> clazz = object.getClass();
@@ -60,9 +61,15 @@ public class PaySignUtil {
// java8时间类型 转为时间戳
else if (field.getType().equals(LocalDateTime.class)) {
LocalDateTime localDateTime = (LocalDateTime) fieldValue;
long timestamp = LocalDateTimeUtil.timestamp(localDateTime);
long timestamp = LocalDateTimeUtil.timestamp(localDateTime)/1000;
map.put(fieldName, String.valueOf(timestamp));
}
// map类型
else if (Map.class.isAssignableFrom(field.getType())) {
Map<String, String> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
m.putAll((Map) fieldValue);
map.put(fieldName, JSONUtil.toJsonStr(m));
}
// 集合类型
else if (Collection.class.isAssignableFrom(field.getType())) {
Collection<?> collection = (Collection<?>) fieldValue;
@@ -77,11 +84,11 @@ public class PaySignUtil {
.collect(Collectors.toList());
map.put(fieldName, JSONUtil.toJsonStr(maps));
}
// 其他类型
// 其他类型直接转换为json
} else {
Map<String, String> nestedMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
toMap(fieldValue, nestedMap);
String nestedJson = JSONUtil.toJsonStr(map);
String nestedJson = JSONUtil.toJsonStr(fieldValue);
map.put(fieldName, nestedJson);
}
}