From 51cc18eec6c31f98c295554fe45307d324fd7428 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 16 Nov 2022 13:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8=E5=90=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/base/utils/WordConvertUtils.java   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java b/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java
index 6c5451a..8d132b3 100644
--- a/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java
+++ b/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/WordConvertUtils.java
@@ -26,7 +26,7 @@ public class WordConvertUtils {
      * @param fileName   文件名
      */
     public static void creatWord(Map<String, Object> map, File file, String targetPath, String fileName, String dir) {
-        String curDate = DateUtils.dateConvertStr(new Date(), "yyyy年MM月dd日");
+//        String curDate = DateUtils.dateConvertStr(new Date(), "yyyy年MM月dd日");
         try {
             //Configuration 用于读取ftl文件
             Configuration configuration = new Configuration(new Version("2.3.0"));
@@ -44,12 +44,32 @@ public class WordConvertUtils {
             Template template = configuration.getTemplate(file.getName(), "utf-8");
             Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"), 10240);
             template.process(map, out);
+            file.delete();
             out.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    public static void inputStreamToFile(InputStream ins, File file) {
+        OutputStream os = null;
+        try {
+            os = new FileOutputStream(file);
+
+            int bytesRead = 0;
+            byte[] buffer = new byte[8192];
+            while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.close();
+            ins.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * word转换为pdf
      *