|
@@ -78,6 +78,9 @@ public class RunBuild {
|
|
@Value("${max.obj.url}")
|
|
@Value("${max.obj.url}")
|
|
private String maxObjUrl;
|
|
private String maxObjUrl;
|
|
|
|
|
|
|
|
+ @Value("${driveLetter}")
|
|
|
|
+ private String driveLetter;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private RedisUtil redisUtil;
|
|
private RedisUtil redisUtil;
|
|
|
|
|
|
@@ -981,20 +984,20 @@ public class RunBuild {
|
|
String keyPath = "domain/eHome/furniture/InitialData/" + modelType + "/" + filesId + "/";
|
|
String keyPath = "domain/eHome/furniture/InitialData/" + modelType + "/" + filesId + "/";
|
|
|
|
|
|
if (StrUtil.isNotEmpty(component.getString("template"))) {
|
|
if (StrUtil.isNotEmpty(component.getString("template"))) {
|
|
- objFileRealPath = component.getString("template").replaceAll("Z:/OneKeyDecorate/", buildPath);
|
|
|
|
|
|
+ objFileRealPath = component.getString("template").replaceAll(driveLetter + "/OneKeyDecorate/", buildPath);
|
|
}
|
|
}
|
|
|
|
|
|
if (StrUtil.isNotEmpty(component.getString("templateMtl"))) {
|
|
if (StrUtil.isNotEmpty(component.getString("templateMtl"))) {
|
|
- mtlPathFileRealPath = component.getString("templateMtl").replaceAll("Z:/OneKeyDecorate/", buildPath);
|
|
|
|
|
|
+ mtlPathFileRealPath = component.getString("templateMtl").replaceAll(driveLetter + "/OneKeyDecorate/", buildPath);
|
|
}
|
|
}
|
|
|
|
|
|
if (StrUtil.isNotEmpty(component.getString("datasmith"))) {
|
|
if (StrUtil.isNotEmpty(component.getString("datasmith"))) {
|
|
- udatasmitFileRealPath = component.getString("datasmith").replaceAll("Z:/OneKeyDecorate/", buildPath);
|
|
|
|
|
|
+ udatasmitFileRealPath = component.getString("datasmith").replaceAll(driveLetter + "/OneKeyDecorate/", buildPath);
|
|
}
|
|
}
|
|
|
|
|
|
if (StrUtil.isNotEmpty(component.getString("smithAssetPath"))) {
|
|
if (StrUtil.isNotEmpty(component.getString("smithAssetPath"))) {
|
|
//贴图和udsmesh都在这个目录,直接批量传
|
|
//贴图和udsmesh都在这个目录,直接批量传
|
|
- udsmeshFileRealPath = component.getString("smithAssetPath").replaceAll("Z:/OneKeyDecorate/", buildPath);
|
|
|
|
|
|
+ udsmeshFileRealPath = component.getString("smithAssetPath").replaceAll(driveLetter + "/OneKeyDecorate/", buildPath);
|
|
//获取目录所有文件然后上传
|
|
//获取目录所有文件然后上传
|
|
List<File> udsmeshfiles = FileUtil.loopFiles(udsmeshFileRealPath);
|
|
List<File> udsmeshfiles = FileUtil.loopFiles(udsmeshFileRealPath);
|
|
for (File file : udsmeshfiles) {
|
|
for (File file : udsmeshfiles) {
|