From 02ac23df57c079b671c3aa18fc4bf3f1f44bcd28 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 9 Jan 2025 14:46:02 +0800
Subject: [PATCH 1/3] clean code

---
 .../industry/software/manage/aop/ServiceAspect.java            | 2 +-
 .../software/manage/controller/EdFileRelationController.java   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java
index 6a18aa9..679a221 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java
@@ -51,7 +51,7 @@ public class ServiceAspect {
                     }
                     paramInfo = JSONUtil.toJsonStr(list);
                 } catch (Exception e) {
-                    log.warn("切面异常", e.getMessage());
+                    log.warn("切面异常--->{}", e.getMessage());
                 }
             }
         }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
index 61fc52a..29f3e90 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
@@ -1,6 +1,5 @@
 package com.electromagnetic.industry.software.manage.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
@@ -8,9 +7,7 @@ import com.electromagnetic.industry.software.common.util.ElectromagneticResultUt
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
 import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
 import com.electromagnetic.industry.software.manage.pojo.req.UpdateRelationDTO;
-import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
 import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

From 85cafb7257c2565872a29954250002e41f428d27 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 9 Jan 2025 15:34:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=AF=86=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/EdFileInfoServiceImpl.java    |  4 ++-
 .../EdFileRelationServiceImpl.java            |  8 +++++-
 .../software/common/util/EleCommonUtil.java   | 27 +++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 1aa85f1..af6a741 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -744,7 +744,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                         .setPrjDir(false);
                 this.saveOrUpdate(newEdFileInfo);
                 String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
-                fileSystemService.save(file.getInputStream(), fileDestPath);
+                FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
+                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(password.getBytes()));
+                fileSystemService.save(FileUtil.getInputStream(fileDestPath), fileDestPath);
             }
         } catch (Exception e) {
             newEdFileInfo.setParentId(parentId)
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
index 674aaf7..7db5b84 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
@@ -2,6 +2,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,6 +23,7 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileSimpleInfoVO;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
 import com.electromagnetic.industry.software.manage.service.FileSystemService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -43,6 +45,8 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
     private CommonService commonService;
     @Resource
     private FileSystemService fileSystemService;
+    @Value("${file.security.passwd}")
+    private String password;
 
     /**
      * 创建文件关系
@@ -230,7 +234,9 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
                         .setPrjDir(false);
                 edFileInfoService.saveOrUpdate(newEdFileInfo);
                 String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
-                fileSystemService.save(file.getInputStream(), fileDestPath);
+                FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
+                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(password.getBytes()));
+                fileSystemService.save(FileUtil.getInputStream(fileDestPath), fileDestPath);
 
                 // 创建文件关系
                 EdFileRelation relation = new EdFileRelation();
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
index d8ec8f8..7a12dd4 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
@@ -1,7 +1,15 @@
 package com.electromagnetic.industry.software.common.util;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.symmetric.AES;
+import com.electromagnetic.industry.software.common.exception.BizException;
 
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.regex.Pattern;
@@ -16,6 +24,8 @@ public final class EleCommonUtil {
     // 编译正则表达式
     private static final Pattern pattern = Pattern.compile(PATTERN);
 
+    private static EleLog log = new EleLog(EleCommonUtil.class);
+
     public static String getFileName(String fileFullName) {
         if (fileFullName == null) {
             return "";
@@ -52,4 +62,21 @@ public final class EleCommonUtil {
         return now.format(formatter);
     }
 
+    public static void encryptFile(String filePath, AES aes) {
+        String tmpPath = filePath + ".tmp";
+        try (
+                InputStream inputStream = Files.newInputStream(Paths.get(filePath));
+                OutputStream outputStream = Files.newOutputStream(Paths.get(tmpPath));
+        ) {
+            aes.encrypt(inputStream, outputStream, true);
+        } catch (Exception e) {
+            String info = "文件加密失败";
+            log.error(info, e);
+            throw new BizException(-1, info);
+        } finally {
+            FileUtil.del(filePath);
+            FileUtil.move(new File(tmpPath), new File(filePath), true);
+        }
+    }
+
 }

From e0d3fc23ed0ea597eea69b7d1067d4113f4f6408 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 9 Jan 2025 16:12:59 +0800
Subject: [PATCH 3/3] clean code

---
 .../software/common/util/EleCommonUtil.java   | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
index 7a12dd4..aaa4f96 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
@@ -26,26 +26,6 @@ public final class EleCommonUtil {
 
     private static EleLog log = new EleLog(EleCommonUtil.class);
 
-    public static String getFileName(String fileFullName) {
-        if (fileFullName == null) {
-            return "";
-        }
-        if (!fileFullName.contains(".")) {
-            return fileFullName;
-        }
-
-        int index = fileFullName.lastIndexOf(".");
-        return fileFullName.substring(0, index);
-    }
-
-    public static String getFileType(String fileFullName) {
-        if (fileFullName == null || !fileFullName.contains(".")) {
-            return "";
-        }
-        int index = fileFullName.lastIndexOf(".");
-        return fileFullName.substring(index + 1);
-    }
-
     public static boolean isFileNameValid(String fileFullName) {
         if (StrUtil.isEmpty(fileFullName) || fileFullName.length() > 32) {
             return false;