Browse Source

修复可能导致}丢失问题

zhouhao 4 years ago
parent
commit
331cbe0d0b

+ 1 - 1
hsweb-core/src/main/java/org/hswebframework/web/utils/TemplateParser.java

@@ -103,7 +103,7 @@ public class TemplateParser {
         while (next()) {
         while (next()) {
             if (isPrepare()) {
             if (isPrepare()) {
                 inPrepare = true;
                 inPrepare = true;
-            } else if (isPrepareEnd()) {
+            } else if (inPrepare&&isPrepareEnd()) {
                 inPrepare = false;
                 inPrepare = false;
                 setParsed(propertyMapping.apply(new String(expression, 0, expressionPos)).toCharArray());
                 setParsed(propertyMapping.apply(new String(expression, 0, expressionPos)).toCharArray());
                 expressionPos = 0;
                 expressionPos = 0;

+ 1 - 1
hsweb-core/src/test/java/org/hswebframework/web/utils/ExpressionUtilsTest.java

@@ -47,7 +47,7 @@ public class ExpressionUtilsTest {
                 "     \"markdown\": {\n" +
                 "     \"markdown\": {\n" +
                 "         \"title\":\"消息类型:${messageType}\",\n" +
                 "         \"title\":\"消息类型:${messageType}\",\n" +
                 "         \"text\": \" - 设备ID: `${deviceId}` \\n - 设备型号: `${headers.productId}`\\n - 设备名称: `${headers.deviceName}`\"" +
                 "         \"text\": \" - 设备ID: `${deviceId}` \\n - 设备型号: `${headers.productId}`\\n - 设备名称: `${headers.deviceName}`\"" +
-                "     },\n" +
+                "     \n},\n" +
                 "      \"at\": {\n" +
                 "      \"at\": {\n" +
                 "          \"isAtAll\": false\n" +
                 "          \"isAtAll\": false\n" +
                 "      }\n" +
                 "      }\n" +