@@ -103,7 +103,7 @@ public class TemplateParser {
while (next()) {
if (isPrepare()) {
inPrepare = true;
- } else if (isPrepareEnd()) {
+ } else if (inPrepare&&isPrepareEnd()) {
inPrepare = false;
setParsed(propertyMapping.apply(new String(expression, 0, expressionPos)).toCharArray());
expressionPos = 0;
@@ -47,7 +47,7 @@ public class ExpressionUtilsTest {
" \"markdown\": {\n" +
" \"title\":\"消息类型:${messageType}\",\n" +
" \"text\": \" - 设备ID: `${deviceId}` \\n - 设备型号: `${headers.productId}`\\n - 设备名称: `${headers.deviceName}`\"" +
- " },\n" +
+ " \n},\n" +
" \"at\": {\n" +
" \"isAtAll\": false\n" +
" }\n" +