From 051ccdbfdc1daec64187d28af1ca11e55649cd1e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 21 Feb 2024 08:31:11 +0800
Subject: [PATCH] 租户查询调整
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index f1b57b4..4f1b37e 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -146,7 +146,22 @@
@PostMapping("/put-file")
public R<BladeFile> putFile(@RequestParam MultipartFile file) {
BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
+ // 修改link
+ changeLink(bladeFile);
+ // 返回
return R.data(bladeFile);
+ }
+
+ /**
+ * 修改link
+ * @param bladeFile
+ */
+ private void changeLink(BladeFile bladeFile) {
+ if (null!=bladeFile){
+ // 替换url link 前缀
+ String newLink = ossBuilder.ossProperties().getEndpoint() + bladeFile.getName();
+ bladeFile.setLink(newLink);
+ }
}
/**
@@ -176,6 +191,9 @@
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
bladeFile.setAttachId(attachId);
+ // 修改link
+ changeLink(bladeFile);
+ // 返回
return R.data(bladeFile);
}
@@ -188,7 +206,7 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file) {
+ public R<BladeFile> putFileAttach(@RequestParam(required = false) String fileName, @RequestParam MultipartFile file) {
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
bladeFile.setAttachId(attachId);
@@ -196,6 +214,41 @@
}
/**
+ * 自定义前缀上传文件
+ *
+ * @param file 文件
+ * @param prefixPath 文件
+ * @return ObjectStat
+ */
+ @SneakyThrows
+ @PostMapping("/put-file-by-prefix-path")
+ public R<BladeFile> putFileByPrefixPath(@RequestParam MultipartFile file,@RequestParam(required = false) String prefixPath) {
+ BladeFile bladeFile = ossBuilder.templateByPrefixPath(prefixPath).putFile(file.getOriginalFilename(), file.getInputStream());
+ // 修改link
+ changeLink(bladeFile);
+ return R.data(bladeFile);
+ }
+
+ /**
+ * 自定义前缀上传文件并保存至附件表
+ *
+ * @param file 文件
+ * @param prefixPath 文件
+ * @return ObjectStat
+ */
+ @SneakyThrows
+ @PostMapping("/put-file-attach-by-prefix-path")
+ public R<BladeFile> putFileAttachByPrefixPath(@RequestParam MultipartFile file,@RequestParam(required = false) String prefixPath) {
+ String fileName = file.getOriginalFilename();
+ BladeFile bladeFile = ossBuilder.templateByPrefixPath(prefixPath).putFile(file.getOriginalFilename(), file.getInputStream());
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
+ bladeFile.setAttachId(attachId);
+ // 修改link
+ changeLink(bladeFile);
+ return R.data(bladeFile);
+ }
+
+ /**
* 构建附件表
*
* @param fileName 文件名
--
Gitblit v1.9.3