Merge branch 'dev' into Improvement-17874

Author: njnu-seafish

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java

@@ -37,12 +37,14 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
 @Slf4j
 public final class HttpSender {
 
     private Map<String, String> headerParams;
     private OkHttpRequestHeaderContentType contentType;
-    private Map<String, String> bodyParams;
+    private Map<String, Object> bodyParams;
     private HttpRequestMethod requestType;
     private int timeout;
     private String url;
@@ -69,7 +71,8 @@ private void paramsValidator(Map<String, String> paramsMap) {
 
         String bodyParamsString = paramsMap.get(HttpAlertConstants.NAME_BODY_PARAMS);
         if (StringUtils.isNotBlank(bodyParamsString)) {
-            bodyParams = JSONUtils.toMap(bodyParamsString);
+            bodyParams = JSONUtils.parseObject(bodyParamsString, new TypeReference<Map<String, Object>>() {
+            });
             if (bodyParams == null) {
                 throw new IllegalArgumentException("bodyParams is not a valid json");
             }
@@ -215,8 +218,9 @@ private void setMsgInRequestBody(String msg) {
         }
 
         bodyParams.forEach((key, value) -> {
-            if (value.contains(HttpAlertConstants.MSG_PARAMS)) {
-                bodyParams.put(key, value.replace(HttpAlertConstants.MSG_PARAMS, msg));
+            String valueOf = String.valueOf(value);
+            if (valueOf.contains(HttpAlertConstants.MSG_PARAMS)) {
+                bodyParams.put(key, valueOf.replace(HttpAlertConstants.MSG_PARAMS, msg));
             }
         });
     }