From b4d7bebc3d1438dd62d2881f75a6f6de5d9b1748 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Wed, 19 Oct 2022 23:30:35 +0800
Subject: [PATCH] =?UTF-8?q?velocity=20=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ktg-generator/pom.xml                                  |  2 +-
 .../com/ktg/generator/util/VelocityInitializer.java    |  6 ++++--
 pom.xml                                                | 10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ktg-generator/pom.xml b/ktg-generator/pom.xml
index 709cc23..8c255eb 100644
--- a/ktg-generator/pom.xml
+++ b/ktg-generator/pom.xml
@@ -20,7 +20,7 @@
         <!--velocity代码生成使用模板 -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
+            <artifactId>velocity</artifactId>
         </dependency>
 
         <!-- collections工具类 -->
diff --git a/ktg-generator/src/main/java/com/ktg/generator/util/VelocityInitializer.java b/ktg-generator/src/main/java/com/ktg/generator/util/VelocityInitializer.java
index 2e997ab..d101974 100644
--- a/ktg-generator/src/main/java/com/ktg/generator/util/VelocityInitializer.java
+++ b/ktg-generator/src/main/java/com/ktg/generator/util/VelocityInitializer.java
@@ -20,9 +20,11 @@ public class VelocityInitializer
         try
         {
             // 加载classpath目录下的vm文件
-            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+            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.init(p);
         }
diff --git a/pom.xml b/pom.xml
index 862e39c..85da62e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>4.1.2</poi.version>
-        <velocity.version>2.3</velocity.version>
+        <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
     </properties>
 	
@@ -132,8 +132,14 @@
             <!-- velocity代码生成使用模板 -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
+                <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- collections工具类 -->