diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/UploadFileVo.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/UploadFileVo.java
index 7b4d413..3dfd778 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/UploadFileVo.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/UploadFileVo.java
@@ -66,10 +66,14 @@ public class UploadFileVo {
*/
private String createTime;
+ private String createUser;
+
/**
* 获取bast64文件
*/
private String bast64;
+ private String userName;
+
}
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
index e910483..034fa8d 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
@@ -2,6 +2,7 @@ package com.bonus.file.service.impl;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
+import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.file.config.MinioConfig;
import com.bonus.file.mapper.FileUtilMapper;
import com.bonus.file.utils.MinioUtil;
@@ -84,6 +85,7 @@ public class FileUtilsServiceImpl {
String path="/"+bucketName+"/"+filePath;
vo.setPath(path);
vo.setUrl(minioConfig.getUrl());
+ vo.setCreateUser(SecurityUtils.getUserId().toString());
int num=mapper.insertUploadFile(vo);
if(num>0){
return vo;
@@ -136,6 +138,7 @@ public class FileUtilsServiceImpl {
String path="/"+bucketName+"/"+filePath;
vo.setPath(path);
vo.setUrl(minioConfig.getUrl());
+ vo.setCreateUser(SecurityUtils.getUserId().toString());
int num=mapper.insertUploadFile(vo);
if(num>0){
return vo;
@@ -186,6 +189,7 @@ public class FileUtilsServiceImpl {
String path="/"+bucketName+"/"+filePath;
vo.setPath(path);
vo.setUrl(minioConfig.getUrl());
+ vo.setCreateUser(SecurityUtils.getUserId().toString());
list.add(vo);
}
int num=mapper.insertUploadFileList(list);
@@ -242,6 +246,7 @@ public class FileUtilsServiceImpl {
String path="/"+bucketName+"/"+filePath;
vo.setPath(path);
vo.setUrl(minioConfig.getUrl());
+ vo.setCreateUser(SecurityUtils.getUserId().toString());
list.add(vo);
}
int num=mapper.insertUploadFileList(list);
diff --git a/bonus-modules/bonus-file/src/main/resources/mapper/FileUtilMapper.xml b/bonus-modules/bonus-file/src/main/resources/mapper/FileUtilMapper.xml
index 7083d85..afc4fa3 100644
--- a/bonus-modules/bonus-file/src/main/resources/mapper/FileUtilMapper.xml
+++ b/bonus-modules/bonus-file/src/main/resources/mapper/FileUtilMapper.xml
@@ -7,16 +7,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bm_files(
- source_table, source_id, source_type, file_name, file_key,bucket_name, create_time, update_time, is_active, origin_file_name,file_url,file_path
- )values (#{sourceTable},#{sourceId},#{sourceType},#{fileName},#{filePath},#{bucketName},now(),now(),1,#{originFileName},#{url},#{path})
+ source_table, source_id, source_type, file_name, file_key,bucket_name, create_time, update_time, is_active, origin_file_name,file_url,file_path,create_user
+ )values (#{sourceTable},#{sourceId},#{sourceType},#{fileName},#{filePath},#{bucketName},now(),now(),1,#{originFileName},#{url},#{path},#{createUser})
- insert into bm_files ( source_table, source_id, source_type, file_name, file_key,bucket_name, create_time, update_time, is_active, origin_file_name,file_url,file_path
+ insert into bm_files ( source_table, source_id, source_type, file_name, file_key,bucket_name, create_time,
+ update_time, is_active, origin_file_name,file_url,file_path,create_user
) values
(#{item.sourceTable},#{item.sourceId},#{item.sourceType},#{item.fileName},#{item.filePath},
- #{item.bucketName},now(),now(),1,#{item.originFileName},#{item.url},#{item.path})
+ #{item.bucketName},now(),now(),1,#{item.originFileName},#{item.url},#{item.path},#{item.createUser})
@@ -48,30 +49,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"