From 12b32ae33bdeb8339778d590fc85747988abcbac Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 10 Jan 2025 10:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java  | 13 +++----------
 .../serviceimpl/EdFileRelationServiceImpl.java      |  4 +---
 .../common/cons/ElectromagneticConstants.java       |  2 ++
 3 files changed, 6 insertions(+), 13 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 a22049a..e8417a4 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
@@ -72,17 +72,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     private Environment environment;
     @Resource
     private PermissionService permissionService;
-    @Resource
-    @Lazy
-    private EdFileRelationService edFileRelationService;
 
     private String downloadDataDir = "";
     private String uploadDataDir = "";
 
-    @Value("${file.security.passwd}")
-    private String password;
-
-
     @PostConstruct
     public void init() {
         String osName = System.getProperty("os.name").toLowerCase();
@@ -413,7 +406,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String mainName = FileUtil.mainName(destColibPath);
         String parentDir = FileUtil.getParent(destColibPath, 1);
         String zipDirPath = parentDir + File.separator + mainName + ".zip";
-        AES aes = SecureUtil.aes(password.getBytes());
+        AES aes = SecureUtil.aes(FILE_SEC_PASSWD.getBytes());
         try (
                 InputStream inputStream = Files.newInputStream(Paths.get(destColibPath));
                 OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath));
@@ -659,7 +652,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
 
         ZipUtil.zip(prjDirPath, exportZipFile);
-        AES aes = SecureUtil.aes(password.getBytes());
+        AES aes = SecureUtil.aes(FILE_SEC_PASSWD.getBytes());
         try (
                 InputStream inputStream = Files.newInputStream(Paths.get(exportZipFile));
                 OutputStream outputStream = Files.newOutputStream(Paths.get(exportColibFile));
@@ -749,7 +742,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 this.saveOrUpdate(newEdFileInfo);
                 String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
                 FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
-                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(password.getBytes()));
+                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
                 fileSystemService.save(FileUtil.getInputStream(fileDestPath), fileDestPath);
             }
         } catch (Exception e) {
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 7db5b84..9aa5c92 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
@@ -45,8 +45,6 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
     private CommonService commonService;
     @Resource
     private FileSystemService fileSystemService;
-    @Value("${file.security.passwd}")
-    private String password;
 
     /**
      * 创建文件关系
@@ -235,7 +233,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
                 edFileInfoService.saveOrUpdate(newEdFileInfo);
                 String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
                 FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
-                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(password.getBytes()));
+                EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
                 fileSystemService.save(FileUtil.getInputStream(fileDestPath), fileDestPath);
 
                 // 创建文件关系
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/ElectromagneticConstants.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/ElectromagneticConstants.java
index 13bca37..72df716 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/ElectromagneticConstants.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/cons/ElectromagneticConstants.java
@@ -13,4 +13,6 @@ public interface ElectromagneticConstants {
     String UPLOAD_FILE_CHUNK_SUFFIX = ".part";
 
     String NAME_VALID_MSG = "文件名不符合规范，只能包含中文字符、下划线、连字符、加号、数字和英文字符且长度小于32。";
+
+    String FILE_SEC_PASSWD = "adknfhkj87654knd";
 }