From 0174adf9604aca5cc58c07a140f069e1d903708d Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@test.foo>
Date: Tue, 7 May 2024 14:21:52 +0800
Subject: [PATCH] =?UTF-8?q?BUG-12582:=20=E5=8F=91=E9=80=81=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=91=E6=98=8E=E7=99=BD=E7=9A=84=E6=8E=A7=E5=88=B6=E4=BC=9A?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E7=9C=9F=E5=AE=9E=E5=9C=B0=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=EF=BC=8C=E8=BF=99=E6=97=B6=E4=BC=9A=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=92=89=E9=92=89=E9=80=9A=E7=9F=A5=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=8A=A8=E6=80=81=E5=8F=82=E6=95=B0=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=BC=A0=E7=9F=AD=E4=BF=A1=E6=A8=A1=E7=89=88=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E4=BC=9A=E6=8A=A5NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../center/notices/service/impl/MessageServiceImpl.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MessageServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MessageServiceImpl.java
index 9dd1e063..7687dd31 100644
--- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MessageServiceImpl.java
+++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MessageServiceImpl.java
@@ -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);