|
@@ -848,10 +848,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
sourceFiles.add(fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), stringJoinerPdf.toString(), uploadFileEnum.getFssType()));
|
|
|
}
|
|
|
FileUtil.doZip(zipFile, sourceFiles);
|
|
|
-// ossUtil.ossUpload(dirName.toString(), zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))));
|
|
|
- fileStoreUtil.ossUpload(dirName.toString(), zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirName.toString()).getFssType());
|
|
|
+ String ossDirName = dirName.toString().replaceAll("\\\\", "/");
|
|
|
+ fileStoreUtil.ossUpload(ossDirName, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(ossDirName).getFssType());
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put(SystemConstant.PATH, dirName.toString());
|
|
|
+ jsonObject.put(SystemConstant.PATH, ossDirName);
|
|
|
jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
|
jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
|
|
|
tbTask.setResultFilePath(jsonObject.toJSONString());
|