diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java index 952a440b6..1eca9db24 100644 --- a/src/com/engine/salary/encrypt/AESEncryptUtil.java +++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java @@ -4,7 +4,6 @@ import com.engine.salary.sys.constant.SalarySysConstant; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import weaver.general.AES; import weaver.general.BaseBean; @@ -42,7 +41,7 @@ public class AESEncryptUtil { */ private static String getSalarySysConfigValue() { SalarySysConfPO sysConfPO = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT); - if (ObjectUtils.isEmpty(sysConfPO)) { + if (sysConfPO == null) { return "1"; } return sysConfPO.getConfValue(); @@ -63,7 +62,7 @@ public class AESEncryptUtil { } //第一版没有加AES_前缀为加密标识,所以初始解密时,需要根据是否有配置判断是否需要解密 //未配置加密设置时,需要解密 - if (ObjectUtils.isEmpty(sysConfPo)) { + if (sysConfPo == null) { return AES.decrypt(encryptStr, aesEncryptScrect); } } @@ -81,7 +80,7 @@ public class AESEncryptUtil { 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) && StringUtils.isNotBlank(encryptStr)) { + } else if (sysConfPo == null && StringUtils.isNotBlank(encryptStr)) { 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 f43be5754..9dbec31e9 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -51,7 +51,6 @@ import com.weaver.util.threadPool.entity.LocalRunnable; import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -335,13 +334,13 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe String progressId = UUID.randomUUID().toString(); resultMap.put("progressId", progressId); SalarySysConfPO sysConfPo = getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT); - if (ObjectUtils.isNotEmpty(sysConfPo) && sysConfPo.getConfValue().equals(param.getIsOpenEncrypt())) { + if (sysConfPo != null && sysConfPo.getConfValue().equals(param.getIsOpenEncrypt())) { return resultMap; - } else if (ObjectUtils.isEmpty(sysConfPo) && OpenEnum.OPEN.getValue().equals(param.getIsOpenEncrypt())) { + } else if (sysConfPo == null && OpenEnum.OPEN.getValue().equals(param.getIsOpenEncrypt())) { return resultMap; } try { - if (ObjectUtils.isNotEmpty(Util_DataCache.getObjVal(AES_ENCRYPT_IN_PROGRESS))) { + if (Util_DataCache.getObjVal(AES_ENCRYPT_IN_PROGRESS) != null) { resultMap.put("msg", "数据库处理上次操作中,请稍后操作。"); return resultMap; }