增加读取文本文件的函数

common/src/main/java/com/xypower/common/FilesUtils.java

@@ -131,13 +131,7 @@ public class FilesUtils {
         } catch (Exception ex) {
 
         } finally {
-            if (fileOutputStream != null) {
+            closeFriendly(fileOutputStream);
-                try {
-                    fileOutputStream.close();
-                } catch (Exception ex) {
-
-                }
-            }
         }
     }
 
@@ -158,9 +152,9 @@ public class FilesUtils {
         BufferedReader bufferedReader = null;
         StringBuilder stringBuilder = null;
         try {
-            File appCfgFile = new File(path);
+            File file = new File(path);
-            if (appCfgFile.exists()) {
+            if (file.exists()) {
-                fis = new FileInputStream(appCfgFile);
+                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) {
+            closeFriendly(bufferedReader);
-                try {
+            closeFriendly(inputStreamReader);
-                    bufferedReader.close();
+            closeFriendly(fis);
-                } catch (Exception ex) {
+        }
-                    ex.printStackTrace();
+
-                }
+        return stringBuilder == null ? null : stringBuilder.toString();
-            }
+    }
-            if (inputStreamReader != null) {
+
-                try {
+    public static String readTextFile(InputStream inputStream) {
-                    inputStreamReader.close();
+        InputStreamReader inputStreamReader = null;
-                } catch (Exception ex) {
+        BufferedReader bufferedReader = null;
-                    ex.printStackTrace();
+        StringBuilder stringBuilder = null;
-                }
+        try {
-            }
+            inputStreamReader = new InputStreamReader(inputStream, "UTF-8");
-            if (fis != null) {
+            bufferedReader = new BufferedReader(inputStreamReader);
-                try {
+            stringBuilder = new StringBuilder();
-                    fis.close();
+            String line;
-                } catch (Exception ex) {
+            while ((line = bufferedReader.readLine()) != null) {
-                    ex.printStackTrace();
+                stringBuilder.append(line);
-                }
             }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            closeFriendly(bufferedReader);
+            closeFriendly(inputStreamReader);
         }
 
         return stringBuilder == null ? null : stringBuilder.toString();