feat: support wfc-modules-file
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -17,8 +17,7 @@ import org.wfc.system.api.domain.SysFile;
|
|||||||
* @author wfc
|
* @author wfc
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
public class SysFileController
|
public class SysFileController {
|
||||||
{
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
|
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -28,19 +27,15 @@ public class SysFileController
|
|||||||
* 文件上传请求
|
* 文件上传请求
|
||||||
*/
|
*/
|
||||||
@PostMapping("upload")
|
@PostMapping("upload")
|
||||||
public R<SysFile> upload(MultipartFile file)
|
public R<SysFile> upload(MultipartFile file) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
// 上传并返回访问地址
|
// 上传并返回访问地址
|
||||||
String url = sysFileService.uploadFile(file);
|
String url = sysFileService.uploadFile(file);
|
||||||
SysFile sysFile = new SysFile();
|
SysFile sysFile = new SysFile();
|
||||||
sysFile.setName(FileUtils.getName(url));
|
sysFile.setName(FileUtils.getName(url));
|
||||||
sysFile.setUrl(url);
|
sysFile.setUrl(url);
|
||||||
return R.ok(sysFile);
|
return R.ok(sysFile);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("上传文件失败", e);
|
log.error("上传文件失败", e);
|
||||||
return R.fail(e.getMessage());
|
return R.fail(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ public class LocalSysFileServiceImpl implements ISysFileService
|
|||||||
public String uploadFile(MultipartFile file) throws Exception
|
public String uploadFile(MultipartFile file) throws Exception
|
||||||
{
|
{
|
||||||
String name = FileUploadUtils.upload(localFilePath, file);
|
String name = FileUploadUtils.upload(localFilePath, file);
|
||||||
String url = domain + localFilePrefix + name;
|
return domain + localFilePrefix + name;
|
||||||
return url;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,7 @@ import org.wfc.common.core.utils.uuid.Seq;
|
|||||||
*
|
*
|
||||||
* @author wfc
|
* @author wfc
|
||||||
*/
|
*/
|
||||||
public class FileUploadUtils
|
public class FileUploadUtils {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 默认大小 50M
|
* 默认大小 50M
|
||||||
*/
|
*/
|
||||||
@@ -37,22 +36,16 @@ public class FileUploadUtils
|
|||||||
* 根据文件路径上传
|
* 根据文件路径上传
|
||||||
*
|
*
|
||||||
* @param baseDir 相对应用的基目录
|
* @param baseDir 相对应用的基目录
|
||||||
* @param file 上传的文件
|
* @param file 上传的文件
|
||||||
* @return 文件名称
|
* @return 文件名称
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
public static final String upload(String baseDir, MultipartFile file) throws IOException
|
public static final String upload(String baseDir, MultipartFile file) throws IOException {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
|
return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
|
||||||
}
|
} catch (FileException fe) {
|
||||||
catch (FileException fe)
|
|
||||||
{
|
|
||||||
throw new IOException(fe.getDefaultMessage(), fe);
|
throw new IOException(fe.getDefaultMessage(), fe);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
throw new IOException(e.getMessage(), e);
|
throw new IOException(e.getMessage(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -60,22 +53,23 @@ public class FileUploadUtils
|
|||||||
/**
|
/**
|
||||||
* 文件上传
|
* 文件上传
|
||||||
*
|
*
|
||||||
* @param baseDir 相对应用的基目录
|
* @param baseDir 相对应用的基目录
|
||||||
* @param file 上传的文件
|
* @param file 上传的文件
|
||||||
* @param allowedExtension 上传文件类型
|
* @param allowedExtension 上传文件类型
|
||||||
* @return 返回上传成功的文件名
|
* @return 返回上传成功的文件名
|
||||||
* @throws FileSizeLimitExceededException 如果超出最大大小
|
* @throws FileSizeLimitExceededException 如果超出最大大小
|
||||||
* @throws FileNameLengthLimitExceededException 文件名太长
|
* @throws FileNameLengthLimitExceededException 文件名太长
|
||||||
* @throws IOException 比如读写文件出错时
|
* @throws IOException 比如读写文件出错时
|
||||||
* @throws InvalidExtensionException 文件校验异常
|
* @throws InvalidExtensionException 文件校验异常
|
||||||
*/
|
*/
|
||||||
public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
|
public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
|
||||||
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
|
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
|
||||||
InvalidExtensionException
|
InvalidExtensionException {
|
||||||
{
|
if (file == null || file.isEmpty()) {
|
||||||
|
throw new IllegalArgumentException("File must not be null or empty");
|
||||||
|
}
|
||||||
int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
|
int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
|
||||||
if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
|
if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
|
||||||
{
|
|
||||||
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
|
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,6 +77,12 @@ public class FileUploadUtils
|
|||||||
|
|
||||||
String fileName = extractFilename(file);
|
String fileName = extractFilename(file);
|
||||||
|
|
||||||
|
// 确保上传目录存在
|
||||||
|
File uploadDir = new File(baseDir);
|
||||||
|
if (!uploadDir.exists()) {
|
||||||
|
uploadDir.mkdirs();
|
||||||
|
}
|
||||||
|
|
||||||
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
|
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
|
||||||
file.transferTo(Paths.get(absPath));
|
file.transferTo(Paths.get(absPath));
|
||||||
return getPathFileName(fileName);
|
return getPathFileName(fileName);
|
||||||
@@ -91,30 +91,23 @@ public class FileUploadUtils
|
|||||||
/**
|
/**
|
||||||
* 编码文件名
|
* 编码文件名
|
||||||
*/
|
*/
|
||||||
public static final String extractFilename(MultipartFile file)
|
public static final String extractFilename(MultipartFile file) {
|
||||||
{
|
|
||||||
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
|
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
|
||||||
FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file));
|
FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType),
|
||||||
|
FileTypeUtils.getExtension(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
|
private static final File getAbsoluteFile(String uploadDir, String fileName) {
|
||||||
{
|
|
||||||
File desc = new File(uploadDir + File.separator + fileName);
|
File desc = new File(uploadDir + File.separator + fileName);
|
||||||
|
|
||||||
if (!desc.exists())
|
if (!desc.exists() && !desc.getParentFile().exists()) {
|
||||||
{
|
desc.getParentFile().mkdirs();
|
||||||
if (!desc.getParentFile().exists())
|
|
||||||
{
|
|
||||||
desc.getParentFile().mkdirs();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
|
return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String getPathFileName(String fileName) throws IOException
|
private static final String getPathFileName(String fileName) {
|
||||||
{
|
return File.separator + fileName;
|
||||||
String pathFileName = "/" + fileName;
|
|
||||||
return pathFileName;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -122,43 +115,31 @@ public class FileUploadUtils
|
|||||||
*
|
*
|
||||||
* @param file 上传的文件
|
* @param file 上传的文件
|
||||||
* @throws FileSizeLimitExceededException 如果超出最大大小
|
* @throws FileSizeLimitExceededException 如果超出最大大小
|
||||||
* @throws InvalidExtensionException 文件校验异常
|
* @throws InvalidExtensionException 文件校验异常
|
||||||
*/
|
*/
|
||||||
public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
|
private static final void assertAllowed(MultipartFile file, String[] allowedExtension)
|
||||||
throws FileSizeLimitExceededException, InvalidExtensionException
|
throws FileSizeLimitExceededException, InvalidExtensionException {
|
||||||
{
|
|
||||||
long size = file.getSize();
|
long size = file.getSize();
|
||||||
if (size > DEFAULT_MAX_SIZE)
|
if (size > DEFAULT_MAX_SIZE) {
|
||||||
{
|
|
||||||
throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
|
throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
|
||||||
}
|
}
|
||||||
|
|
||||||
String fileName = file.getOriginalFilename();
|
String fileName = file.getOriginalFilename();
|
||||||
String extension = FileTypeUtils.getExtension(file);
|
String extension = FileTypeUtils.getExtension(file);
|
||||||
if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
|
if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
|
||||||
{
|
if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
|
||||||
if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
|
|
||||||
{
|
|
||||||
throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
|
throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
|
||||||
fileName);
|
fileName);
|
||||||
}
|
} else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
|
||||||
else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
|
|
||||||
{
|
|
||||||
throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
|
throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
|
||||||
fileName);
|
fileName);
|
||||||
}
|
} else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
|
||||||
else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
|
|
||||||
{
|
|
||||||
throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
|
throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
|
||||||
fileName);
|
fileName);
|
||||||
}
|
} else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
|
||||||
else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
|
|
||||||
{
|
|
||||||
throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
|
throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
|
||||||
fileName);
|
fileName);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new InvalidExtensionException(allowedExtension, extension, fileName);
|
throw new InvalidExtensionException(allowedExtension, extension, fileName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -167,16 +148,13 @@ public class FileUploadUtils
|
|||||||
/**
|
/**
|
||||||
* 判断MIME类型是否是允许的MIME类型
|
* 判断MIME类型是否是允许的MIME类型
|
||||||
*
|
*
|
||||||
* @param extension 上传文件类型
|
* @param extension 上传文件类型
|
||||||
* @param allowedExtension 允许上传文件类型
|
* @param allowedExtension 允许上传文件类型
|
||||||
* @return true/false
|
* @return true/false
|
||||||
*/
|
*/
|
||||||
public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
|
private static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
|
||||||
{
|
for (String str : allowedExtension) {
|
||||||
for (String str : allowedExtension)
|
if (str.equalsIgnoreCase(extension)) {
|
||||||
{
|
|
||||||
if (str.equalsIgnoreCase(extension))
|
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
19
wfc-modules/wfc-file/src/main/resources/application.yml
Normal file
19
wfc-modules/wfc-file/src/main/resources/application.yml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# 本地文件上传
|
||||||
|
file:
|
||||||
|
domain: wfc-file:${WFC_FILE_PORT:9201}
|
||||||
|
path: /opt/wfc/upload
|
||||||
|
prefix: /kyc
|
||||||
|
|
||||||
|
# FastDFS配置
|
||||||
|
fdfs:
|
||||||
|
domain: http://wfc-file
|
||||||
|
soTimeout: 3000
|
||||||
|
connectTimeout: 2000
|
||||||
|
trackerList: wfc-file:22122
|
||||||
|
|
||||||
|
# Minio配置
|
||||||
|
minio:
|
||||||
|
url: http://wfc-file:9000
|
||||||
|
accessKey: minioadmin
|
||||||
|
secretKey: minioadmin
|
||||||
|
bucketName: test
|
||||||
Reference in New Issue
Block a user