opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

oss桶权限为私密时，列表查看时桶为私密的文件获取临时url(解决桶为private上传时无法预览问题)

Browse Source
This commit is contained in:
chenchen 2022-10-17 19:43:54 +08:00
parent a79fda4d05
commit 016e456857
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
View File

@ -82,7 +82,7 @@ public class SysOssController extends BaseController {
if (ObjectUtil.isNull(file)) { if (ObjectUtil.isNull(file)) {
throw new ServiceException("上传文件不能为空"); throw new ServiceException("上传文件不能为空");
} }
SysOss oss = iSysOssService.upload(file); SysOssVo oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2); Map<String, String> map = new HashMap<>(2);
map.put("url", oss.getUrl()); map.put("url", oss.getUrl());
map.put("fileName", oss.getOriginalName()); map.put("fileName", oss.getOriginalName());

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -12,6 +12,7 @@ import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -115,7 +116,7 @@ public class SysProfileController extends BaseController {
if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
} }
SysOss oss = iSysOssService.upload(avatarfile); SysOssVo oss = iSysOssService.upload(avatarfile);
String avatar = oss.getUrl(); String avatar = oss.getUrl();
if (userService.updateUserAvatar(getUsername(), avatar)) { if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar); ajax.put("imgUrl", avatar);

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
View File

@ -25,7 +25,7 @@ public interface ISysOssService {
SysOssVo getById(Long ossId); SysOssVo getById(Long ossId);
SysOss upload(MultipartFile file); SysOssVo upload(MultipartFile file);
void download(Long ossId, HttpServletResponse response) throws IOException; void download(Long ossId, HttpServletResponse response) throws IOException;

9
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
@ -68,7 +69,7 @@ public class SysOssServiceImpl implements ISysOssService {
for (Long id : ossIds) { for (Long id : ossIds) {
SysOssVo vo = getById(id); SysOssVo vo = getById(id);
if (ObjectUtil.isNotNull(vo)) { if (ObjectUtil.isNotNull(vo)) {
list.add(vo); list.add(this.matchingUrl(vo));
} }
} }
return list; return list;
@ -116,7 +117,7 @@ public class SysOssServiceImpl implements ISysOssService {
} }
@Override @Override
public SysOss upload(MultipartFile file) { public SysOssVo upload(MultipartFile file) {
String originalfileName = file.getOriginalFilename(); String originalfileName = file.getOriginalFilename();
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
OssClient storage = OssFactory.instance(); OssClient storage = OssFactory.instance();
@ -134,7 +135,9 @@ public class SysOssServiceImpl implements ISysOssService {
oss.setOriginalName(originalfileName); oss.setOriginalName(originalfileName);
oss.setService(storage.getConfigKey()); oss.setService(storage.getConfigKey());
baseMapper.insert(oss); baseMapper.insert(oss);
return oss; SysOssVo sysOssVo = new SysOssVo();
BeanCopyUtils.copy(oss,sysOssVo);
return this.matchingUrl(sysOssVo);
} }
@Override @Override