fix(storage): 修复MinIO文件上传URL生成问题
- 注释掉直接拼接的文件URL赋值逻辑 - 在服务层实现预览URL生成并设置到存储实体 - 统一返回预览URL而不是重复调用生成方法
This commit is contained in:
@@ -172,7 +172,7 @@ export default {
|
||||
KitMessage.Success('复制成功')
|
||||
clipboard.destroy()
|
||||
})
|
||||
// //复制失败
|
||||
// 复制失败
|
||||
clipboard.on('error', (e) => {
|
||||
KitMessage.Error('复制失败')
|
||||
clipboard.destroy()
|
||||
|
||||
+2
-2
@@ -168,7 +168,7 @@ public class MinioRepository {
|
||||
|
||||
String objectName = KitDateUtil.getNowDateStr() + "/" + fileName;
|
||||
log.info("上传文件,原文件名:{},上传后文件名:{}", originalFilename, fileName);
|
||||
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
// String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
SystemOssStorageTb systemOssStorageTb = new SystemOssStorageTb();
|
||||
systemOssStorageTb.setServiceType("minio");
|
||||
systemOssStorageTb.setEndpoint(ossMinioConfig.getEndpoint());
|
||||
@@ -179,7 +179,7 @@ public class MinioRepository {
|
||||
systemOssStorageTb.setFilePrefix(prefix);
|
||||
systemOssStorageTb.setFileSuffix(suffix);
|
||||
systemOssStorageTb.setFileMd5(md5);
|
||||
systemOssStorageTb.setFileUrl(fileUrl);
|
||||
// systemOssStorageTb.setFileUrl(fileUrl);
|
||||
systemOssStorageTb.setFileCode(fileCode);
|
||||
systemOssStorageTb.setObjectName(objectName);
|
||||
try (InputStream fileInputStream = KitFileUtil.getInputStream(tempFile)) {
|
||||
|
||||
+4
-1
@@ -137,8 +137,11 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
|
||||
if (storageTb == null) {
|
||||
throw new BadRequestException("文件上传失败");
|
||||
}
|
||||
// 生成链接
|
||||
String previewUrl = minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
storageTb.setFileUrl(previewUrl);
|
||||
save(storageTb);
|
||||
return minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
return previewUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
-2
@@ -167,7 +167,7 @@ public class MinioRepository {
|
||||
|
||||
String objectName = KitDateUtil.getNowDateStr() + "/" + fileName;
|
||||
log.info("上传文件,原文件名:{},上传后文件名:{}", originalFilename, fileName);
|
||||
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
// String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
SystemOssStorageTb systemOssStorageTb = new SystemOssStorageTb();
|
||||
systemOssStorageTb.setServiceType("minio");
|
||||
systemOssStorageTb.setEndpoint(ossMinioConfig.getEndpoint());
|
||||
@@ -178,7 +178,7 @@ public class MinioRepository {
|
||||
systemOssStorageTb.setFilePrefix(prefix);
|
||||
systemOssStorageTb.setFileSuffix(suffix);
|
||||
systemOssStorageTb.setFileMd5(md5);
|
||||
systemOssStorageTb.setFileUrl(fileUrl);
|
||||
// systemOssStorageTb.setFileUrl(fileUrl);
|
||||
systemOssStorageTb.setFileCode(fileCode);
|
||||
systemOssStorageTb.setObjectName(objectName);
|
||||
try (InputStream fileInputStream = KitFileUtil.getInputStream(tempFile)) {
|
||||
|
||||
+4
-1
@@ -137,8 +137,11 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
|
||||
if (storageTb == null) {
|
||||
throw new BadRequestException("文件上传失败");
|
||||
}
|
||||
// 生成链接
|
||||
String previewUrl = minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
storageTb.setFileUrl(previewUrl);
|
||||
save(storageTb);
|
||||
return minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
return previewUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
-2
@@ -167,7 +167,7 @@ public class MinioRepository {
|
||||
|
||||
String objectName = KitDateUtil.getNowDateStr() + "/" + fileName;
|
||||
log.info("上传文件,原文件名:{},上传后文件名:{}", originalFilename, fileName);
|
||||
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
// String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||
SystemOssStorageTb systemOssStorageTb = new SystemOssStorageTb();
|
||||
systemOssStorageTb.setServiceType("minio");
|
||||
systemOssStorageTb.setEndpoint(ossMinioConfig.getEndpoint());
|
||||
@@ -178,7 +178,7 @@ public class MinioRepository {
|
||||
systemOssStorageTb.setFilePrefix(prefix);
|
||||
systemOssStorageTb.setFileSuffix(suffix);
|
||||
systemOssStorageTb.setFileMd5(md5);
|
||||
systemOssStorageTb.setFileUrl(fileUrl);
|
||||
// systemOssStorageTb.setFileUrl(fileUrl);
|
||||
systemOssStorageTb.setFileCode(fileCode);
|
||||
systemOssStorageTb.setObjectName(objectName);
|
||||
try (InputStream fileInputStream = KitFileUtil.getInputStream(tempFile)) {
|
||||
|
||||
+4
-1
@@ -130,8 +130,11 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
|
||||
if (storageTb == null) {
|
||||
throw new BadRequestException("文件上传失败");
|
||||
}
|
||||
// 生成链接
|
||||
String previewUrl = minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
storageTb.setFileUrl(previewUrl);
|
||||
save(storageTb);
|
||||
return minioRepository.generatePreviewUrl(storageTb.getObjectName());
|
||||
return previewUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user