完成上架相关优化、oss迁移
This commit is contained in:
+14
-32
@@ -1,11 +1,8 @@
|
||||
package com.nanri.aiimage.modules.digitalhuman.service;
|
||||
|
||||
import com.aliyun.oss.OSS;
|
||||
import com.aliyun.oss.OSSClientBuilder;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.config.OssProperties;
|
||||
import com.nanri.aiimage.modules.digitalhuman.mapper.DigitalHumanVersionMapper;
|
||||
import com.nanri.aiimage.modules.digitalhuman.model.entity.DigitalHumanVersionEntity;
|
||||
import com.nanri.aiimage.modules.digitalhuman.model.vo.DigitalHumanVersionVo;
|
||||
@@ -33,11 +30,10 @@ public class DigitalHumanVersionService {
|
||||
|
||||
private static final String STATUS_DRAFT = "DRAFT";
|
||||
private static final String STATUS_RELEASED = "RELEASED";
|
||||
private static final String OSS_PATH_PREFIX = "digital-human/versions/";
|
||||
private static final String STORAGE_PATH_PREFIX = "digital-human/versions/";
|
||||
|
||||
private final DigitalHumanVersionMapper versionMapper;
|
||||
private final OssStorageService ossStorageService;
|
||||
private final OssProperties ossProperties;
|
||||
|
||||
@Transactional
|
||||
public DigitalHumanVersionVo uploadVersion(String version, MultipartFile file, String changelog,
|
||||
@@ -67,23 +63,16 @@ public class DigitalHumanVersionService {
|
||||
log.info("[digital-human-version] md5 calculated version={} md5={} elapsedMs={}",
|
||||
version, md5, elapsedMs(startedAt));
|
||||
|
||||
// 构建 OSS 路径
|
||||
String ossObjectKey = OSS_PATH_PREFIX + "v" + version + "/ShuFuDigitalHuman.zip";
|
||||
String ossObjectKey = STORAGE_PATH_PREFIX + "v" + version + "/ShuFuDigitalHuman.zip";
|
||||
|
||||
// 上传到 OSS
|
||||
OSS ossClient = buildOssClient();
|
||||
try {
|
||||
log.info("[digital-human-version] oss upload start version={} objectKey={} bytes={} elapsedMs={}",
|
||||
version, ossObjectKey, tempFile.length(), elapsedMs(startedAt));
|
||||
ossClient.putObject(ossProperties.getBucket(), ossObjectKey, tempFile);
|
||||
if (!ossClient.doesObjectExist(ossProperties.getBucket(), ossObjectKey)) {
|
||||
throw new BusinessException("数字人版本文件上传后在 OSS 中不可见,请重试");
|
||||
}
|
||||
log.info("[digital-human-version] oss uploaded version={} objectKey={} bytes={} elapsedMs={}",
|
||||
version, ossObjectKey, tempFile.length(), elapsedMs(startedAt));
|
||||
} finally {
|
||||
ossClient.shutdown();
|
||||
log.info("[digital-human-version] minio upload start version={} objectKey={} bytes={} elapsedMs={}",
|
||||
version, ossObjectKey, tempFile.length(), elapsedMs(startedAt));
|
||||
ossStorageService.uploadDigitalHumanVersion(tempFile, ossObjectKey);
|
||||
if (!ossStorageService.objectExists(ossObjectKey)) {
|
||||
throw new BusinessException("数字人版本文件上传后在 MinIO 中不可见,请重试");
|
||||
}
|
||||
log.info("[digital-human-version] minio uploaded version={} objectKey={} bytes={} elapsedMs={}",
|
||||
version, ossObjectKey, tempFile.length(), elapsedMs(startedAt));
|
||||
|
||||
// 保存数据库记录
|
||||
DigitalHumanVersionEntity entity = new DigitalHumanVersionEntity();
|
||||
@@ -161,7 +150,7 @@ public class DigitalHumanVersionService {
|
||||
}
|
||||
|
||||
if (!ossStorageService.objectExists(entity.getOssObjectKey())) {
|
||||
throw new BusinessException("数字人版本文件不存在于 OSS,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
throw new BusinessException("数字人版本文件不存在于 MinIO,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
}
|
||||
|
||||
entity.setStatus(STATUS_RELEASED);
|
||||
@@ -184,7 +173,7 @@ public class DigitalHumanVersionService {
|
||||
|
||||
// 清除其他版本的 is_latest 标记
|
||||
if (!ossStorageService.objectExists(entity.getOssObjectKey())) {
|
||||
throw new BusinessException("数字人版本文件不存在于 OSS,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
throw new BusinessException("数字人版本文件不存在于 MinIO,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
}
|
||||
|
||||
versionMapper.update(null, new LambdaUpdateWrapper<DigitalHumanVersionEntity>()
|
||||
@@ -209,11 +198,11 @@ public class DigitalHumanVersionService {
|
||||
throw new BusinessException("最新版本不能删除");
|
||||
}
|
||||
|
||||
// 删除 OSS 文件
|
||||
// 删除 MinIO 文件
|
||||
try {
|
||||
ossStorageService.deleteObject(entity.getOssObjectKey());
|
||||
} catch (Exception e) {
|
||||
log.warn("删除 OSS 文件失败:{}", entity.getOssObjectKey(), e);
|
||||
log.warn("删除 MinIO 文件失败:{}", entity.getOssObjectKey(), e);
|
||||
}
|
||||
|
||||
// 删除数据库记录
|
||||
@@ -227,7 +216,7 @@ public class DigitalHumanVersionService {
|
||||
throw new BusinessException("版本不存在:" + version);
|
||||
}
|
||||
if (!ossStorageService.objectExists(entity.getOssObjectKey())) {
|
||||
throw new BusinessException("数字人版本文件不存在于 OSS,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
throw new BusinessException("数字人版本文件不存在于 MinIO,请重新上传该版本:" + entity.getOssObjectKey());
|
||||
}
|
||||
return ossStorageService.generateDownloadUrl(entity.getOssObjectKey());
|
||||
}
|
||||
@@ -265,11 +254,4 @@ public class DigitalHumanVersionService {
|
||||
}
|
||||
}
|
||||
|
||||
private OSS buildOssClient() {
|
||||
return new OSSClientBuilder().build(
|
||||
"https://" + ossProperties.getEndpoint(),
|
||||
ossProperties.getAccessKeyId(),
|
||||
ossProperties.getAccessKeySecret()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user