From 9b78e42138064fda4b067ae5bd59d48a9500ea94 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@aliyun.com>
Date: 星期三, 07 八月 2024 00:48:19 +0800
Subject: [PATCH] FileUtil

---
 src/main/java/com/lunhan/xxx/common/util/FileUtil.java |   72 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/lunhan/xxx/common/util/FileUtil.java b/src/main/java/com/lunhan/xxx/common/util/FileUtil.java
index b4f39f4..82574e4 100644
--- a/src/main/java/com/lunhan/xxx/common/util/FileUtil.java
+++ b/src/main/java/com/lunhan/xxx/common/util/FileUtil.java
@@ -1,13 +1,8 @@
 package com.lunhan.xxx.common.util;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import java.io.*;
 import java.nio.charset.Charset;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Random;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 文件工具类
@@ -398,40 +393,6 @@
     }
 
     /**
-     * 文件上传
-     * @return
-     */
-    public static String uploadUtil(MultipartFile myFile, String fileUrlName) {
-        String urlName="";
-        try {
-            DateFormat df = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-            //文件名称
-            String name = df.format(new Date());
-
-            Random r = new Random();
-            for (int i = 0; i < 3; i++) {
-                name += r.nextInt(10);
-            }
-            int idx = myFile.getOriginalFilename().lastIndexOf(".");
-            String ext = myFile.getOriginalFilename().substring(idx);
-            //保存文件       File位置 (全路径)   /upload/fileName
-
-            String url = "/" + fileUrlName+"/" ;
-            //相对路径
-            String path = name + "." + ext;
-            File file = new File(url);
-            if (!file.exists()) {
-                file.mkdirs();
-            }
-            myFile.transferTo(new File(url + path));
-            urlName=path;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return urlName;
-    }
-
-    /**
      * 删除文件
      * @param path
      */
@@ -441,4 +402,35 @@
             file.delete();
         }
     }
+
+    /**
+     * 读取流内容
+     * @param inputStream 流
+     */
+    public static String readFileContent(InputStream inputStream) {
+        return FileUtil.readFileContent(inputStream, null);
+    }
+
+    /**
+     * 读取流内容
+     * @param inputStream 流
+     * @param charset 编码格式
+     */
+    public static String readFileContent(InputStream inputStream, Charset charset) {
+        if(null==charset) {
+            charset = StandardCharsets.UTF_8;
+        }
+        StringBuilder localStrBulider = new StringBuilder();
+        try (InputStreamReader inputStreamReader=new InputStreamReader(inputStream, charset)){
+            BufferedReader bufferReader = new BufferedReader(inputStreamReader);
+            String lineStr;
+            while((lineStr = bufferReader.readLine()) != null) {
+                localStrBulider.append(lineStr);
+            }
+            bufferReader.close();
+        } catch (IOException e) {
+            //TODO log
+        }
+        return localStrBulider.toString();
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3