huangge1199/RuoYi-Vue-Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级velocity到最新版本2.3

Browse Source
This commit is contained in:
RuoYi 2021-11-24 15:27:41 +08:00
parent 5177a38a2a
commit 6c575f00e6
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -38,7 +38,7 @@
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<oshi.version>5.8.2</oshi.version> <oshi.version>5.8.2</oshi.version>
<jna.version>5.9.0</jna.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> <oracle.version>10.2.0.4.0</oracle.version>
</properties> </properties>
@ -218,14 +218,8 @@
<!-- velocity代码生成使用模板 --> <!-- velocity代码生成使用模板 -->
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version> <version>${velocity.version}</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- collections工具类 --> <!-- collections工具类 -->

4
src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
View File

@ -6,7 +6,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import javax.servlet.ServletRequest; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -46,7 +46,7 @@ public class HttpHelper
} }
catch (IOException e) catch (IOException e)
{ {
LOGGER.error(ExceptionUtils.getFullStackTrace(e)); LOGGER.error(ExceptionUtils.getMessage(e));
} }
} }
} }

3
src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
View File

@ -20,10 +20,9 @@ public class VelocityInitializer
try try
{ {
// 加载classpath目录下的vm文件 // 加载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.INPUT_ENCODING, Constants.UTF8);
p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
// 初始化Velocity引擎，指定配置Properties // 初始化Velocity引擎，指定配置Properties
Velocity.init(p); Velocity.init(p);
} }