diff --git a/pom.xml b/pom.xml
index 81bd067..83bffe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
4.1.2
5.8.2
5.9.0
- 1.7
+ 2.3
10.2.0.4.0
@@ -218,14 +218,8 @@
org.apache.velocity
- velocity
+ velocity-engine-core
${velocity.version}
-
-
- commons-collections
- commons-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);
}