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);