From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/core/template/TemplateLoader.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/template/TemplateLoader.java b/src/main/java/com/xcong/farmer/cms/core/template/TemplateLoader.java
index 6eb9068..a45bc4d 100644
--- a/src/main/java/com/xcong/farmer/cms/core/template/TemplateLoader.java
+++ b/src/main/java/com/xcong/farmer/cms/core/template/TemplateLoader.java
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.core.template;
+import com.xcong.farmer.cms.core.node.Template;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -12,7 +13,6 @@
public class TemplateLoader {
private Configuration cfg;
- private List<Template> templates = new ArrayList<>();
private Map<String, Object> systemData;
public TemplateLoader() {}
@@ -22,22 +22,7 @@
}
public Template template(File file) {
- Document document = null;
- try {
- document = Jsoup.parse(file, "utf-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- if (document == null) {
- throw new NullPointerException();
- }
-
- Template template = new Template();
- template.setDocument(document);
- template.setName(file.getName());
- template.systemData(this.systemData);
-
+ Template template = new Template(file, this.systemData);
template.parser();
return template;
}
--
Gitblit v1.9.1