|
@@ -92,6 +92,7 @@ public class InnerApiServiceImpl implements IInnerApiService {
|
|
|
redisLockUtil.unlockLua(RedisLockKey.LOCK_GET_MATTERPRO_NUM);
|
|
|
|
|
|
String dataSource = ConstantFilePath.BUILD_MODEL_PATH + UUID.randomUUID() + File.separator;
|
|
|
+ log.info("datasource:{}", dataSource);
|
|
|
JSONObject result = new JSONObject();
|
|
|
result.put("num", sceneNum);
|
|
|
result.put("dataSource", dataSource);
|
|
@@ -102,7 +103,8 @@ public class InnerApiServiceImpl implements IInnerApiService {
|
|
|
String fileName = null;
|
|
|
if(StrUtil.isNotEmpty(packagePath)){
|
|
|
fileName = packagePath.substring(packagePath.lastIndexOf("/"));
|
|
|
- fYunFileService.downloadFile(packagePath, dataSource.concat(fileName));
|
|
|
+ fYunFileService.downloadFileByCommand(dataSource.concat(fileName), packagePath);
|
|
|
+// fYunFileService.downloadFile(packagePath, dataSource.concat(fileName));
|
|
|
}else{
|
|
|
fileName = file.getOriginalFilename();
|
|
|
File data = new File(dataSource + fileName);
|