From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
index b576d23..763b1e4 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/StorageBlobServiceImpl.java
@@ -20,6 +20,7 @@
import javax.crypto.SecretKey;
import java.io.File;
import java.io.IOException;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +40,7 @@
private final FileUtil fileUtil;
@Override
- public List<StorageBlobVO> upload(List<MultipartFile> files) {
+ public List<StorageBlobVO> upload(List<MultipartFile> files, Boolean isPublic) {
if (CollectionUtils.isEmpty(files)) {
throw new IllegalArgumentException("鏂囦欢涓嶈兘涓虹┖");
}
@@ -57,7 +58,8 @@
String fileName = UUID.randomUUID() + "_" + originalFileName;
String relativePath = fileUtil.buildRelativePath();
File targetDirectory = new File(properties.getPath(), relativePath);
- if (!targetDirectory.exists() && !targetDirectory.mkdirs()) {
+ // 骞跺彂涓婁紶鏃讹紝鍙︿竴涓姹傚彲鑳芥伆濂藉凡鍒涘缓鐩綍锛涙鏃� mkdirs 杩斿洖 false锛屼絾鐩綍鍙甯镐娇鐢ㄣ��
+ if (!targetDirectory.exists() && !targetDirectory.mkdirs() && !targetDirectory.isDirectory()) {
throw new RuntimeException("鍒涘缓涓婁紶鐩綍澶辫触");
}
File dest = new File(targetDirectory, fileName);
@@ -65,7 +67,7 @@
StorageBlobVO storageBlob;
try {
file.transferTo(dest);
- storageBlob = getStorageBlob(file, originalFileName, fileName, relativePath);
+ storageBlob = getStorageBlob(file, originalFileName, fileName, relativePath, isPublic);
if (storageBlob == null || storageBlob.getId() == null) {
throw new RuntimeException("鏂囦欢鍏冩暟鎹繚瀛樺け璐�");
}
@@ -89,9 +91,7 @@
throw new IllegalArgumentException("token涓嶈兘涓虹┖");
}
- String secretStr = StringUtils.hasText(properties.getJwtSecret())
- ? properties.getJwtSecret()
- : "local-file-jwt-secret";
+ String secretStr = properties.getJwtSecret();
SecretKey key = Keys.hmacShaKeyFor(secretStr.getBytes(StandardCharsets.UTF_8));
Claims claims = Jwts.parser()
@@ -111,13 +111,35 @@
return new File(new File(properties.getPath(), path), fileName);
}
+ @Override
+ public File getPublicFile(String fileName, String publicKey) {
+ if (!StringUtils.hasText(fileName)) {
+ throw new IllegalArgumentException("鏂囦欢鍚嶄笉鑳戒负绌�");
+ }
+ if (!StringUtils.hasText(publicKey)) {
+ throw new IllegalArgumentException("publicKey涓嶈兘涓虹┖");
+ }
+ StorageBlob storageBlob = storageBlobMapper.selectOne(new LambdaQueryWrapper<StorageBlob>()
+ .eq(StorageBlob::getUidFilename, fileName)
+ .eq(StorageBlob::getResourceKey, publicKey)
+ .last("limit 1"));
+ if (storageBlob == null) {
+ throw new IllegalArgumentException("鍏紑鏂囦欢涓嶅瓨鍦ㄦ垨publicKey涓嶅尮閰�");
+ }
+ String path = storageBlob.getPath();
+ if (!StringUtils.hasText(path)) {
+ return new File(properties.getPath(), fileName);
+ }
+ return new File(new File(properties.getPath(), path), fileName);
+ }
+
private StorageBlob findStorageBlob(String fileName) {
return storageBlobMapper.selectOne(new LambdaQueryWrapper<StorageBlob>()
.eq(StorageBlob::getUidFilename, fileName)
.last("limit 1"));
}
- private StorageBlobVO getStorageBlob(MultipartFile file, String originalFileName, String fileName, String relativePath) {
+ private StorageBlobVO getStorageBlob(MultipartFile file, String originalFileName, String fileName, String relativePath, Boolean isPublic) {
StorageBlobVO storageBlob = new StorageBlobVO();
storageBlob.setResourceKey(UUID.randomUUID().toString().replace("-", ""));
storageBlob.setContentType(file.getContentType());
@@ -125,8 +147,13 @@
storageBlob.setUidFilename(fileName);
storageBlob.setByteSize(file.getSize());
storageBlob.setPath(relativePath);
- storageBlob.setPreviewURL(fileUtil.buildSignedPreviewUrl(storageBlob));
- storageBlob.setDownloadURL(fileUtil.buildSignedDownloadUrl(storageBlob));
+ if (isPublic) {
+ storageBlob.setPreviewURL(fileUtil.buildSignedUrl(storageBlob, "/preview/", BigDecimal.valueOf(-1)));
+ storageBlob.setDownloadURL(fileUtil.buildSignedUrl(storageBlob, "/download/", BigDecimal.valueOf(-1)));
+ } else {
+ storageBlob.setPreviewURL(fileUtil.buildSignedPreviewUrl(storageBlob));
+ storageBlob.setDownloadURL(fileUtil.buildSignedDownloadUrl(storageBlob));
+ }
int affectedRows = storageBlobMapper.insert(storageBlob);
if (affectedRows <= 0) {
throw new RuntimeException("鏂囦欢鍏冩暟鎹繚瀛樺け璐�");
--
Gitblit v1.9.3