Merge branch 'dev' into Doc-17913

SbloodyS · web-flow · commit 9e9fb4302fc1 · 2026-02-02T10:35:06.000+08:00
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java
@@ -91,9 +91,9 @@ private void paramsValidator(Map<String, String> paramsMap) {
             throw new IllegalArgumentException("contentType is not a valid value");
         }
 
-        timeout = StringUtils.isNotBlank(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))
+        timeout = (StringUtils.isNotBlank(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))
                 ? Integer.parseInt(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))
-                : HttpAlertConstants.DEFAULT_TIMEOUT * 1000;
+                : HttpAlertConstants.DEFAULT_TIMEOUT) * 1000;
     }
 
     public AlertResult send(String msg) {

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ private void paramsValidator(Map<String, String> paramsMap) {`
`91`	`91`	`throw new IllegalArgumentException("contentType is not a valid value");`
`92`	`92`	`}`
`93`	`93`
`94`		`- timeout = StringUtils.isNotBlank(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))`
	`94`	`+ timeout = (StringUtils.isNotBlank(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))`
`95`	`95`	`? Integer.parseInt(paramsMap.get(HttpAlertConstants.NAME_TIMEOUT))`
`96`		`- : HttpAlertConstants.DEFAULT_TIMEOUT * 1000;`
	`96`	`+ : HttpAlertConstants.DEFAULT_TIMEOUT) * 1000;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public AlertResult send(String msg) {`