From 26e1b9c6fdd8f15c1bc239573feccb6e9d671850 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 24 十一月 2021 15:22:46 +0800
Subject: [PATCH] 升级velocity到最新版本2.3
---
src/main/java/com/ruoyi/framework/config/ScheduleConfig.java | 2 +-
src/main/java/com/ruoyi/common/utils/http/HttpHelper.java | 4 ++--
pom.xml | 10 ++--------
src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java | 3 +--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index de1bf9b..78b0ca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<poi.version>4.1.2</poi.version>
<oshi.version>5.8.2</oshi.version>
<jna.version>5.9.0</jna.version>
- <velocity.version>1.7</velocity.version>
+ <velocity.version>2.3</velocity.version>
</properties>
<dependencies>
@@ -217,14 +217,8 @@
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- collections宸ュ叿绫� -->
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
index f8a6f21..e34fa5a 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
@@ -6,7 +6,7 @@
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import javax.servlet.ServletRequest;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@
}
catch (IOException e)
{
- LOGGER.error(ExceptionUtils.getFullStackTrace(e));
+ LOGGER.error(ExceptionUtils.getMessage(e));
}
}
}
diff --git a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java b/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
index bd19e02..72d313c 100644
--- a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
@@ -7,7 +7,7 @@
import java.util.Properties;
/**
- * 瀹氭椂浠诲姟閰嶇疆
+ * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛�
*
* @author ruoyi
*/
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
index fe78e5f..421228f 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
@@ -20,10 +20,9 @@
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);
}
--
Gitblit v1.9.3