From e5c0ddee5960c62dc5422d0f88eb6c5613662686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 12 Apr 2023 22:15:58 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=8A=A0?= =?UTF-8?q?=E8=A7=A3=E5=AF=86=E6=A8=A1=E5=9D=97=20=E5=B0=86null=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=B8=8B=E6=8E=A8=E9=98=B2=E6=AD=A2=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E7=9A=84null=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/MybatisDecryptInterceptor.java | 16 +++++++--------- .../interceptor/MybatisEncryptInterceptor.java | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java index a3de1341..374a8dde 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,6 +1,6 @@ package com.ruoyi.common.encrypt.interceptor; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.encrypt.annotation.EncryptField; @@ -62,12 +62,12 @@ public class MybatisDecryptInterceptor implements Interceptor { } if (sourceObject instanceof List) { List sourceList = (List) sourceObject; - if(CollectionUtil.isEmpty(sourceList)) { + if(CollUtil.isEmpty(sourceList)) { return; } // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 Object firstItem = sourceList.get(0); - if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { + if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } ((List) sourceObject).forEach(this::decryptHandler); @@ -76,12 +76,7 @@ public class MybatisDecryptInterceptor implements Interceptor { Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); try { for (Field field : fields) { - // 防止对象不是null 属性内容是null - Object obj = field.get(sourceObject); - if (ObjectUtil.isNull(obj)) { - continue; - } - field.set(sourceObject, this.decryptField(String.valueOf(field.get(obj)), field)); + field.set(sourceObject, this.decryptField(String.valueOf(field.get(sourceObject)), field)); } } catch (Exception e) { log.error("处理解密字段时出错", e); @@ -96,6 +91,9 @@ public class MybatisDecryptInterceptor implements Interceptor { * @return 加密后结果 */ private String decryptField(String value, Field field) { + if (ObjectUtil.isNull(value)) { + return null; + } EncryptField encryptField = field.getAnnotation(EncryptField.class); EncryptContext encryptContext = new EncryptContext(); encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm()); diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java index f11ffe3c..0863696e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,6 +1,6 @@ package com.ruoyi.common.encrypt.interceptor; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.encrypt.annotation.EncryptField; @@ -72,12 +72,12 @@ public class MybatisEncryptInterceptor implements Interceptor { } if (sourceObject instanceof List) { List sourceList = (List) sourceObject; - if(CollectionUtil.isEmpty(sourceList)) { + if(CollUtil.isEmpty(sourceList)) { return; } // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 Object firstItem = sourceList.get(0); - if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { + if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } ((List) sourceObject).forEach(this::encryptHandler); @@ -86,12 +86,7 @@ public class MybatisEncryptInterceptor implements Interceptor { Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); try { for (Field field : fields) { - // 防止对象不是null 属性内容是null - Object obj = field.get(sourceObject); - if (ObjectUtil.isNull(obj)) { - continue; - } - field.set(sourceObject, this.encryptField(String.valueOf(field.get(obj)), field)); + field.set(sourceObject, this.encryptField(String.valueOf(field.get(sourceObject)), field)); } } catch (Exception e) { log.error("处理加密字段时出错", e); @@ -106,6 +101,9 @@ public class MybatisEncryptInterceptor implements Interceptor { * @return 加密后结果 */ private String encryptField(String value, Field field) { + if (ObjectUtil.isNull(value)) { + return null; + } EncryptField encryptField = field.getAnnotation(EncryptField.class); EncryptContext encryptContext = new EncryptContext(); encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm());