From 8f3ccc843591774668a346bfc8189a98371e964f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=98=B3=E7=90=B3?= <1052050264@qq.com> Date: Tue, 2 Nov 2021 12:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=A0try=20catch,=20=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E9=94=99=E8=AF=AF=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jfinal/kit/TplKit.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jfinal/kit/TplKit.java b/src/main/java/com/jfinal/kit/TplKit.java index 1994535..bfcbc2f 100644 --- a/src/main/java/com/jfinal/kit/TplKit.java +++ b/src/main/java/com/jfinal/kit/TplKit.java @@ -25,6 +25,8 @@ import com.jfinal.template.Engine; import com.jfinal.template.Template; import com.jfinal.template.source.FileSource; import com.jfinal.template.source.ISource; +import com.jfinal.template.stat.Location; +import com.jfinal.template.stat.ParseException; import java.io.File; import java.io.FileFilter; @@ -32,6 +34,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; /** * SqlKit @@ -54,6 +57,7 @@ public class TplKit { public static TplKit use(String configName) { return use(configName, false); } + public static synchronized TplKit use(String configName, boolean devMode) { TplKit tplKit = kitMap.get(configName); if (tplKit == null) { @@ -134,10 +138,15 @@ public class TplKit { public synchronized void parseTplTemplate() { Map sqlTemplateMap = new HashMap(512, 0.5F); for (TplSource ss : tplSourceList) { - Template template = ss.isFile() ? engine.getTemplate(ss.file) : engine.getTemplate(ss.source); - Map data = new HashMap(); - data.put(SQL_TEMPLATE_MAP_KEY, sqlTemplateMap); - template.renderToString(data); + String fileName = ss.isFile() ? ss.file : ((FileSource) ss.source).getFinalFileName(); + try { + Template template = ss.isFile() ? engine.getTemplate(ss.file) : engine.getTemplate(ss.source); + Map data = new HashMap<>(); + data.put(SQL_TEMPLATE_MAP_KEY, sqlTemplateMap); + template.renderToString(data); + } catch (Exception e) { + throw new RuntimeException(String.format("%s parse error", fileName), e); + } } this.sqlTemplateMap = sqlTemplateMap; }