From 49e669c47ed4ca2f28d99cd56c93dfdda9941e08 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 21 Jul 2024 17:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecas=E7=BB=8F=E5=85=B8?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=85=BC=E5=AE=B9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/autoconfigure/core/ShiroAutoConfiguration.java | 2 +-
 .../main/java/com/jeesite/common/shiro/filter/CasFilter.java   | 3 ++-
 .../com/jeesite/common/shiro/realm/CasAuthorizingRealm.java    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/core/ShiroAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/core/ShiroAutoConfiguration.java
index 7f1f4e72..55f2836d 100644
--- a/modules/core/src/main/java/com/jeesite/autoconfigure/core/ShiroAutoConfiguration.java
+++ b/modules/core/src/main/java/com/jeesite/autoconfigure/core/ShiroAutoConfiguration.java
@@ -7,6 +7,7 @@ package com.jeesite.autoconfigure.core;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.shiro.cas.CasOutHandler;
+import com.jeesite.common.shiro.cas.CasSubjectFactory;
 import com.jeesite.common.shiro.config.FilterChainDefinitionMap;
 import com.jeesite.common.shiro.filter.*;
 import com.jeesite.common.shiro.realm.AuthorizingRealm;
@@ -17,7 +18,6 @@ import com.jeesite.common.shiro.session.SessionManager;
 import com.jeesite.common.shiro.web.ShiroFilterFactoryBean;
 import com.jeesite.common.shiro.web.WebSecurityManager;
 import org.apache.shiro.cache.CacheManager;
-import org.apache.shiro.cas.CasSubjectFactory;
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.realm.ldap.JndiLdapContextFactory;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java
index 74bcc194..6f0a0185 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java
@@ -7,6 +7,7 @@ package com.jeesite.common.shiro.filter;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.ExceptionUtils;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.shiro.cas.CasBaseFilter;
 import com.jeesite.common.shiro.realm.BaseAuthorizingRealm;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
@@ -26,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version 2020-9-19
  */
 @SuppressWarnings("deprecation")
-public class CasFilter extends org.apache.shiro.cas.CasFilter {
+public class CasFilter extends CasBaseFilter {
 
 	private BaseAuthorizingRealm authorizingRealm;
 
diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
index ab67fa10..35c49268 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
@@ -10,6 +10,7 @@ import com.jeesite.common.lang.ObjectUtils;
 import com.jeesite.common.shiro.authc.FormToken;
 import com.jeesite.common.shiro.cas.CasCreateUser;
 import com.jeesite.common.shiro.cas.CasOutHandler;
+import com.jeesite.common.shiro.cas.CasToken;
 import com.jeesite.common.utils.SpringUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.sys.entity.EmpUser;
@@ -22,7 +23,6 @@ import com.jeesite.modules.sys.utils.UserUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.cas.CasToken;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.jasig.cas.client.validation.Assertion;
 import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;