Merge branch 'release_v3.4.5' into dev_v3.4.5

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -48,6 +48,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -645,7 +647,12 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             throw new RuntimeException(e);
         } finally {
             if (pdfFile.exists()) {
-                FileUtil.deleteFile(pdfFile);
+//                FileUtil.deleteFile(pdfFile);
+                try {
+                    Files.delete(Paths.get(pdfFile.getAbsolutePath()));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
         return examCard;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/HtmlToJpgUtil.java

@@ -9,7 +9,6 @@ import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.FileUploadService;
 import com.qmth.teachcloud.common.util.ConvertUtil;
-import com.qmth.teachcloud.common.util.FileUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,8 +17,11 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,7 +72,12 @@ public class HtmlToJpgUtil {
         } finally {
             if (CollectionUtils.isNotEmpty(jpgFileList)) {
                 for (File jpgFile : jpgFileList) {
-                    FileUtil.deleteFile(jpgFile);
+                    try {
+                        Files.delete(Paths.get(jpgFile.getAbsolutePath()));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+//                    FileUtil.deleteFile(jpgFile);
                 }
             }
         }