From 3ac50f7d3997dea70d4f5df04b4655da354e82ef Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 14 Sep 2022 17:12:23 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/ShiroServiceImpl.java | 3 +- .../sys/SystemParameterController.java | 28 ++++++++----------- frontend/src/lang/en.js | 5 ++++ frontend/src/lang/tw.js | 9 ++++-- frontend/src/lang/zh.js | 9 ++++-- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index f2f84c1b5b..6a32dff31a 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -68,7 +68,8 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/**/*.json", ANON); filterChainDefinitionMap.put("/system/ui/**", ANON); - filterChainDefinitionMap.put("/system/file/**", ANON); + filterChainDefinitionMap.put("/system/filedown/**", ANON); + filterChainDefinitionMap.put("/system/showpicture/**", ANON); filterChainDefinitionMap.put("/**/*.js", ANON); filterChainDefinitionMap.put("/**/*.css", ANON); filterChainDefinitionMap.put("/**/*.map", ANON); diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 144f12bdd9..773d5b0853 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -1,6 +1,6 @@ package io.dataease.controller.sys; -import io.dataease.plugins.common.base.domain.FileMetadata; + import io.dataease.plugins.common.base.domain.SystemParameter; import io.dataease.commons.constants.ParamConstants; import io.dataease.controller.sys.response.BasicInfo; @@ -8,6 +8,7 @@ import io.dataease.controller.sys.response.MailInfo; import io.dataease.dto.SystemParameterDTO; import io.dataease.listener.DatasetCheckListener; import io.dataease.listener.util.CacheUtils; +import io.dataease.plugins.common.util.GlobalFileUtil; import io.dataease.plugins.xpack.cas.dto.CasSaveResult; import io.dataease.service.FileService; import io.dataease.service.system.EmailService; @@ -22,7 +23,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.io.IOException; -import java.net.URLEncoder; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -108,21 +109,16 @@ public class SystemParameterController { return new ResponseEntity<>(bytes, headers, HttpStatus.OK); } - @GetMapping("/file/down/{fileId}/{fileName}") - public ResponseEntity down(@PathVariable("fileId") String fileId, @PathVariable("fileName") String fileName) throws Exception{ + @GetMapping("/filedown/{fileId}/{fileName}") + public ResponseEntity down(@PathVariable("fileId") String fileId, @PathVariable("fileName") String fileName) throws Exception { - FileMetadata fileMetadata = fileService.getFileMetadataById(fileId); - String type = fileMetadata.getType(); - if (!StringUtils.endsWith(fileName.toUpperCase(), type.toUpperCase())) { - fileName += ("." + type); - } - byte[] bytes = fileService.loadFileAsBytes(fileId); - ByteArrayResource bar = new ByteArrayResource(bytes); - final HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); - ContentDisposition contentDisposition = ContentDisposition.parse("attachment; filename=" + URLEncoder.encode(fileName, "UTF-8")); - headers.setContentDisposition(contentDisposition); - return new ResponseEntity<>(bar, headers, HttpStatus.OK); + return GlobalFileUtil.down(fileId, fileName); + } + + @GetMapping("/showpicture/{fileId}") + public ResponseEntity showPicture(@PathVariable("fileId") String fileId) throws Exception { + + return GlobalFileUtil.showPicture(fileId); } @PostMapping(value = "/save/ui", consumes = {"multipart/form-data"}) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d0c4bd0a01..ed845ecfdd 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2337,6 +2337,11 @@ export default { panel: 'Panel', content: 'Content', recipients: 'Recipients', + recisetting: 'channel', + email: 'Email', + wecom: 'Wecom', + dingtalk: 'Dingtalk', + lark: 'Lark', pixel: 'Pixel', default: 'Default', custom: 'Custom', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index d936474cd3..3f479940b4 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2334,10 +2334,15 @@ export default { }, emailtask: { - title: '郵件主題', + title: '報告主題', panel: '儀錶闆', - content: '郵件正文', + content: '報告正文', recipients: '收件人', + recisetting: '接受設置', + email: '郵件', + wecom: '企業微信', + dingtalk: '釘釘', + lark: '飛書', pixel: '分辨率', default: '默認', custom: '自定義', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index d4c2c5da07..fac524b4ef 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2334,10 +2334,15 @@ export default { }, emailtask: { - title: '邮件主题', + title: '报告主题', panel: '仪表板', - content: '邮件正文', + content: '报告正文', recipients: '收件人', + recisetting: '接受设置', + email: '邮件', + wecom: '企业微信', + dingtalk: '钉钉', + lark: '飞书', pixel: '分辨率', default: '默认', custom: '自定义',