|
@@ -1,7 +1,6 @@
|
|
package com.qmth.distributed.print.business.templete.service.impl;
|
|
package com.qmth.distributed.print.business.templete.service.impl;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
-import cn.hutool.core.util.ZipUtil;
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.aliyun.oss.common.utils.BinaryUtil;
|
|
import com.aliyun.oss.common.utils.BinaryUtil;
|
|
@@ -36,7 +35,6 @@ import com.qmth.teachcloud.common.service.*;
|
|
import com.qmth.teachcloud.common.util.*;
|
|
import com.qmth.teachcloud.common.util.*;
|
|
import com.qmth.teachcloud.common.util.excel.ExcelError;
|
|
import com.qmth.teachcloud.common.util.excel.ExcelError;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
-import org.apache.commons.io.FileUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
@@ -658,7 +656,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
jsonObject.put(SystemConstant.PATH, dirName);
|
|
jsonObject.put(SystemConstant.PATH, dirName);
|
|
} else {
|
|
} else {
|
|
- fileStoreUtil.copyInputStreamToFile(in,new File(stringJoiner.toString()),DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())),LocalCatalogEnum.LOCAL_FILE);
|
|
|
|
|
|
+ fileStoreUtil.copyInputStreamToFile(in, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), LocalCatalogEnum.LOCAL_FILE);
|
|
jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
|
|
jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
|
|
jsonObject.put(SystemConstant.PATH, dirName);
|
|
jsonObject.put(SystemConstant.PATH, dirName);
|
|
}
|
|
}
|
|
@@ -1105,7 +1103,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
count++;
|
|
count++;
|
|
}
|
|
}
|
|
zipLocalRootPath = zipLocalRootPath.replaceAll("\\\\", "/");
|
|
zipLocalRootPath = zipLocalRootPath.replaceAll("\\\\", "/");
|
|
- ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
|
|
|
|
|
|
+ Zip4jUtil.zipEncryptFile(zipFile.getPath(), zipLocalRootPath, SystemConstant.ZIP_ENCRYPT_PWD);
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
if (oss) {//上传至oss
|
|
if (oss) {//上传至oss
|
|
fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
|
|
fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
|
|
@@ -1212,14 +1210,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
}
|
|
}
|
|
|
|
|
|
File zipFile = new File(zipJoiner.toString() + dirNameTmp);
|
|
File zipFile = new File(zipJoiner.toString() + dirNameTmp);
|
|
- if (!zipFile.getParentFile().exists()) {
|
|
|
|
- zipFile.getParentFile().mkdirs();
|
|
|
|
- }
|
|
|
|
- if (!zipFile.exists()) {
|
|
|
|
- zipFile.createNewFile();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
|
|
|
|
|
|
+ Zip4jUtil.zipEncryptFile(zipFile.getPath(), zipLocalRootPath, SystemConstant.ZIP_ENCRYPT_PWD);
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
if (oss) {//上传至oss
|
|
if (oss) {//上传至oss
|
|
fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
|
|
fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
|
|
@@ -1626,10 +1617,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
.add(String.format("%02d", nowTime.getDayOfMonth()))
|
|
.add(String.format("%02d", nowTime.getDayOfMonth()))
|
|
.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.ZIP_PREFIX);
|
|
.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.ZIP_PREFIX);
|
|
zipFile = new File(stringJoiner.toString() + dirZipName.toString());
|
|
zipFile = new File(stringJoiner.toString() + dirZipName.toString());
|
|
- if (!zipFile.exists()) {
|
|
|
|
- zipFile.getParentFile().mkdirs();
|
|
|
|
- zipFile.createNewFile();
|
|
|
|
- }
|
|
|
|
sourceFiles = new LinkedList<>();
|
|
sourceFiles = new LinkedList<>();
|
|
List<TSyncExamStudentScore> updateTSyncExamStudentScoreList = new ArrayList<>();
|
|
List<TSyncExamStudentScore> updateTSyncExamStudentScoreList = new ArrayList<>();
|
|
errorTSyncExamStudentScoreList = new ArrayList<>();
|
|
errorTSyncExamStudentScoreList = new ArrayList<>();
|
|
@@ -1659,7 +1646,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
}
|
|
}
|
|
tSyncExamStudentScoreService.saveOrUpdateBatch(updateTSyncExamStudentScoreList);
|
|
tSyncExamStudentScoreService.saveOrUpdateBatch(updateTSyncExamStudentScoreList);
|
|
if (Objects.nonNull(sourceFiles) && sourceFiles.size() > 0) {
|
|
if (Objects.nonNull(sourceFiles) && sourceFiles.size() > 0) {
|
|
- ZipUtil.zip(zipFile, false, sourceFiles.toArray(new File[sourceFiles.size()]));
|
|
|
|
|
|
+ Zip4jUtil.zipEncryptFile(zipFile.getPath(), sourceFiles, SystemConstant.ZIP_ENCRYPT_PWD);
|
|
boolean oss = (boolean) map.get(SystemConstant.OSS);
|
|
boolean oss = (boolean) map.get(SystemConstant.OSS);
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
if (oss) {//上传至oss
|
|
if (oss) {//上传至oss
|
|
@@ -1927,7 +1914,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
}
|
|
}
|
|
count = count + courseCount;
|
|
count = count + courseCount;
|
|
}
|
|
}
|
|
- ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
|
|
|
|
|
|
+ Zip4jUtil.zipEncryptFile(zipFile.getPath(), zipLocalRootPath, SystemConstant.ZIP_ENCRYPT_PWD);
|
|
|
|
|
|
boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
@@ -1942,7 +1929,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
|
|
jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
|
|
tbTask.setResultFilePath(jsonObject.toJSONString());
|
|
tbTask.setResultFilePath(jsonObject.toJSONString());
|
|
ConvertUtil.delFolder(zipLocalRootPath);
|
|
ConvertUtil.delFolder(zipLocalRootPath);
|
|
- if(oss) {
|
|
|
|
|
|
+ if (oss) {
|
|
zipFile.delete();
|
|
zipFile.delete();
|
|
}
|
|
}
|
|
map.put("count", count);
|
|
map.put("count", count);
|