解决复杂参数的签名不一致问题

pom.xml

@@ -30,7 +30,7 @@
         <joda.time.version>2.9.9</joda.time.version>
         <gson.version>2.8.5</gson.version>
         <fastjson.version>1.2.72</fastjson.version>
-        <hutool.version>4.6.8</hutool.version>
+        <hutool.version>5.7.3</hutool.version>
         <gexin.version>4.1.1.4</gexin.version>
         <lombok.version>1.18.12</lombok.version>
         <easypoi.version>4.1.0</easypoi.version>

src/main/java/com/weface/common/utils/CommonUtil.java

@@ -166,7 +166,15 @@ public class CommonUtil {
         builder.append(sk);
         map.forEach((k, v) -> {
             if (v != null && !"null".equals(v) && !"".equals(v)) {
-                builder.append(v);
+                String value = "";
+                if (v instanceof Object[]) {
+                    value = Arrays.toString((Object[]) v);
+                } else if (v instanceof Collection) {
+                    value = JSONUtil.toJsonStr(v);
+                } else {
+                    value = v.toString();
+                }
+                builder.append(value);
             }
         });
         builder.append(sk);

src/main/java/com/weface/component/GeTuiPush.java

@@ -57,7 +57,7 @@ public class GeTuiPush {
 
         String msg = "测试";
 
-        param.put("audience", JSONUtil.parseFromMap(audience));
+        param.put("audience", JSONUtil.parse(audience));
         param.put("settings", setSetting());
         param.put("push_message", setMessage(msg));
         param.put("push_channel", setChannel(msg));
@@ -83,7 +83,7 @@ public class GeTuiPush {
 
         String msg = "测试";
 
-        param.put("audience", JSONUtil.parseFromMap(audience));
+        param.put("audience", JSONUtil.parse(audience));
         param.put("settings", setSetting());
         param.put("push_message", setMessage(msg));
         param.put("push_channel", setChannel(msg));
@@ -107,8 +107,8 @@ public class GeTuiPush {
         strategy.put("ios", 4);
         strategy.put("st", 4);
 
-        settings.put("strategy", JSONUtil.parseFromMap(strategy));
-        return JSONUtil.parseFromMap(settings);
+        settings.put("strategy", JSONUtil.parse(strategy));
+        return JSONUtil.parseObj(settings);
     }
 
     // 定义消息
@@ -121,7 +121,7 @@ public class GeTuiPush {
         notification.put("channel_level", 4);
         message.put("notification", notification);
         // message.put("transmission",msg);
-        return JSONUtil.parseFromMap(message);
+        return JSONUtil.parseObj(message);
     }
 
     public JSONObject setChannel(String msg) {
@@ -132,11 +132,11 @@ public class GeTuiPush {
         Map<String, Object> alert = new HashMap<>();
         alert.put("title", "ios标题");
         alert.put("body", "ios内容");
-        aps.put("alert", JSONUtil.parseFromMap(alert));
+        aps.put("alert", JSONUtil.parse(alert));
         ios.put("type", "notify");
         ios.put("payload", msg);
-        ios.put("aps", JSONUtil.parseFromMap(aps));
-        channel.put("ios", JSONUtil.parseFromMap(ios));
+        ios.put("aps", JSONUtil.parse(aps));
+        channel.put("ios", JSONUtil.parse(ios));
 
         Map<String, Object> android = new HashMap<>();
         Map<String, Object> ups = new HashMap<>();
@@ -145,10 +145,10 @@ public class GeTuiPush {
         notification.put("body", "android内容");
         notification.put("click_type", "none");
 
-        ups.put("notification", JSONUtil.parseFromMap(notification));
-        android.put("ups", JSONUtil.parseFromMap(ups));
-        channel.put("android", JSONUtil.parseFromMap(android));
-        return JSONUtil.parseFromMap(channel);
+        ups.put("notification", JSONUtil.parse(notification));
+        android.put("ups", JSONUtil.parse(ups));
+        channel.put("android", JSONUtil.parse(android));
+        return JSONUtil.parseObj(channel);
     }
 
     public String getSHA256(String str) {

src/main/java/com/weface/config/FilterConfig.java

@@ -33,7 +33,7 @@ public class FilterConfig {
      */
     @Bean
     public FilterRegistrationBean<SignValidateFilter> signValidateFilter() {
-        final String include = "/push/single/alias,/push/single/cid";
+        final String include = "/push/single/alias,/push/single/cid,/push/batch/alias";
         //不拦截的url列表
         final String excludes = "";
         //拦截url列表