From 44ba2b77d5f4e803f95c320dd77c543cf8da91db Mon Sep 17 00:00:00 2001
From: 284718418@qq.com <youlinrc321>
Date: Thu, 13 Jan 2022 10:00:18 +0800
Subject: [PATCH] 1.优化代码-上传文件超时 2.文件操作日志添加物理删除标记字段
---
src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java | 5 +++++
src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java | 4 ++--
src/main/resources/mapping/disk/DiskFilesLogMapper.xml | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java b/src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java
index acbf75c..c20e88f 100644
--- a/src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java
+++ b/src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java
@@ -77,6 +77,11 @@ public class DiskFilesLog extends Model<DiskFilesLog> {
@ApiModelProperty(value = "用户姓名")
private String userName;
/**
+ * 逻辑删除标记0.未删除 1.删除
+ */
+ @ApiModelProperty(value = "逻辑删除标记0.未删除 1.删除")
+ private Integer deleteFlag;
+ /**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
diff --git a/src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java b/src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java
index cf4d210..5f633b4 100644
--- a/src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java
+++ b/src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java
@@ -102,8 +102,8 @@ public class SftpConfiguration {
abandonedConfig.setRemoveAbandonedOnMaintenance(true);
//borrow 的时候检查泄漏
abandonedConfig.setRemoveAbandonedOnBorrow(true);
- //如果一个对象borrow之后10秒还没有返还给pool，认为是泄漏的对象
- abandonedConfig.setRemoveAbandonedTimeout(10);
+ //如果一个对象borrow之后60秒还没有返还给pool，认为是泄漏的对象
+ abandonedConfig.setRemoveAbandonedTimeout(60);
this.channelSftpPool.setAbandonedConfig(abandonedConfig);
//30秒运行一次维护任务
this.channelSftpPool.setTimeBetweenEvictionRunsMillis(30000);
diff --git a/src/main/resources/mapping/disk/DiskFilesLogMapper.xml b/src/main/resources/mapping/disk/DiskFilesLogMapper.xml
index c659ea3..de23303 100644
--- a/src/main/resources/mapping/disk/DiskFilesLogMapper.xml
+++ b/src/main/resources/mapping/disk/DiskFilesLogMapper.xml
@@ -13,6 +13,7 @@
<result property="fileSize" column="file_size"/>
<result property="userId" column="user_id"/>
<result property="userName" column="user_name"/>
+ <result property="deleteFlag" column="delete_flag"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
--
libgit2 0.26.0