Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
老大叔也想要天天的爱情
DolphinScheduler
提交
8399ab47
DolphinScheduler
项目概览
老大叔也想要天天的爱情
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8399ab47
编写于
1月 14, 2020
作者:
Y
Yelli
提交者:
dailidong
1月 14, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add null check in markdownTable & modify EnterpriseWeChatManager logger class (#1809)
上级
289ae6ac
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
22 deletion
+23
-22
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
...lphinscheduler/alert/manager/EnterpriseWeChatManager.java
+1
-1
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
...org/apache/dolphinscheduler/alert/runner/AlertSender.java
+2
-2
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplate.java
...apache/dolphinscheduler/alert/template/AlertTemplate.java
+3
-0
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
...e/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
+12
-12
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
...va/org/apache/dolphinscheduler/alert/utils/MailUtils.java
+3
-4
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
...rg/apache/dolphinscheduler/alert/utils/PropertyUtils.java
+1
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
...java/org/apache/dolphinscheduler/api/utils/FileUtils.java
+1
-1
未找到文件。
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java
浏览文件 @
8399ab47
...
@@ -32,7 +32,7 @@ import java.util.Map;
...
@@ -32,7 +32,7 @@ import java.util.Map;
* Enterprise WeChat Manager
* Enterprise WeChat Manager
*/
*/
public
class
EnterpriseWeChatManager
{
public
class
EnterpriseWeChatManager
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
Msg
Manager
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EnterpriseWeChat
Manager
.
class
);
/**
/**
* Enterprise We Chat send
* Enterprise We Chat send
* @param alert the alert
* @param alert the alert
...
...
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
浏览文件 @
8399ab47
...
@@ -65,7 +65,7 @@ public class AlertSender{
...
@@ -65,7 +65,7 @@ public class AlertSender{
users
=
alertDao
.
listUserByAlertgroupId
(
alert
.
getAlertGroupId
());
users
=
alertDao
.
listUserByAlertgroupId
(
alert
.
getAlertGroupId
());
// receiving group list
// receiving group list
List
<
String
>
receviersList
=
new
ArrayList
<
String
>();
List
<
String
>
receviersList
=
new
ArrayList
<>();
for
(
User
user:
users
){
for
(
User
user:
users
){
receviersList
.
add
(
user
.
getEmail
());
receviersList
.
add
(
user
.
getEmail
());
}
}
...
@@ -77,7 +77,7 @@ public class AlertSender{
...
@@ -77,7 +77,7 @@ public class AlertSender{
}
}
// copy list
// copy list
List
<
String
>
receviersCcList
=
new
ArrayList
<
String
>();
List
<
String
>
receviersCcList
=
new
ArrayList
<>();
// Custom Copier
// Custom Copier
...
...
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplate.java
浏览文件 @
8399ab47
...
@@ -34,6 +34,9 @@ public interface AlertTemplate {
...
@@ -34,6 +34,9 @@ public interface AlertTemplate {
/**
/**
* default showAll is true
* default showAll is true
* @param content alert message content
* @param showType show type
* @return a message from a specified alert template
*/
*/
default
String
getMessageFromTemplate
(
String
content
,
ShowType
showType
){
default
String
getMessageFromTemplate
(
String
content
,
ShowType
showType
){
return
getMessageFromTemplate
(
content
,
showType
,
true
);
return
getMessageFromTemplate
(
content
,
showType
,
true
);
...
...
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
浏览文件 @
8399ab47
...
@@ -201,22 +201,22 @@ public class EnterpriseWeChatUtils {
...
@@ -201,22 +201,22 @@ public class EnterpriseWeChatUtils {
public
static
String
markdownTable
(
String
title
,
String
content
){
public
static
String
markdownTable
(
String
title
,
String
content
){
List
<
LinkedHashMap
>
mapItemsList
=
JSONUtils
.
toList
(
content
,
LinkedHashMap
.
class
);
List
<
LinkedHashMap
>
mapItemsList
=
JSONUtils
.
toList
(
content
,
LinkedHashMap
.
class
);
StringBuilder
contents
=
new
StringBuilder
(
200
);
StringBuilder
contents
=
new
StringBuilder
(
200
);
for
(
LinkedHashMap
mapItems
:
mapItemsList
){
Set
<
Map
.
Entry
<
String
,
String
>>
entries
=
mapItems
.
entrySet
();
if
(
null
!=
mapItemsList
)
{
for
(
LinkedHashMap
mapItems
:
mapItemsList
){
Set
<
Map
.
Entry
<
String
,
String
>>
entries
=
mapItems
.
entrySet
();
Iterator
<
Map
.
Entry
<
String
,
String
>>
iterator
=
entries
.
iterator
();
StringBuilder
t
=
new
StringBuilder
(
String
.
format
(
"`%s`%s"
,
title
,
Constants
.
MARKDOWN_ENTER
));
Iterator
<
Map
.
Entry
<
String
,
String
>>
iterator
=
entries
.
iterator
();
while
(
iterator
.
hasNext
()){
StringBuilder
t
=
new
StringBuilder
(
String
.
format
(
"`%s`%s"
,
title
,
Constants
.
MARKDOWN_ENTER
));
Map
.
Entry
<
String
,
String
>
entry
=
iterator
.
next
();
while
(
iterator
.
hasNext
()){
t
.
append
(
Constants
.
MARKDOWN_QUOTE
);
t
.
append
(
entry
.
getKey
()).
append
(
":"
).
append
(
entry
.
getValue
());
Map
.
Entry
<
String
,
String
>
entry
=
iterator
.
next
();
t
.
append
(
Constants
.
MARKDOWN_ENTER
);
t
.
append
(
Constants
.
MARKDOWN_QUOTE
);
}
t
.
append
(
entry
.
getKey
()).
append
(
":"
).
append
(
entry
.
getValue
());
contents
.
append
(
t
);
t
.
append
(
Constants
.
MARKDOWN_ENTER
);
}
}
contents
.
append
(
t
);
}
}
return
contents
.
toString
();
return
contents
.
toString
();
}
}
...
...
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java
浏览文件 @
8399ab47
...
@@ -96,7 +96,7 @@ public class MailUtils {
...
@@ -96,7 +96,7 @@ public class MailUtils {
return
retMap
;
return
retMap
;
}
}
receivers
.
removeIf
(
(
from
)
->
(
StringUtils
.
isEmpty
(
from
))
);
receivers
.
removeIf
(
StringUtils:
:
isEmpty
);
if
(
showType
==
ShowType
.
TABLE
||
showType
==
ShowType
.
TEXT
){
if
(
showType
==
ShowType
.
TABLE
||
showType
==
ShowType
.
TEXT
){
// send email
// send email
...
@@ -185,7 +185,7 @@ public class MailUtils {
...
@@ -185,7 +185,7 @@ public class MailUtils {
/**
/**
* get MimeMessage
* get MimeMessage
* @param receivers
* @param receivers
receivers
* @return the MimeMessage
* @return the MimeMessage
* @throws MessagingException
* @throws MessagingException
*/
*/
...
@@ -229,8 +229,7 @@ public class MailUtils {
...
@@ -229,8 +229,7 @@ public class MailUtils {
}
}
};
};
Session
session
=
Session
.
getInstance
(
props
,
auth
);
return
Session
.
getInstance
(
props
,
auth
);
return
session
;
}
}
/**
/**
...
...
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
浏览文件 @
8399ab47
...
@@ -205,8 +205,7 @@ public class PropertyUtils {
...
@@ -205,8 +205,7 @@ public class PropertyUtils {
return
null
;
return
null
;
}
}
try
{
try
{
String
[]
propertyArray
=
value
.
split
(
splitStr
);
return
value
.
split
(
splitStr
);
return
propertyArray
;
}
catch
(
PatternSyntaxException
e
)
{
}
catch
(
PatternSyntaxException
e
)
{
logger
.
info
(
e
.
getMessage
(),
e
);
logger
.
info
(
e
.
getMessage
(),
e
);
}
}
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
浏览文件 @
8399ab47
...
@@ -57,7 +57,7 @@ public class FileUtils {
...
@@ -57,7 +57,7 @@ public class FileUtils {
Files
.
copy
(
file
.
getInputStream
(),
Paths
.
get
(
destFilename
));
Files
.
copy
(
file
.
getInputStream
(),
Paths
.
get
(
destFilename
));
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
logger
.
error
(
String
.
format
(
"failed to copy file , {} is empty file"
,
file
.
getOriginalFilename
()
),
e
);
logger
.
error
(
"failed to copy file , {} is empty file"
,
file
.
getOriginalFilename
(
),
e
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录