升级velocity到最新版本2.3

RuoYi

2021-11-24 26e1b9c6fdd8f15c1bc239573feccb6e9d671850

升级velocity到最新版本2.3

 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工具类 -->


 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));

                }

            }

        }


 src/main/java/com/ruoyi/framework/config/ScheduleConfig.java

@@ -7,7 +7,7 @@
import java.util.Properties;



/**

 * 定时任务配置

 * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效）

 * 

 * @author ruoyi

 */


 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);

            // 初始化Velocity引擎，指定配置Properties

            Velocity.init(p);

        }