JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】CommonController修改上传与下载文件接口

Browse Source
This commit is contained in:
mzc5649
2021-03-29 17:28:27 +08:00
parent 62b19e3093
commit e8b34d5144
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+12 -27
View File
@@ -109,58 +109,43 @@ public class CommonController {
/** /**
* 预览图片&下载文件 * 预览图片&下载文件
* 请求地址：http://localhost:8080/common/static/{user/20190119/e1fe9925bc315c60addea1b98eb1cb1349547719_1547866868179.jpg}
* *
* @param id 传入文件id
* @param request * @param request
* @param response * @param response
*/ */
@GetMapping(value = "/download/**") @GetMapping(value = "/download/{id}")
public void view(HttpServletRequest request, HttpServletResponse response) { public void view(@PathVariable String id,HttpServletRequest request, HttpServletResponse response) {
// ISO-8859-1 ==> UTF-8 进行编码转换 // 查询数据表数据是否存在
String imgPath = extractPathFromPattern(request); LambdaQueryWrapper<OSSFile> queryWrapper = new LambdaQueryWrapper<>();
if(oConvertUtils.isEmpty(imgPath) || imgPath == "null"){ queryWrapper.eq(OSSFile::getId,id);
return; OSSFile ossFile = ossFileService.getOne(queryWrapper);
if( null == ossFile){
throw new RuntimeException("文件不存在..");
} }
// 其余处理略 String fileUrl = ossFile.getUrl();
InputStream inputStream = null; InputStream inputStream = null;
OutputStream outputStream = null; OutputStream outputStream = null;
try { try {
imgPath = imgPath.replace("..", "");
if (imgPath.endsWith(",")) {
imgPath = imgPath.substring(0, imgPath.length() - 1);
}
String fileName = ""; String fileName = "";
LambdaQueryWrapper<OSSFile> queryWrapper = new LambdaQueryWrapper<>();
if(CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)){ if(CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)){
//本地下载 //本地下载
String filePath = uploadpath + File.separator + imgPath; String filePath = uploadpath + File.separator + fileName;
File file = new File(filePath); File file = new File(filePath);
if(!file.exists()){ if(!file.exists()){
response.setStatus(404); response.setStatus(404);
throw new RuntimeException("文件不存在.."); throw new RuntimeException("文件不存在..");
} }
// 查询数据表数据是否存在
queryWrapper.eq(OSSFile::getUrl,imgPath);
OSSFile ossFile = ossFileService.getOne(queryWrapper);
if( null == ossFile){
throw new RuntimeException("文件不存在..");
}
// 文件名称 // 文件名称
fileName = file.getName(); fileName = file.getName();
inputStream = new BufferedInputStream(new FileInputStream(filePath)); inputStream = new BufferedInputStream(new FileInputStream(filePath));
}else if(CommonConstant.UPLOAD_TYPE_MINIO.equals(uploadType)){ }else if(CommonConstant.UPLOAD_TYPE_MINIO.equals(uploadType)){
// minio 下载 // minio 下载
queryWrapper.eq(OSSFile::getUrl,imgPath.replaceFirst("/","//"));
OSSFile ossFile = ossFileService.getOne(queryWrapper);
// 查询该文件数据是否存在
if( null == ossFile){
throw new RuntimeException("文件不存在");
}
// 通过MinioUtil查询时 只需要桶后面的路径 // 通过MinioUtil查询时 只需要桶后面的路径
String minioUrl = MinioUtil.getMinioUrl(); String minioUrl = MinioUtil.getMinioUrl();
// Linux/unix 系统下文件路径分隔符为"/" 获取minio与存储桶的路径 // Linux/unix 系统下文件路径分隔符为"/" 获取minio与存储桶的路径
minioUrl = minioUrl + MinioUtil.getBucketName() + "/"; minioUrl = minioUrl + MinioUtil.getBucketName() + "/";
String url = ossFile.getUrl().replace(minioUrl, ""); String url = fileUrl.replace(minioUrl, "");
// 文件名称 // 文件名称
fileName = ossFile.getFileName(); fileName = ossFile.getFileName();
inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url); inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url);