From c3007d0f5bd833baa62fc6120bc5eba759b1eba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E5=AE=97=E9=87=91?= <1203338439@qq.com> Date: Fri, 10 Jan 2025 13:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=87=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/core/utils/encryption/AESCBCUtil.java | 4 ++-- .../bonus/system/holiday/controller/WorkReportController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java index 7e54d76..d698094 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java @@ -38,11 +38,11 @@ public class AESCBCUtil { */ private final static String ivParameter = "1234567812345678"; - /** * AES要求密钥长度为128位或192位或256位，java默认限制AES密钥长度最多128位 */ - public static String sKey = "zhst@bonus@zhst@bonus@1234567890"; +// public static String sKey = "zhst@bonus@zhst@bonus@1234567890"; + public static String sKey = "zhst@bonus@zhst@"; /** * 编码格式 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java index 82787d6..4506e76 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java @@ -150,7 +150,7 @@ public class WorkReportController extends BaseController { WorkReportBean bean3 = new WorkReportBean(); bean3.setMonth(list.get(i).getMonth()); bean3.setOrgId(list.get(i).getOrgId()); - bean3.setType("出差报备"); + bean3.setType("出差"); List list3 = service.getDetailsList(bean3); listBusiness.addAll(list3);