Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(短信通知模块): 修复产品/设备发生告警，短信通知内置函数未进行格式化问题 #507

Merged
merged 1 commit into from
May 9, 2024
Merged

fix(短信通知模块): 修复产品/设备发生告警，短信通知内置函数未进行格式化问题 #507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...-component/notify-core/src/main/java/org/jetlinks/community/notify/template/Template.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@ default String get(String key,
}

default Map<String, Object> renderMap(Map<String, Object> context) {
return Maps.transformValues(context, value -> value == null ? null: VariableSource.of(value).resolveStatic(context));
return Maps.transformEntries(context, (key, value) ->
Optional.ofNullable(value)
.map(val -> VariableSource.of(val).resolveStatic(context))
.map(val -> {
Optional<VariableDefinition> variableDefOpt = getVariable(key);
if (variableDefOpt.isPresent()) {
return variableDefOpt.get().convertValue(val);
}
return val;
})
.orElse(null)
);
}

default String convert(String key, Object value) {
Expand Down
Loading