From 795084c308a27601e3a50280f9c0919adf87e32a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 20:27:30 +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 | 2 +-
src/main/resources/application-test.yml | 2 +-
2 files changed, 2 insertions(+), 2 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 78e6476..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
@@ -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");
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 82cd886..a444118 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -94,7 +94,7 @@
cms:
base-url: http://120.27.238.55:8000/cms/output
- static-url: http://120.27.238.55:8000/cms/static
+ static-url: http://120.27.238.55:8000/cms/static/
template-path: /home/javaweb/webresource/cms/template
static-path: /home/javaweb/webresource/cms/static
output-path: /home/javaweb/webresource/cms/output
--
Gitblit v1.9.1