From 7ed2efc56e0bd3965388f97f9a2db350f6e4e382 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 11:46:35 +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/Configuration.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/template/Configuration.java b/src/main/java/com/xcong/farmer/cms/core/template/Configuration.java
index f2c97b0..766240b 100644
--- a/src/main/java/com/xcong/farmer/cms/core/template/Configuration.java
+++ b/src/main/java/com/xcong/farmer/cms/core/template/Configuration.java
@@ -6,17 +6,21 @@
public abstract class Configuration {
- public String staticPath;
- public String templatePath;
- public String outputPath;
+ protected static String BASE_URL;
+ protected static String STATIC_URL;
+ protected static String staticPath;
+ protected static String templatePath;
+ protected static String outputPath;
public Configuration() {
}
- public Configuration(String templatePath, String staticPath, String outputPath) {
- this.staticPath = staticPath;
- this.templatePath = templatePath;
- this.outputPath = outputPath;
+ public Configuration(String templatePath, String staticPath, String outputPath, String baseUrl, String staticUrl) {
+ Configuration.staticPath = staticPath;
+ Configuration.templatePath = templatePath;
+ Configuration.outputPath = outputPath;
+ Configuration.BASE_URL = baseUrl;
+ Configuration.STATIC_URL = staticUrl;
}
public static Map<String, String> templateCode = new HashMap<>();
--
Gitblit v1.9.1