From 37487242633c75262e69b1ab760e146a4759db73 Mon Sep 17 00:00:00 2001 From: zhouyl <583641232@qq.com> Date: Tue, 24 Sep 2024 12:18:46 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=96=87=E4=BB=B6=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E4=B8=8A=E4=BC=A0=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/TestReportController.java | 21 +++++++++++++++++++ .../common/filter/RequestLoggingFilter.java | 3 ++- .../inscloudtech/system/domain/SysOss.java | 5 +++++ .../system/service/ISysOssService.java | 3 +++ .../service/impl/SysOssServiceImpl.java | 11 ++++++++-- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java index d3b3201..3cb705e 100644 --- a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java +++ b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java @@ -13,11 +13,13 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.domain.model.LoginUser; import com.inscloudtech.common.core.page.TableDataInfo; +import com.inscloudtech.common.encrypt.annotation.ApiEncrypt; import com.inscloudtech.common.enums.BusinessType; import com.inscloudtech.common.helper.LoginHelper; import com.inscloudtech.common.utils.file.FileUploadUtils; import com.inscloudtech.functional.domain.TestReport; import com.inscloudtech.functional.service.TestReportService; +import com.inscloudtech.system.domain.SysOss; import com.inscloudtech.system.domain.vo.SysOssVo; import com.inscloudtech.system.service.ISysOssService; import lombok.RequiredArgsConstructor; @@ -103,6 +105,7 @@ public class TestReportController { return R.ok("操作成功！"); } + /** * 上传测试数据 * @@ -130,6 +133,24 @@ public class TestReportController { return R.ok("操作成功！"); } + /** + * 文件加密 + * + */ + @Log(title = "文件加密", businessType = BusinessType.INSERT) + @PostMapping(value = "/uploadEncrypt", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R uploadEncrypt( @RequestParam("file") MultipartFile file) { + if(file != null && FileUploadUtils.checkTxtFileValid(file)){ + SysOssVo toolVo = iSysOssService.upload(file,true); + SysOss update = new SysOss(); + update.setOssId(toolVo.getOssId()); + update.setModuleName("文件加密上传"); + iSysOssService.update(update); + } + return R.ok("操作成功！"); + } + + /** * 下载测试数据 diff --git a/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java b/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java index 98696ad..70b6b48 100644 --- a/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java +++ b/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java @@ -26,6 +26,7 @@ public class RequestLoggingFilter implements Filter { public void init(FilterConfig filterConfig) throws ServletException { } + String ignoreURL = "uploadToolAndTips,uploadEncrypt"; @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) @@ -34,7 +35,7 @@ public class RequestLoggingFilter implements Filter { ServletRequest requestWrapper = null; HttpServletRequest req = (HttpServletRequest) request; String url = req.getServletPath(); - if (!url.contains("uploadToolAndTips")) { + if (!url.contains("uploadToolAndTips") && !url.contains("uploadEncrypt")) { requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); handleLog(req); } diff --git a/tp-system/src/main/java/com/inscloudtech/system/domain/SysOss.java b/tp-system/src/main/java/com/inscloudtech/system/domain/SysOss.java index 7e3fb60..bc771ad 100644 --- a/tp-system/src/main/java/com/inscloudtech/system/domain/SysOss.java +++ b/tp-system/src/main/java/com/inscloudtech/system/domain/SysOss.java @@ -47,4 +47,9 @@ public class SysOss extends BaseEntity { */ private String service; + /** + * + */ + private String moduleName; + } diff --git a/tp-system/src/main/java/com/inscloudtech/system/service/ISysOssService.java b/tp-system/src/main/java/com/inscloudtech/system/service/ISysOssService.java index 0bd75a5..1cde6c6 100644 --- a/tp-system/src/main/java/com/inscloudtech/system/service/ISysOssService.java +++ b/tp-system/src/main/java/com/inscloudtech/system/service/ISysOssService.java @@ -2,6 +2,7 @@ package com.inscloudtech.system.service; import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; +import com.inscloudtech.system.domain.SysOss; import com.inscloudtech.system.domain.bo.SysOssBo; import com.inscloudtech.system.domain.vo.SysOssVo; import org.springframework.web.multipart.MultipartFile; @@ -35,4 +36,6 @@ public interface ISysOssService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + void update(SysOss toolVo); } diff --git a/tp-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java b/tp-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java index d5cea3f..f904a85 100644 --- a/tp-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java +++ b/tp-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java @@ -61,9 +61,10 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(SysOss::getCreateTime); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List filterResult = result.getRecords().stream().map(this::matchingUrl).collect(Collectors.toList()); - result.setRecords(filterResult); +// List filterResult = result.getRecords().stream().map(this::matchingUrl).collect(Collectors.toList()); +// result.setRecords(filterResult); return TableDataInfo.build(result); } @@ -258,6 +259,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService { return baseMapper.deleteBatchIds(ids) > 0; } + @Override + public void update(SysOss toolVo) { + + baseMapper.updateById(toolVo); + } + /** * 匹配Url *