Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

@@ -1,24 +1,23 @@
package com.ruoyi.generator.util;

import java.util.Properties;
import org.apache.velocity.app.Velocity;
import com.ruoyi.common.constant.Constants;
import org.apache.velocity.app.Velocity;

import java.util.Properties;

/**
 * VelocityEngine工厂
 * 
 *
 * @author ruoyi
 */
public class VelocityInitializer
{
public class VelocityInitializer {

    /**
     * 初始化vm方法
     */
    public static void initVelocity()
    {
    public static void initVelocity() {
        Properties p = new Properties();
        try
        {
        try {
            // 加载classpath目录下的vm文件
            p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
            // 定义字符集
@@ -26,10 +25,9 @@
            p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
            // 初始化Velocity引擎，指定配置Properties
            Velocity.init(p);
        }
        catch (Exception e)
        {
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

}