From d43fe8e4c939edf7810681aad17fa1deeef1b0b6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 11:24:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/MetaService.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index 9d75b00..d8d2477 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -299,6 +299,11 @@
/**
* 璇锋眰鍏冩暟鎹笅杞�
+ *
+ * @param ue 鐢ㄦ埛瀹炰綋
+ * @param dr 璇锋眰涓嬭浇瀹炰綋
+ * @return 涓嬭浇鏂囦欢GUID
+ * @throws Exception 寮傚父
*/
public String downloadMeteReq(UserEntity ue, DownloadReqEntity dr) throws Exception {
List<MetaEntity> list = selectMetaFiles(dr.getIds());
@@ -306,18 +311,6 @@
return null;
}
- return zipFiles(ue, list, dr.getPwd());
- }
-
- /**
- * 鎵撳寘鏂囦欢
- *
- * @param ue 鐢ㄦ埛瀹炰綋
- * @param list 鍏冩暟鎹枃浠堕泦鍚�
- * @param pwd 瀵嗙爜
- * @return 涓嬭浇鏂囦欢GUID
- */
- public String zipFiles(UserEntity ue, List<MetaEntity> list, String pwd) throws Exception {
Map<String, List<String>> tabs = getTabs(list);
rmRepeatMetas(list);
@@ -338,7 +331,7 @@
}
String zipFile = pathHelper.getDownloadFullPath() + File.separator + tempName + ".zip";
- ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
+ ZipFile zip = Zip4jHelper.createZipFile(zipFile, dr.getPwd());
ZipParameters params = Zip4jHelper.getZipParams(true);
addMetaFiles(zip, params, list);
if (dataMap.size() > 0) {
@@ -346,7 +339,7 @@
addAnnex(zip, params, annexMap);
}
- String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
+ String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
int rows = downloadService.insert(de);
if (de.getId() > 0) {
--
Gitblit v1.9.3