test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 04:08:31 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix alert instance proxy configs when no username and password (#9171)

Browse Source
This commit is contained in:
Tq 2022-03-25 09:43:59 +08:00 committed by GitHub
parent 934d0ad063
commit 97807390a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramSender.java
View File

@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.dolphinscheduler.alert.api.AlertData;
import org.apache.dolphinscheduler.alert.api.AlertResult;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpHost;
@ -136,7 +137,11 @@ public final class TelegramSender {
HttpPost httpPost = buildHttpPost(url, buildMsgJsonStr(content));
CloseableHttpClient httpClient;
if (Boolean.TRUE.equals(enableProxy)) {
httpClient = getProxyClient(proxy, port, user, password);
if (StringUtils.isNotEmpty(user) && StringUtils.isNotEmpty(password)) {
httpClient = getProxyClient(proxy, port, user, password);
}else {
httpClient = getDefaultClient();
}
RequestConfig rcf = getProxyConfig(proxy, port);
httpPost.setConfig(rcf);
} else {