|
@@ -79,10 +79,10 @@ public class BoxModelServiceImpl implements IBoxModelService {
|
|
|
// if(!FileUtils.checkFileSizeIsLimit(file.getSize(), 5, "M")){
|
|
|
// throw new BusinessException(ErrorCode.FAILURE_CODE_7023, "5M");
|
|
|
// }
|
|
|
- String path = String.format(ConstantFilePath.SCENE_USER_PATH_V4, num) + "boxModel/" + sid + "/";
|
|
|
+ String path = scenePlusExt.getDataSource() + String.format(ConstantFilePath.SCENE_USER_PATH_V4, num).replace("/",File.separator) + "boxModel" + File.separator + sid + File.separator;
|
|
|
try {
|
|
|
String zipPath = path + file.getOriginalFilename();
|
|
|
- String srcPath = path + "data/";
|
|
|
+ String srcPath = path + "data" + File.separator;
|
|
|
String glbPath = path + sid + ".glb";
|
|
|
|
|
|
FileUtil.del(path);
|
|
@@ -108,15 +108,15 @@ public class BoxModelServiceImpl implements IBoxModelService {
|
|
|
}
|
|
|
|
|
|
//上传glb
|
|
|
- ossUtil.uploadFile(bucket,String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels/" + sid + ".glb", glbPath, false);
|
|
|
+ ossUtil.uploadFile(bucket,String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels" + File.separator + sid + ".glb", glbPath, false);
|
|
|
|
|
|
//上传原始obj相关文件
|
|
|
- String objPath = String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels/" + sid + "/";
|
|
|
+ String objPath = String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels" + File.separator + sid + File.separator;
|
|
|
//先删除旧的,只需要保留最新的
|
|
|
ossUtil.deleteObject(scenePlusExt.getYunFileBucket(), objPath);
|
|
|
List<File> files = FileUtil.loopFiles(srcPath);
|
|
|
files.stream().forEach(v->{
|
|
|
- String ossKey = String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels/" + sid + "/" + v.getAbsolutePath().replace(srcPath, "");
|
|
|
+ String ossKey = String.format(UploadFilePath.USER_EDIT_PATH, num) + "boxModels" + File.separator + sid + File.separator + v.getAbsolutePath().replace(srcPath, "");
|
|
|
ossUtil.uploadFile(scenePlusExt.getYunFileBucket(), ossKey, v.getAbsolutePath(), false);
|
|
|
});
|
|
|
|