1.日志功能调整
This commit is contained in:
@@ -277,26 +277,30 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
|
|||||||
//写入到excel:
|
//写入到excel:
|
||||||
WriteSheet writeSheet = EasyExcel.writerSheet(i, "Sheet" + (i + 1)).head(UserLogExcel.class)
|
WriteSheet writeSheet = EasyExcel.writerSheet(i, "Sheet" + (i + 1)).head(UserLogExcel.class)
|
||||||
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
|
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
|
||||||
|
|
||||||
|
System.out.println("备份日志文件执行到这一步aaaa"+":"+list.size());
|
||||||
excelWriter.write(list, writeSheet);
|
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) {
|
} catch (Exception e) {
|
||||||
redisUtil.delete("logFileWriter");
|
redisUtil.delete("logFileWriter");
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} finally {
|
} 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");
|
redisUtil.delete("logFileWriter");
|
||||||
System.out.println("日志备份结束,共花费时间" + timeInterval.intervalSecond() + "S");
|
System.out.println("日志备份结束,共花费时间" + timeInterval.intervalSecond() + "S");
|
||||||
@@ -344,7 +348,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
|
|||||||
IOUtils.closeQuietly(in);
|
IOUtils.closeQuietly(in);
|
||||||
|
|
||||||
if(generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS || generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
|
if(generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS || generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
|
||||||
newFile.deleteOnExit();
|
newFile.delete();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
redisUtil.delete("recoverLogFile");
|
redisUtil.delete("recoverLogFile");
|
||||||
|
|||||||
Reference in New Issue
Block a user