Explorar el Código

Merge branch 'dev_v3.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.2.0

xiaof hace 2 años
padre
commit
b6b6aaa4b9

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

@@ -1248,14 +1248,14 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
             jsonObject.put(SystemConstant.PATH, dirNameTmp);
             jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+            zipFile.delete();
         } else {
             jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
-            jsonObject.put(SystemConstant.PATH, zipJoiner + dirNameTmp);
+            jsonObject.put(SystemConstant.PATH, zipFile.getPath());
         }
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         tbTask.setResultFilePath(jsonObject.toJSONString());
         ConvertUtil.delFolder(zipLocalRootPath);
-        zipFile.delete();
         map.put(SystemConstant.DATA_COUNT, examTasks.size());
         return map;
     }