Merge remote-tracking branch 'origin/master'

austin-support/src/main/java/com/java3y/austin/support/utils/ContentHolderUtil.java

@@ -5,6 +5,7 @@ import org.springframework.util.PropertyPlaceholderHelper;
 
 import java.text.MessageFormat;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author 3y
@@ -43,6 +44,10 @@ public class ContentHolderUtil {
 
         @Override
         public String resolvePlaceholder(String placeholderName) {
+            if (Objects.isNull(paramMap)) {
+                String errorStr = MessageFormat.format("template:{0} require param:{1},but not exist! paramMap:{2}", template, placeholderName, paramMap);
+                throw new IllegalArgumentException(errorStr);
+            }
             String value = paramMap.get(placeholderName);
             if (StringUtils.isEmpty(value)) {
                 String errorStr = MessageFormat.format("template:{0} require param:{1},but not exist! paramMap:{2}", template, placeholderName, paramMap);