1.优化代码-上传文件超时

2.文件操作日志添加物理删除标记字段

src/main/java/cn/timer/api/bean/disk/DiskFilesLog.java

@@ -77,6 +77,11 @@ public class DiskFilesLog extends Model<DiskFilesLog> {
 	@ApiModelProperty(value = "用户姓名")
 	@ApiModelProperty(value = "用户姓名")
 	private String userName;
 	private String userName;
 	/**
 	/**
+	 * 逻辑删除标记0.未删除 1.删除
+	 */
+	@ApiModelProperty(value = "逻辑删除标记0.未删除 1.删除")
+	private Integer deleteFlag;
+	/**
 	* 创建时间
 	* 创建时间
 	*/
 	*/
 	@ApiModelProperty(value = "创建时间")
 	@ApiModelProperty(value = "创建时间")

src/main/java/cn/timer/api/config/sftp/SftpConfiguration.java

@@ -102,8 +102,8 @@ public class SftpConfiguration {
         abandonedConfig.setRemoveAbandonedOnMaintenance(true);
         abandonedConfig.setRemoveAbandonedOnMaintenance(true);
         //borrow 的时候检查泄漏
         //borrow 的时候检查泄漏
         abandonedConfig.setRemoveAbandonedOnBorrow(true);
         abandonedConfig.setRemoveAbandonedOnBorrow(true);
-        //如果一个对象borrow之后10秒还没有返还给pool，认为是泄漏的对象
-        abandonedConfig.setRemoveAbandonedTimeout(10);
+        //如果一个对象borrow之后60秒还没有返还给pool，认为是泄漏的对象
+        abandonedConfig.setRemoveAbandonedTimeout(60);
         this.channelSftpPool.setAbandonedConfig(abandonedConfig);
         this.channelSftpPool.setAbandonedConfig(abandonedConfig);
         //30秒运行一次维护任务
         //30秒运行一次维护任务
         this.channelSftpPool.setTimeBetweenEvictionRunsMillis(30000);
         this.channelSftpPool.setTimeBetweenEvictionRunsMillis(30000);

src/main/resources/mapping/disk/DiskFilesLogMapper.xml

@@ -13,6 +13,7 @@
         <result property="fileSize" column="file_size"/>
         <result property="fileSize" column="file_size"/>
         <result property="userId" column="user_id"/>
         <result property="userId" column="user_id"/>
         <result property="userName" column="user_name"/>
         <result property="userName" column="user_name"/>
+        <result property="deleteFlag" column="delete_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>