From b144aed5891cca28b6b2271b6566fd99af125264 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Mon, 8 Jul 2024 10:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BB=E5=8F=96=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=96=87=E4=BB=B6=E7=9A=84=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/common/FilesUtils.java   | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/common/src/main/java/com/xypower/common/FilesUtils.java b/common/src/main/java/com/xypower/common/FilesUtils.java
index 730bf812..156f4cba 100644
--- a/common/src/main/java/com/xypower/common/FilesUtils.java
+++ b/common/src/main/java/com/xypower/common/FilesUtils.java
@@ -131,13 +131,7 @@ public class FilesUtils {
         } catch (Exception ex) {
 
         } finally {
-            if (fileOutputStream != null) {
-                try {
-                    fileOutputStream.close();
-                } catch (Exception ex) {
-
-                }
-            }
+            closeFriendly(fileOutputStream);
         }
     }
 
@@ -158,9 +152,9 @@ public class FilesUtils {
         BufferedReader bufferedReader = null;
         StringBuilder stringBuilder = null;
         try {
-            File appCfgFile = new File(path);
-            if (appCfgFile.exists()) {
-                fis = new FileInputStream(appCfgFile);
+            File file = new File(path);
+            if (file.exists()) {
+                fis = new FileInputStream(file);
                 inputStreamReader = new InputStreamReader(fis, "UTF-8");
                 bufferedReader = new BufferedReader(inputStreamReader);
                 stringBuilder = new StringBuilder();
@@ -174,27 +168,33 @@ public class FilesUtils {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            if (bufferedReader != null) {
-                try {
-                    bufferedReader.close();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-            if (inputStreamReader != null) {
-                try {
-                    inputStreamReader.close();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
+            closeFriendly(bufferedReader);
+            closeFriendly(inputStreamReader);
+            closeFriendly(fis);
+        }
+
+        return stringBuilder == null ? null : stringBuilder.toString();
+    }
+
+    public static String readTextFile(InputStream inputStream) {
+        InputStreamReader inputStreamReader = null;
+        BufferedReader bufferedReader = null;
+        StringBuilder stringBuilder = null;
+        try {
+            inputStreamReader = new InputStreamReader(inputStream, "UTF-8");
+            bufferedReader = new BufferedReader(inputStreamReader);
+            stringBuilder = new StringBuilder();
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                stringBuilder.append(line);
             }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            closeFriendly(bufferedReader);
+            closeFriendly(inputStreamReader);
         }
 
         return stringBuilder == null ? null : stringBuilder.toString();