|
@@ -615,6 +615,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
mqMsg.setBuildType(buildType);
|
|
mqMsg.setBuildType(buildType);
|
|
mqMsg.setPath(dataSource);
|
|
mqMsg.setPath(dataSource);
|
|
mqMsg.setCreateTime(DateUtil.format(Calendar.getInstance().getTime(), DateExtUtil.dateStyle));
|
|
mqMsg.setCreateTime(DateUtil.format(Calendar.getInstance().getTime(), DateExtUtil.dateStyle));
|
|
|
|
+ mqMsg.setExt(new HashMap<>());
|
|
return mqMsg;
|
|
return mqMsg;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -876,7 +877,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
// 读取本地文件并校验文件
|
|
// 读取本地文件并校验文件
|
|
// 读取config.json
|
|
// 读取config.json
|
|
String configJsonPath = finalFilePath.concat(File.separator).concat(zipName).concat(File.separator).concat("config.json");
|
|
String configJsonPath = finalFilePath.concat(File.separator).concat(zipName).concat(File.separator).concat("config.json");
|
|
- if(FileUtil.exist(configJsonPath)){
|
|
|
|
|
|
+ log.info("config.json路径:{}", configJsonPath);
|
|
|
|
+ if(!FileUtil.exist(configJsonPath)){
|
|
throw new RuntimeException("config.json 文件有误!");
|
|
throw new RuntimeException("config.json 文件有误!");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -900,7 +902,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
scenePreService.updateById(scenePre);
|
|
scenePreService.updateById(scenePre);
|
|
log.info("异步开始上传文件");
|
|
log.info("异步开始上传文件");
|
|
// 上传oaas
|
|
// 上传oaas
|
|
- fYunFileService.uploadFileByCommand(finalFilePath.concat(folderName), ConstantFilePath.OSS_PREFIX.concat(subFolder));
|
|
|
|
|
|
+ fYunFileService.uploadFileByCommand(finalFilePath.concat(File.separator).concat(zipName), ConstantFilePath.OSS_PREFIX.concat(subFolder));
|
|
|
|
|
|
scenePre.setOssPath(ConstantFilePath.OSS_PREFIX.concat(subFolder));
|
|
scenePre.setOssPath(ConstantFilePath.OSS_PREFIX.concat(subFolder));
|
|
|
|
|