From ea5bb460b4074c447768cc375e3028ab997f93dd Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Mon, 21 Oct 2024 09:28:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/AuditServiceImpl.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
index 890b46229..2388ddf73 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
@@ -277,26 +277,30 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
                     //写入到excel:
                     WriteSheet writeSheet = EasyExcel.writerSheet(i, "Sheet" + (i + 1)).head(UserLogExcel.class)
                             .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
+
+                    System.out.println("备份日志文件执行到这一步aaaa"+":"+list.size());
                     excelWriter.write(list, writeSheet);
                 }
             }
+            excelWriter.finish();
+            if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS || generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
+                try {
+                    System.out.println("备份日志文件执行到这一步"+file.getName()+":"+file.length()/1024/1024+"MB");
+                    fileInputStream = new FileInputStream(file);
+                    fileStorageUtil.uploadStream(fileInputStream,OssPath.LOGBAK,file.getName());
+                } catch (FileNotFoundException e) {
+                    throw new RuntimeException(e);
+                }finally {
+                    file.delete();
+                }
+            }
         } catch (Exception e) {
             redisUtil.delete("logFileWriter");
             e.printStackTrace();
         } finally {
-            excelWriter.finish();
+
         }
 
-        if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS || generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
-            try {
-                fileInputStream = new FileInputStream(file);
-                fileStorageUtil.uploadStream(fileInputStream,OssPath.LOGBAK,file.getName());
-            } catch (FileNotFoundException e) {
-                throw new RuntimeException(e);
-            }finally {
-                file.delete();
-            }
-        }
 
         redisUtil.delete("logFileWriter");
         System.out.println("日志备份结束，共花费时间" + timeInterval.intervalSecond() + "S");
@@ -344,7 +348,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
             IOUtils.closeQuietly(in);
 
             if(generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS || generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
-                newFile.deleteOnExit();
+                newFile.delete();
             }
         }
         redisUtil.delete("recoverLogFile");