Просмотр исходного кода

v2.2.2bug修改-印刷任务批量下载bug修复

xiaof 3 лет назад
Родитель
Сommit
eed5ca2bff

+ 3 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -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());