diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java index b80ce58fb43aa0bb8d166d642b089f5c4ba98489..533f0389ad71bd5b5162ddedda0a0da947f062cb 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java @@ -158,15 +158,11 @@ public class StreamUtils { } public static String join(Iterable data, String delimiter) { - return join(data, delimiter, Objects::toString, any -> true); + return join(data, delimiter, Objects::toString); } - public static String join(Iterable data, String delimiter, Predicate predicate) { - return join(data, delimiter, Objects::toString, predicate); - } - - public static String join(Iterable data, String delimiter, Function toStringFunction, Predicate predicate) { - return from(data).map(toStringFunction).filter(predicate).collect(joining(delimiter)); + public static String join(Iterable data, String delimiter, Function toStringFunction) { + return from(data).map(toStringFunction).collect(joining(delimiter)); } public static List split(String data) { diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java index 3adc65160d7c16e54fb8184654108e8b7ea0a4c7..6ba0e2869d60eafa92514ef94ca57b052058a6aa 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/signature/AbstractSignatureValidationInterceptor.java @@ -10,6 +10,7 @@ import org.springframework.web.util.ContentCachingRequestWrapper; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; import java.util.Objects; import static cn.hutool.core.text.StrPool.UNDERLINE; @@ -68,7 +69,8 @@ public abstract class AbstractSignatureValidationInterceptor params = StreamUtils.filterToList(Arrays.asList(requestUri, queryString, bodyString, timestamp, appKey, appSecret), StringUtils::isNotBlank); + String toSign = StreamUtils.join(params, UNDERLINE); return DigestUtil.sha256Hex(toSign); }