From 34c39b66484bc2db8ee79af1c8338315c5ae2e99 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 6 Aug 2025 16:54:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AE=89=E5=85=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=A7=BB=E5=8A=A8=E5=88=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/backup/serviceimp/FileServiceImpl.java | 10 +++++++--- .../src/main/resources/application.yml | 6 +++++- .../software/manage/config/ElePropertyConfig.java | 5 +++++ .../manage/service/serviceimpl/CommonService.java | 4 ++-- .../service/serviceimpl/EdFileInfoServiceImpl.java | 6 +++--- .../service/serviceimpl/ImportPrjServiceImpl.java | 4 ++-- .../src/main/resources/application.properties | 4 +++- .../software/common/cons/ElectromagneticConstants.java | 2 -- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java index 296fcff..7b9d032 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java @@ -7,6 +7,8 @@ import com.electromagnetic.industry.software.backup.pojo.BackupPro; import com.electromagnetic.industry.software.backup.service.FileService; import com.electromagnetic.industry.software.common.util.EleCommonUtil; import jakarta.annotation.Resource; +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; import org.springframework.http.MediaType; @@ -17,14 +19,16 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; -import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.FILE_SEC_PASSWD; - @Service public class FileServiceImpl implements FileService { @Resource private BackupPro backupPro; + @Getter + @Value("${file.enc.passwd}") + private String fileEncPasswd; + @Override public void upload(MultipartFile file) throws IOException { String name = FileUtil.mainName(file.getOriginalFilename()); @@ -60,7 +64,7 @@ public class FileServiceImpl implements FileService { int index = destPath.lastIndexOf("."); String zipPath = destPath.substring(0, index) + ".zip"; ZipUtil.zip(destPath, zipPath); - EleCommonUtil.encryptFile(zipPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes())); + EleCommonUtil.encryptFile(zipPath, SecureUtil.aes(fileEncPasswd.getBytes())); FileUtil.del(destPath); } diff --git a/electrmangnetic-backup/src/main/resources/application.yml b/electrmangnetic-backup/src/main/resources/application.yml index 1d82678..3a2744b 100644 --- a/electrmangnetic-backup/src/main/resources/application.yml +++ b/electrmangnetic-backup/src/main/resources/application.yml @@ -11,4 +11,8 @@ spring: max-request-size: 500MB server: - port: 12491 \ No newline at end of file + port: 12491 + +file: + enc: + passwd: adknfhkj87654knd \ No newline at end of file diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/ElePropertyConfig.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/ElePropertyConfig.java index d109ae7..4b0cb38 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/ElePropertyConfig.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/ElePropertyConfig.java @@ -92,6 +92,10 @@ public class ElePropertyConfig { @Value("${ai.file.upload.store.dir}") private String aiFileUploadStoreDir; + @Getter + @Value("${file.enc.passwd}") + private String fileEncPasswd; + public String getAiFileUploadStoreDir() { if (EleCommonUtil.isWinOs()) { return FileUtil.normalize(winPrefix + File.separator + aiFileUploadStoreDir); @@ -213,4 +217,5 @@ public class ElePropertyConfig { } + } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 1c85de8..642a274 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -663,7 +663,7 @@ public class CommonService { edFileInfoMapper.insertOrUpdate(newEdFileInfo); String fileDestPath = getFileSysPath(newEdFileInfo.getId()); FileUtil.writeFromStream(file.getInputStream(), fileDestPath); - EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes())); + EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(elePropertyConfig.getFileEncPasswd().getBytes())); finalEdFileInfo = newEdFileInfo; newEdFileInfo.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code); edFileInfoMapper.insertOrUpdate(newEdFileInfo); @@ -765,7 +765,7 @@ public class CommonService { edFileInfoMapper.insert(newEdFileInfo); String fileDestPath = getFileSysPath(newEdFileInfo.getId()); fileSystemService.save(file.getInputStream(), fileDestPath); - EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes())); + EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(elePropertyConfig.getFileEncPasswd().getBytes())); newEdFileInfo.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code); edFileInfoMapper.insertOrUpdate(newEdFileInfo); return newEdFileInfo; 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 f4e7666..85e733d 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 @@ -482,7 +482,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl e.getParentId().equals(PRJ_PARENT_ID)).findFirst().get().getId(); String prjPath = elePropertyConfig.getImportPrjPath() + File.separator + prjId; FileUtil.writeFromStream(file.getInputStream(), prjPath); - EleCommonUtil.encryptFile(prjPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes())); + EleCommonUtil.encryptFile(prjPath, SecureUtil.aes(elePropertyConfig.getFileEncPasswd().getBytes())); UserThreadLocal.setSuccessInfo("", prjId, "导入本地工程成功"); } catch (Exception e) { throw new BizException("导入工程失败，原因 " + e.getMessage(), e); diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties index 23b4cb9..8cbf02e 100644 --- a/electrmangnetic/src/main/resources/application.properties +++ b/electrmangnetic/src/main/resources/application.properties @@ -61,4 +61,6 @@ tmp.file.store.hour=48 backup.remote.host=127.0.0.1 backup.remote.port=1111 backup.mysql.path=/workspace/mysqlbak/test -backup.mysql.script.path=/workspace/mysqlbak/back_dev.sh \ No newline at end of file +backup.mysql.script.path=/workspace/mysqlbak/back_dev.sh + +file.enc.passwd=123456 \ No newline at end of file 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 3cffab6..bdc6657 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 @@ -14,8 +14,6 @@ public interface ElectromagneticConstants { String NAME_VALID_MSG = "不符合规范，只能包含中文字符、下划线、连字符、加号、数字和英文字符且长度小于32。"; - String FILE_SEC_PASSWD = "adknfhkj87654knd"; - String ED_FILE_FAVORITE = "ed_file_favorite"; String ED_FILE_RELATION = "ed_file_relation";