From 6c575f00e6c5c02fe5b2d60a0122b13f7b570a7c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 24 Nov 2021 15:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7velocity=E5=88=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                | 10 ++--------
 .../java/com/ruoyi/common/utils/http/HttpHelper.java   |  4 ++--
 .../project/tool/gen/util/VelocityInitializer.java     |  3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81bd067..83bffe7 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>
         <oracle.version>10.2.0.4.0</oracle.version>
     </properties>
 
@@ -218,14 +218,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.InputStream;
 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 @@ public class HttpHelper
                 }
                 catch (IOException e)
                 {
-                    LOGGER.error(ExceptionUtils.getFullStackTrace(e));
+                    LOGGER.error(ExceptionUtils.getMessage(e));
                 }
             }
         }
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 @@ public class VelocityInitializer
         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);
             // 初始化Velocity引擎，指定配置Properties
             Velocity.init(p);
         }