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; 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 32) { @@ -52,4 +42,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); + } + } + }