mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容前端框架，提供文件原始名

This commit is contained in:
cjw 2024-06-04 17:06:25 +08:00
parent 94ed7562ea
commit 239b93e421
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
View File

@ -74,6 +74,7 @@ public class SysOssController extends BaseController {
SysOssVo oss = ossService.upload(file); SysOssVo oss = ossService.upload(file);
SysOssUploadVo uploadVo = new SysOssUploadVo(); SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl()); uploadVo.setUrl(oss.getUrl());
uploadVo.setFileName(oss.getOriginalName());
uploadVo.setOssId(oss.getOssId().toString()); uploadVo.setOssId(oss.getOssId().toString());
return R.ok(uploadVo); return R.ok(uploadVo);
} }

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
View File

@ -20,4 +20,9 @@ public class SysOssUploadVo {
*/ */
private String ossId; private String ossId;
/**
* 文件名
*/
private String fileName;
} }

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
View File

@ -32,6 +32,11 @@ public class SysOssVo implements Serializable {
*/ */
private String fileName; private String fileName;
/**
* 原名
*/
private String originalName;
/** /**
* 文件后缀名 * 文件后缀名
*/ */

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
View File

@ -195,6 +195,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
md5 = DigestUtils.md5Hex(file.getInputStream()); md5 = DigestUtils.md5Hex(file.getInputStream());
SysOssVo byMd5 = this.getByMd5(md5); SysOssVo byMd5 = this.getByMd5(md5);
if (ObjectUtil.isNotNull(byMd5)) { if (ObjectUtil.isNotNull(byMd5)) {
byMd5.setOriginalName(originalfileName);
return byMd5; return byMd5;
} }
uploadResult = storage.uploadSuffix(file.getBytes(), suffix); uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
@ -202,7 +203,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
// 保存文件信息 // 保存文件信息
return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult); return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult);
} }
/** /**
@ -228,11 +229,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
} }
UploadResult uploadResult = storage.uploadSuffix(file, suffix); UploadResult uploadResult = storage.uploadSuffix(file, suffix);
// 保存文件信息 // 保存文件信息
return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult); return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult);
} }
@NotNull @NotNull
private SysOssVo buildResultEntity(String md5, String suffix, String configKey, UploadResult uploadResult) { private SysOssVo buildResultEntity(String originalfileName, String md5, String suffix, String configKey, UploadResult uploadResult) {
SysOss oss = new SysOss(); SysOss oss = new SysOss();
oss.setUrl(uploadResult.getUrl()); oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix); oss.setFileSuffix(suffix);
@ -241,6 +242,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
oss.setFileMd5(md5); oss.setFileMd5(md5);
baseMapper.insert(oss); baseMapper.insert(oss);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class); SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
sysOssVo.setOriginalName(originalfileName);
return this.matchingUrl(sysOssVo); return this.matchingUrl(sysOssVo);
} }