From 1bf0ae3eed3cff7a98753715d7df8bd8166b29b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 12:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/core/node/Template.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/node/Template.java b/src/main/java/com/xcong/farmer/cms/core/node/Template.java
index aef600e..e1ef6e0 100644
--- a/src/main/java/com/xcong/farmer/cms/core/node/Template.java
+++ b/src/main/java/com/xcong/farmer/cms/core/node/Template.java
@@ -21,7 +21,7 @@
// 文件名称
private String name = "index";
// 文件保存路径
- private String path;
+ private String path = "";
private Document document;
private Map<String, Map<String, Object>> params = new HashMap<>();
@@ -63,7 +63,7 @@
if ("article".equals(templateType)) {
Object templateName = system.get("templateName");
if (templateName != null) {
- this.name = (String) templateName;
+ this.name = String.valueOf(templateName);
}
} else if ("column".equals(templateType)) {
Object page = system.get("page");
@@ -77,7 +77,7 @@
}
public void parser() {
- Elements children = document.body().children();
+ Elements children = document.children();
if (CollUtil.isNotEmpty(children)) {
for (Element child : children) {
PartNode partNode = new PartNode(child, this.system);
@@ -96,7 +96,7 @@
for (PartNode partNode : partNodes) {
sb.append(partNode.getHtml());
}
- document.body().empty().html(sb.toString());
+ document = Jsoup.parse(sb.toString());
String outPath = path(outputPath);
String html = document.html();
--
Gitblit v1.9.1