wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG-12582: 发送短信时，如果因为黑明白的控制会跳过真实地发送短信，这时会进行钉钉通知，如果动态参数中没有传短信模版中的内容会报NPE

Browse Source
This commit is contained in:
yanglin 2024-05-07 14:21:52 +08:00
parent e977cc5bbe
commit 0174adf960
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MessageServiceImpl.java
View File

@ -485,7 +485,7 @@ public class MessageServiceImpl implements MessageService, EnvironmentAware {
* @param params
* @return
*/
private String parse(String content, Map<String, Object> params) {
private static String parse(String content, Map<String, Object> params) {
if(MapUtils.isEmpty(params)) {
return content;
}
@ -504,7 +504,11 @@ public class MessageServiceImpl implements MessageService, EnvironmentAware {
StringBuffer sb = new StringBuffer();
while (m.find()) {
String group = m.group().replace("${", "").replace("}", "");
m.appendReplacement(sb, kvs.get(group));
String replacement = kvs.get(group);
if (replacement == null) {
replacement = "";
}
m.appendReplacement(sb, replacement);
}
//把符合的数据追加到sb尾
m.appendTail(sb);