From d0e4da214db4ce0bdf7efec02b55195b56032424 Mon Sep 17 00:00:00 2001
From: Jie Zheng <201507802@qq.com>
Date: Tue, 14 Jan 2025 16:12:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96FileUtil=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=92=8C=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/utils/FileUtil.java | 20 +++++++++----------
 .../service/impl/QuartzJobServiceImpl.java    |  1 +
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index ca2b674..c2d4f9a 100644
--- a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -19,16 +19,16 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -42,10 +42,9 @@ import java.util.Map;
  * @author Zheng Jie
  * @date 2018-12-27
  */
+@Slf4j
 public class FileUtil extends cn.hutool.core.io.FileUtil {
 
-    private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
-
     /**
      * 系统临时目录
      * <br>
@@ -108,7 +107,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
      * 获取文件扩展名，不带 .
      */
     public static String getExtensionName(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
+        if ((filename != null) && (!filename.isEmpty())) {
             int dot = filename.lastIndexOf('.');
             if ((dot > -1) && (dot < (filename.length() - 1))) {
                 return filename.substring(dot + 1);
@@ -121,9 +120,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
      * Java文件操作 获取不带扩展名的文件名
      */
     public static String getFileNameNoEx(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
+        if ((filename != null) && (!filename.isEmpty())) {
             int dot = filename.lastIndexOf('.');
-            if ((dot > -1) && (dot < (filename.length()))) {
+            if (dot > -1) {
                 return filename.substring(0, dot);
             }
         }
@@ -160,7 +159,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         }
         OutputStream os = null;
         try {
-            os = new FileOutputStream(file);
+            os = Files.newOutputStream(file.toPath());
             int bytesRead;
             int len = 8192;
             byte[] buffer = new byte[len];
@@ -168,7 +167,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
                 os.write(buffer, 0, bytesRead);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } finally {
             CloseUtil.close(os);
             CloseUtil.close(ins);
@@ -282,7 +281,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         byte[] b = new byte[(int) file.length()];
         InputStream in = null;
         try {
-            in = new FileInputStream(file);
+            in = Files.newInputStream(file.toPath());
             try {
                 System.out.println(in.read(b));
             } catch (IOException e) {
@@ -388,7 +387,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         return fileName;
     }
 
-
     public static String getMd5(File file) {
         return getMd5(getByte(file));
     }
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java
index b27f4fb..3a1fa51 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java
@@ -98,6 +98,7 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateIsPause(QuartzJob quartzJob) {
+        // 置换暂停状态
         if (quartzJob.getIsPause()) {
             quartzManage.resumeJob(quartzJob);
             quartzJob.setIsPause(false);