diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java index 1094255..14d2576 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java @@ -129,7 +129,7 @@ public class SysOssPersonController extends BaseController { } @SaCheckPermission("file:person:download") - @GetMapping("/download/{id}") + @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { sysOssPersonService.download(id, response); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java index 26cbcca..da0ba86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java @@ -136,7 +136,7 @@ public class SysOssResourceController extends BaseController { return toAjax(sysOssResourceService.moveByBo(bo)); } @SaCheckPermission("file:resource:download") - @GetMapping("/download/{id}") + @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { sysOssResourceService.download(id, response); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index bf2907d..06aceba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -139,7 +139,7 @@ public class SysOssTextbookController extends BaseController { } @SaCheckPermission("file:textbook:download") - @GetMapping("/download/{id}") + @PostMapping("/download/{id}") public void download(@PathVariable Long id, HttpServletResponse response) throws Exception { sysOssTextbookService.download(id, response); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index 5bec700..965d209 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -66,7 +66,7 @@ public interface ISysOssService { * @param ossId OSS对象ID * @param response HttpServletResponse对象,用于设置响应头和向客户端发送文件内容 */ - void download(Long ossId, HttpServletResponse response) throws IOException; + void download(Long ossId,String originalName,HttpServletResponse response) throws IOException; /** * 删除OSS对象存储 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index edc067e..485995f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -291,7 +291,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { @Caching(evict = { @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId"), - @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") + @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, allEntries = true) }) @Override public int updateDept(SysDeptBo bo) { @@ -362,14 +362,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Caching(evict = { @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId"), - @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") + @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, allEntries = true) }) @Override public int deleteDeptById(Long deptId) { return baseMapper.deleteById(deptId); } - @Cacheable(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") + @Cacheable(cacheNames = CacheNames.SYS_TENANT_DEPT) @Override public List selectAllDept() { return baseMapper.selectList(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java index 67c92d3..ad1e341 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java @@ -190,6 +190,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { @Override public void download(Long id, HttpServletResponse response) throws IOException { SysOssPerson ossPerson = baseMapper.selectById(id); - ossService.download(ossPerson.getOssId(), response); + String fileName = ossPerson.getFileName(); + ossService.download(ossPerson.getOssId(), fileName, response); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java index 870a75b..97c72f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java @@ -209,7 +209,8 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { @Override public void download(Long id, HttpServletResponse response) throws IOException { SysOssResource ossResource = baseMapper.selectById(id); - ossService.download(ossResource.getOssId(), response); + String fileName = ossResource.getFileName(); + ossService.download(ossResource.getOssId(), fileName, response); baseMapper.addDownloadNum(id); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 6b801b1..1199bd6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -169,12 +169,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @param response HttpServletResponse对象,用于设置响应头和向客户端发送文件内容 */ @Override - public void download(Long ossId, HttpServletResponse response) throws IOException { + public void download(Long ossId,String originalName, HttpServletResponse response) throws IOException { SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); if (ObjectUtil.isNull(sysOss)) { throw new ServiceException("文件数据不存在!"); } - FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); + FileUtils.setAttachmentResponseHeader(response, originalName); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); OssClient storage = OssFactory.instance(sysOss.getService()); long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index 2344f74..2346f1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -209,7 +209,8 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public void download(Long id, HttpServletResponse response) throws IOException { SysOssTextbook ossTextbook = baseMapper.selectById(id); - ossService.download(ossTextbook.getOssId(), response); + String fileName = ossTextbook.getFileName(); + ossService.download(ossTextbook.getOssId(), fileName, response); baseMapper.addDownloadNum(id); } }