From 46e3e62b59cd861359c1c6a9a64f2182ceb7b1c4 Mon Sep 17 00:00:00 2001
From: chenrui <chenrui@uctiems.cn>
Date: Tue, 2 Jan 2024 13:31:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20issue=20for=20springboot3=20#5741:=20?=
 =?UTF-8?q?shiro=20=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=20spring=20boot=20?=
 =?UTF-8?q?3.X=20=E8=87=AA=E5=B8=A6=E7=9A=84jedis=EF=BC=8C=E9=99=8D?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 325c8cee1..b27c70428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,13 @@
 				<version>${jeecgboot.version}</version>
 			</dependency>
 
+			<!-- shiro 无法使用 spring boot 3.X 自带的jedis，降版本处理 -->
+			<dependency>
+				<groupId>redis.clients</groupId>
+				<artifactId>jedis</artifactId>
+				<version>2.9.0</version>
+			</dependency>
+
 			<!-- jeecg tools -->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>

From 21bc68fb53ce697300cfa495aaaa8acd6f025926 Mon Sep 17 00:00:00 2001
From: chenrui <chenrui@uctiems.cn>
Date: Thu, 4 Jan 2024 20:19:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20issue=20for=20springboot3=20#5741:=20?=
 =?UTF-8?q?shiro=20=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=20spring=20boot=20?=
 =?UTF-8?q?3.X=20=E8=87=AA=E5=B8=A6=E7=9A=84jedis=EF=BC=8C=E9=99=8D?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index b27c70428..819078cfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version>
+		<jedis.version>2.9.0</jedis.version>
 		<!-- Log4j2爆雷漏洞 -->
 		<!-- spring boot 3 不支持下列两个版本-->
 		<!--<log4j2.version>2.17.0</log4j2.version>
@@ -168,13 +169,6 @@
 				<version>${jeecgboot.version}</version>
 			</dependency>
 
-			<!-- shiro 无法使用 spring boot 3.X 自带的jedis，降版本处理 -->
-			<dependency>
-				<groupId>redis.clients</groupId>
-				<artifactId>jedis</artifactId>
-				<version>2.9.0</version>
-			</dependency>
-
 			<!-- jeecg tools -->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>