From 3026833d2bc0772aa1aafc134cefd6965acfa6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= Date: Wed, 12 Oct 2022 11:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E8=AE=BE=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/encrypt/AESEncryptUtil.java | 3 +++ .../sys/service/impl/SalarySysConfServiceImpl.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java index db1122888..456b822e5 100644 --- a/src/com/engine/salary/encrypt/AESEncryptUtil.java +++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java @@ -76,9 +76,12 @@ public class AESEncryptUtil { * @return 解密字符串 */ public static String closeEncryptSetting(String encryptStr) { + SalarySysConfPO sysConfPo = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT); if (StringUtils.isNotBlank(encryptStr) && encryptStr.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) { encryptStr = encryptStr.substring(4, encryptStr.length()); return AES.decrypt(encryptStr, aesEncryptScrect); + } else if (ObjectUtils.isEmpty(sysConfPo)) { + return AES.decrypt(encryptStr, aesEncryptScrect); } return encryptStr; } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 3d1f06b1b..d72272729 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -314,9 +314,15 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe Util_DataCache.setObjVal(AES_ENCRYPT_IN_PROGRESS, 1); String isOpenEncrypt = param.getIsOpenEncrypt(); if (StringUtils.isNotEmpty(isOpenEncrypt)) { - saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app"); - //对数据库数据加解密 - flag = encryptOrDecryptDbWithAsync(isOpenEncrypt); + if (isOpenEncrypt.equals(OpenEnum.OPEN.getValue())) { + saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app"); + //对数据库数据加解密 + flag = encryptOrDecryptDbWithAsync(isOpenEncrypt); + }else if (isOpenEncrypt.equals(OpenEnum.OFF.getValue())){ + flag = encryptOrDecryptDbWithAsync(isOpenEncrypt); + //不要调换方法的位置 + saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app"); + } } Util_DataCache.clearVal(AES_ENCRYPT_IN_PROGRESS); resultMap.put("isSuccess", flag);