From d82679c71f67b457f67e87bfd8081c539b4fff08 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Wed, 1 Jul 2026 20:50:30 +0800
Subject: [PATCH] =?UTF-8?q?--author:scott--date:20260701--for:=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7shiro.version=E5=88=B03.0.0=EF=BC=8Cshiro-redis?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0io.github.weir2010:4.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-boot/jeecg-boot-base-core/pom.xml       | 49 +++++--------------
 .../org/jeecg/config/shiro/ShiroConfig.java   |  3 +-
 jeecg-boot/pom.xml                            |  6 +--
 3 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base-core/pom.xml
index 9db9ca493..7b4608d9e 100644
--- a/jeecg-boot/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot/jeecg-boot-base-core/pom.xml
@@ -192,64 +192,37 @@
 			<version>${java-jwt.version}</version>
 		</dependency>
 
-		<!--shiro-->
+		<!--shiro 3.0 原生 Jakarta EE，无需 jakarta classifier -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring-boot-starter</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
 			<exclusions>
+				<!-- Shiro 3.0 默认依赖 log4j2，项目使用 Logback，排除以免冲突 -->
 				<exclusion>
-					<groupId>org.apache.shiro</groupId>
-					<artifactId>shiro-spring</artifactId>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-log4j2</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
-			<!-- 排除仍使用了javax.servlet的依赖 -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.shiro</groupId>
-					<artifactId>shiro-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.shiro</groupId>
-					<artifactId>shiro-web</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
-		<!-- 引入适配jakarta的依赖包 -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-beanutils</groupId>
-					<artifactId>commons-beanutils</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-web</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.shiro</groupId>
-					<artifactId>shiro-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
-		<!-- shiro-redis -->
+		<!-- shiro-redis（io.github.weir2010 是 org.crazycake 的延续版本，原生支持 Lettuce） -->
 		<dependency>
-			<groupId>org.crazycake</groupId>
+			<groupId>io.github.weir2010</groupId>
 			<artifactId>shiro-redis</artifactId>
 			<version>${shiro-redis.version}</version>
 			<exclusions>
@@ -257,12 +230,14 @@
 					<groupId>org.apache.shiro</groupId>
 					<artifactId>shiro-core</artifactId>
 				</exclusion>
-				<exclusion>
-					<artifactId>checkstyle</artifactId>
-					<groupId>com.puppycrawl.tools</groupId>
-				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- shiro-redis 4.x 将 Jedis 设为 optional，需显式声明 -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${jedis.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 5443b9cdf..6f4d17890 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -11,7 +11,6 @@ import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
-import org.apache.shiro.spring.web.ShiroUrlPathHelper;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.crazycake.shiro.*;
 import org.jeecg.common.constant.CommonConstant;
@@ -380,7 +379,7 @@ public class ShiroConfig {
     @Bean
     public RequestMappingHandlerMapping overridedRequestMappingHandlerMapping() {
         RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping();
-        mapping.setUrlPathHelper(new ShiroUrlPathHelper());
+        mapping.setUrlPathHelper(new org.springframework.web.util.UrlPathHelper());
         return mapping;
     }
     
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index d2d686f7c..f2012a071 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -72,15 +72,15 @@
 		<aliyun.oss.version>3.17.3</aliyun.oss.version>
         <tencentcloud-sdk-java-sms.version>3.1.407</tencentcloud-sdk-java-sms.version>
 		<!-- shiro -->
-		<shiro.version>2.0.5</shiro.version>
-		<shiro-redis.version>3.2.3</shiro-redis.version>
+		<shiro.version>3.0.0</shiro.version>
+		<shiro-redis.version>4.1.0</shiro-redis.version>
 		<java-jwt.version>4.5.0</java-jwt.version>
 		<codegenerate.version>1.5.6</codegenerate.version>
 		<minio.version>8.5.7</minio.version>
 		<justauth-spring-boot-starter.version>1.4.0</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>3.8.0</jedis.version>
+		<jedis.version>7.1.0</jedis.version>
 		<baidu-java-sdk.version>4.16.19</baidu-java-sdk.version>
 	</properties>