[代码优化](v2.6)：代码优化

Author: elunez

eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java

@@ -0,0 +1,47 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package me.zhengjie.utils;
+
+import java.io.Closeable;
+
+/**
+ * @author Zheng Jie
+ * @website https://el-admin.vip
+ * @description 用于关闭各种连接，缺啥补啥
+ * @date 2021-03-05
+ **/
+public class CloseUtil {
+
+    public static void close(Closeable closeable) {
+        if (null != closeable) {
+            try {
+                closeable.close();
+            } catch (Exception e) {
+                // 静默关闭
+            }
+        }
+    }
+
+    public static void close(AutoCloseable closeable) {
+        if (null != closeable) {
+            try {
+                closeable.close();
+            } catch (Exception e) {
+                // 静默关闭
+            }
+        }
+    }
+}

eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java

@@ -153,20 +153,26 @@ public static String getSize(long size) {
     /**
      * inputStream 转 File
      */
-    static File inputStreamToFile(InputStream ins, String name) throws Exception {
+    static File inputStreamToFile(InputStream ins, String name){
         File file = new File(SYS_TEM_DIR + name);
         if (file.exists()) {
             return file;
         }
-        OutputStream os = new FileOutputStream(file);
-        int bytesRead;
-        int len = 8192;
-        byte[] buffer = new byte[len];
-        while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
-            os.write(buffer, 0, bytesRead);
+        OutputStream os = null;
+        try {
+            os = new FileOutputStream(file);
+            int bytesRead;
+            int len = 8192;
+            byte[] buffer = new byte[len];
+            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            CloseUtil.close(os);
+            CloseUtil.close(ins);
         }
-        os.close();
-        ins.close();
         return file;
     }
 
@@ -257,7 +263,10 @@ public static void checkSize(long maxSize, long size) {
     public static boolean check(File file1, File file2) {
         String img1Md5 = getMd5(file1);
         String img2Md5 = getMd5(file2);
-        return img1Md5.equals(img2Md5);
+        if(img1Md5 != null){
+            return img1Md5.equals(img2Md5);
+        }
+        return false;
     }
 
     /**
@@ -270,16 +279,19 @@ public static boolean check(String file1Md5, String file2Md5) {
     private static byte[] getByte(File file) {
         // 得到文件长度
         byte[] b = new byte[(int) file.length()];
+        InputStream in = null;
         try {
-            InputStream in = new FileInputStream(file);
+            in = new FileInputStream(file);
             try {
                 System.out.println(in.read(b));
             } catch (IOException e) {
                 log.error(e.getMessage(), e);
             }
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
             return null;
+        } finally {
+            CloseUtil.close(in);
         }
         return b;
     }
@@ -341,5 +353,4 @@ public static void downloadFile(HttpServletRequest request, HttpServletResponse
     public static String getMd5(File file) {
         return getMd5(getByte(file));
     }
-
 }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java

@@ -19,7 +19,7 @@
 import com.alibaba.druid.util.StringUtils;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-
+import me.zhengjie.utils.CloseUtil;
 import javax.sql.DataSource;
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,9 +35,6 @@
 @Slf4j
 public class SqlUtils {
 
-	public static final String COLON = ":";
-
-
 	/**
 	 * 获取数据源
 	 *
@@ -102,6 +99,8 @@ private static Connection getConnection(String jdbcUrl, String userName, String
 		} catch (Exception e) {
 			log.error("create connection error, jdbcUrl: {}", jdbcUrl);
 			throw new RuntimeException("create connection error, jdbcUrl: " + jdbcUrl);
+		} finally {
+			CloseUtil.close(connection);
 		}
 		return connection;
 	}
@@ -117,17 +116,6 @@ private static void releaseConnection(Connection connection) {
 		}
 	}
 
-
-	public static void closeResult(ResultSet rs) {
-		if (rs != null) {
-			try {
-				rs.close();
-			} catch (Exception e) {
-				log.error(e.getMessage(),e);
-			}
-		}
-	}
-
 	public static boolean testConnection(String jdbcUrl, String userName, String password) {
 		Connection connection = null;
 		try {
@@ -162,15 +150,22 @@ public static String executeFile(String jdbcUrl, String userName, String passwor
 	 * @param connection /
 	 * @param sqlList /
 	 */
-	public static void batchExecute(Connection connection, List<String> sqlList) throws SQLException {
-		Statement st = connection.createStatement();
-		for (String sql : sqlList) {
-			if (sql.endsWith(";")) {
-				sql = sql.substring(0, sql.length() - 1);
+	public static void batchExecute(Connection connection, List<String> sqlList) {
+		Statement st = null;
+		try {
+			st = connection.createStatement();
+			for (String sql : sqlList) {
+				if (sql.endsWith(";")) {
+					sql = sql.substring(0, sql.length() - 1);
+				}
+				st.addBatch(sql);
 			}
-			st.addBatch(sql);
+			st.executeBatch();
+		} catch (SQLException throwables) {
+			throwables.printStackTrace();
+		} finally {
+			CloseUtil.close(st);
 		}
-		st.executeBatch();
 	}
 
 	/**

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java

@@ -17,6 +17,7 @@
 
 import cn.hutool.core.date.BetweenFormater;
 import cn.hutool.core.date.DateUtil;
+import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.service.MonitorService;
 import me.zhengjie.utils.ElAdminConstant;
 import me.zhengjie.utils.FileUtil;
@@ -91,7 +92,11 @@ private Map<String,Object> getDiskInfo(OperatingSystem os) {
         diskInfo.put("total", total > 0 ? FileUtil.getSize(total) : "?");
         diskInfo.put("available", FileUtil.getSize(available));
         diskInfo.put("used", FileUtil.getSize(used));
-        diskInfo.put("usageRate", df.format(used/(double)total * 100));
+        if(total != 0){
+            diskInfo.put("usageRate", df.format(used/(double)total * 100));
+        } else {
+            diskInfo.put("usageRate", 0);
+        }
         return diskInfo;
     }