From e952518d714b42c96d62596413b277451468d113 Mon Sep 17 00:00:00 2001 From: MuShan Date: Sat, 10 May 2025 22:14:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20shiro=20=E5=88=B0?= =?UTF-8?q?=202.0.4=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot/jeecg-boot-base-core/pom.xml | 1 + .../java/org/jeecg/common/util/encryption/AesEncryptUtil.java | 2 +- jeecg-boot/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base-core/pom.xml index 2c41434bd..1eebc8e0a 100644 --- a/jeecg-boot/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot/jeecg-boot-base-core/pom.xml @@ -196,6 +196,7 @@ org.apache.shiro shiro-spring-boot-starter + jakarta ${shiro.version} diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java index 670f3ebd6..6a4db4215 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java @@ -1,6 +1,6 @@ package org.jeecg.common.util.encryption; -import org.apache.shiro.codec.Base64; +import org.apache.shiro.lang.codec.Base64; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index 60806d090..ac2e44784 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -65,7 +65,7 @@ 2.1.0 3.17.3 - 1.12.0 + 2.0.4 3.11.0 3.2.2 1.4.9