This commit is contained in:
Liuyang 2025-02-26 18:09:16 +08:00
parent 1b67ab3bbf
commit 1455e932e1

View File

@ -120,15 +120,34 @@ public class AsyncDataSetService {
log.debug("正在更新数据集的 Job ID...");
datasetMapper.setJobid(datasetDO.getId(), aigcDatasetFileRespV0.getFileId());
log.info("hostUrl:{}", hostUrl);
// 更新数据集的 URL
String s3Url = aigcDatasetFileRespV0.getS3Url();
int lastIndex = s3Url.lastIndexOf("/storage");
String url = s3Url.substring(lastIndex + 1);
datasetMapper.setUrl(datasetDO.getId(), url);
log.info("s3Url:{}", s3Url);
// int lastIndex = s3Url.lastIndexOf("/storage");
// String url = s3Url.substring(lastIndex + 1);
// log.info("url:{}", url);
// 找到 "/uploads" 的位置
int uploadsIndex = s3Url.indexOf("/uploads");
if (uploadsIndex == -1) {
log.error("s3Url 中未找到 '/uploads' 路径");
return "";
}
// 提取 "/uploads" 及之后的部分
String uploadsPath = s3Url.substring(uploadsIndex);
log.info("uploadsPath: {}", uploadsPath);
// 构建新的完整 URL
String newUrl = hostUrl + uploadsPath;
log.info("newUrl: {}", newUrl);
datasetMapper.setUrl(datasetDO.getId(), newUrl);
// 返回结果
String result = url.substring(hostUrl.length());
String result = newUrl.substring(hostUrl.length());
log.info("JSON 文件生成并上传成功。返回结果: {}", result);
return result;
} else {
log.error("文件上传失败。数据集ID: {}", datasetDO.getId());
@ -140,4 +159,5 @@ public class AsyncDataSetService {
return "";
}
}
}