From 522a155d546567d9f83dca9f815e2471c229cbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=82=85=E5=93=A5?= <184172133@qq.com> Date: Sat, 15 Jul 2023 13:28:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=92=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FieldEncryptionAndDecryptionMybatisPlugin.java | 14 +++++++++----- .../cn/bugstack/xfg/dev/tech/test/ApiTest.java | 4 ++-- .../test/domain/ISalaryAdjustApplyServiceTest.java | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java b/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java index f75a331..dfa8b67 100644 --- a/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java +++ b/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java @@ -41,22 +41,26 @@ public class FieldEncryptionAndDecryptionMybatisPlugin implements Interceptor { Object parameter = args[1]; String sqlId = mappedStatement.getId(); - if (parameter != null && (sqlId.contains("insert") || sqlId.contains("update")) ) { + if (parameter != null && (sqlId.contains("insert") || sqlId.contains("update"))) { String columnName = "employeeName"; if (parameter instanceof Map) { List parameterList = (List) ((Map) parameter).get("list"); for (Object obj : parameterList) { if (hasField(obj, columnName)) { String fieldValue = BeanUtils.getProperty(obj, columnName); - String encryptedValue = encrypt(fieldValue); - BeanUtils.setProperty(obj, columnName, encryptedValue); + if (StringUtils.isNoneBlank(fieldValue)) { + String encryptedValue = encrypt(fieldValue); + BeanUtils.setProperty(obj, columnName, encryptedValue); + } } } } else { if (hasField(parameter, columnName)) { String fieldValue = BeanUtils.getProperty(parameter, columnName); - String encryptedValue = encrypt(fieldValue); - BeanUtils.setProperty(parameter, columnName, encryptedValue); + if (StringUtils.isNoneBlank(fieldValue)) { + String encryptedValue = encrypt(fieldValue); + BeanUtils.setProperty(parameter, columnName, encryptedValue); + } } } } diff --git a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java index af23942..a9d0474 100644 --- a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java +++ b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java @@ -7,8 +7,8 @@ import java.util.Base64; public class ApiTest { - private static final String KEY = "1234567890123456"; // 密钥，必须是16位 - private static final String IV = "1234567890123456"; // 偏移量，必须是16位 + private static final String KEY = "1234567890123456"; + private static final String IV = "1234567890123456"; public static void main(String[] args) throws Exception { System.out.println("哈喽，小卡拉米，欢迎加入小傅哥的学习阵营。https://bugstack.cn/md/road-map/road-map.html"); diff --git a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java index b939be4..4edc958 100644 --- a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java +++ b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java @@ -27,7 +27,7 @@ public class ISalaryAdjustApplyServiceTest { public void test_execSalaryAdjust() { AdjustSalaryApplyOrderAggregate adjustSalaryApplyOrderAggregate = AdjustSalaryApplyOrderAggregate.builder() .employeeNumber("10000001") - .orderId("100908977676001") + .orderId("100908977676002") .employeeEntity(EmployeeEntity.builder().employeeLevel(EmployeePostVO.T3).employeeTitle(EmployeePostVO.T3).build()) .employeeSalaryAdjustEntity(EmployeeSalaryAdjustEntity.builder() .adjustTotalAmount(new BigDecimal(100)) -- GitLab