Merge branch 'master' into cc_20250723_Decoration

# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
This commit is contained in:
shuo.wang
2025-07-24 15:29:31 +08:00
10 changed files with 50 additions and 15 deletions

View File

@@ -28,6 +28,7 @@ public class OpenSignatureUtil {
.filter(e -> !"appKey".equals(e.getKey()))
.filter(e -> !"timestamp".equals(e.getKey()))
.filter(e -> !"sign".equals(e.getKey()))
.filter(e -> e.getValue() != null && !e.getValue().isEmpty())
.collect(Collectors.toMap(
Map.Entry::getKey,
Map.Entry::getValue
@@ -45,7 +46,7 @@ public class OpenSignatureUtil {
// 3.2 添加固定参数(不参与排序)
sb.append("appkey=").append(appKey)
.append("&timestamp=").append(timestamp);
log.info("待签名字符串:{}", sb);
// 4. 生成签名
return hmacSha256(sb.toString(), appSecret);
}