From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
index 461bc2c..a81bd51 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
@@ -19,10 +19,9 @@
Properties p = new Properties();
try {
// 鍔犺浇classpath鐩綍涓嬬殑vm鏂囦欢
- p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
// 瀹氫箟瀛楃闆�
p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
- p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
// 鍒濆鍖朧elocity寮曟搸锛屾寚瀹氶厤缃甈roperties
Velocity.init(p);
} catch (Exception e) {
--
Gitblit v1.9.3