From afb74b6bb1dbb3ea0c0f4eb206d803f30c60ffc2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 十二月 2022 16:15:17 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/DownloadService.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 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 a6dd0ec..6f2f368 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -3,6 +3,7 @@
 import com.lf.server.entity.ctrl.DownloadReqEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.show.PipelineEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.*;
 import com.lf.server.mapper.data.DownloadMapper;
@@ -117,15 +118,15 @@
     }
 
     /**
-     * 鏍¢獙瀵嗙爜鏈夋晥鎬�
+     * 瑙e瘑
      *
      * @param reqEntity 璇锋眰涓嬭浇瀹炰綋绫�
-     * @return 鏄�/鍚︽湁鏁�
+     * @return 鏄�/鍚﹁В瀵嗘垚鍔�
      */
-    public boolean validatePwd(DownloadReqEntity reqEntity) {
+    public static boolean decryptPwd(DownloadReqEntity reqEntity) {
         try {
             String pwd = RsaHelper.decrypt(reqEntity.getPwd());
-            if (StringHelper.isEmpty(pwd) || !StringHelper.checkPwdValid(pwd)) {
+            if (StringHelper.isEmpty(pwd)) {
                 return false;
             }
 
@@ -141,10 +142,32 @@
     /**
      * 瑙e瘑
      *
+     * @param pe 绠¢亾鍒嗘瀽瀹炰綋绫�
+     * @return 鏄�/鍚﹁В瀵嗘垚鍔�
+     */
+    public static boolean decryptPwd(PipelineEntity pe) {
+        try {
+            String pwd = RsaHelper.decrypt(pe.getPwd());
+            if (StringHelper.isEmpty(pwd)) {
+                return false;
+            }
+
+            pe.setPwd(pwd);
+
+            return true;
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return false;
+        }
+    }
+
+    /**
+     * 瑙e瘑
+     *
      * @param pwd 鍔犲瘑瀵嗙爜
      * @return 鍘熷瀵嗙爜
      */
-    public String decryptPwd(String pwd) {
+    public static String decryptPwd(String pwd) {
         try {
             return RsaHelper.decrypt(pwd);
         } catch (Exception ex) {
@@ -203,6 +226,8 @@
      */
     private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaFileEntity> list) {
         String uploadPath = pathHelper.getConfig().getUploadPath();
+
+        int i = 1;
         for (MetaFileEntity entity : list) {
             try {
                 File file = new File(uploadPath + File.separator + entity.getPath());
@@ -210,7 +235,7 @@
 
                 FileHeader header = zip.getFileHeader(entity.getGuid());
                 if (null != header) {
-                    zip.renameFile(header, entity.getName());
+                    zip.renameFile(header, i++ + "_" + entity.getName());
                 }
             } catch (Exception ex) {
                 log.error(ex.getMessage(), ex);

--
Gitblit v1.9.3