From c565deb6ad9903ddc7fb09647adf4fc2cc31ef49 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期一, 27 二月 2023 17:21:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/service/data/DownloadService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index d32f903..86fe8e1 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -186,7 +186,7 @@
* 鎵撳寘鏂囦欢
*
* @param ue 鐢ㄦ埛瀹炰綋
- * @param list 婧愭暟鎹枃浠堕泦鍚�
+ * @param list 鍏冩暟鎹枃浠堕泦鍚�
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
@@ -213,7 +213,7 @@
}
/**
- * 绉婚櫎閲嶅鐨勬簮鏁版嵁鏂囦欢
+ * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
*/
private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
@@ -232,7 +232,7 @@
}
/**
- * 娣诲姞婧愭暟鎹枃浠惰嚦Zip鍖�
+ * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
*/
private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
int i = 1;
@@ -327,14 +327,14 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(3);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
de.setDcount(0);
de.setPwd(pwd);
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("婧愭暟鎹枃浠�");
+ de.setDescr("鍏冩暟鎹枃浠�");
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
@@ -343,7 +343,7 @@
}
/**
- * 鎻掑叆婧愭暟鎹�-涓嬭浇琛�
+ * 鎻掑叆鍏冩暟鎹�-涓嬭浇琛�
*/
private void insertMetaDown(UserEntity ue, List<MetaEntity> metas, DownloadEntity de) {
List<MetaDownEntity> list = new ArrayList<>();
--
Gitblit v1.9.3