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 9cd465c3..3e7c20bf 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 @@ -6,6 +6,7 @@ package com.jeesite.common.shiro.filter; 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; @@ -25,7 +26,7 @@ import jakarta.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 e586798e..d4133db3 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; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java index d468ff88..bd68bd78 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/LdapAuthorizingRealm.java @@ -4,11 +4,17 @@ */ package com.jeesite.common.shiro.realm; -import javax.naming.AuthenticationNotSupportedException; -import javax.naming.NamingException; -import javax.naming.ldap.LdapContext; +import com.jeesite.common.shiro.authc.FormToken; +import com.jeesite.common.shiro.authc.LdapToken; +import com.jeesite.common.utils.SpringUtils; +import com.jeesite.common.web.http.ServletUtils; +import com.jeesite.modules.sys.entity.Log; +import com.jeesite.modules.sys.entity.User; +import com.jeesite.modules.sys.service.EmpUserService; +import com.jeesite.modules.sys.service.UserService; +import com.jeesite.modules.sys.utils.LogUtils; +import com.jeesite.modules.sys.utils.UserUtils; import jakarta.servlet.http.HttpServletRequest; - import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; @@ -21,20 +27,13 @@ import org.apache.shiro.realm.ldap.LdapContextFactory; import org.apache.shiro.realm.ldap.LdapUtils; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; -import org.apache.shiro.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; -import com.jeesite.common.shiro.authc.FormToken; -import com.jeesite.common.shiro.authc.LdapToken; -import com.jeesite.common.utils.SpringUtils; -import com.jeesite.common.web.http.ServletUtils; -import com.jeesite.modules.sys.entity.Log; -import com.jeesite.modules.sys.entity.User; -import com.jeesite.modules.sys.service.EmpUserService; -import com.jeesite.modules.sys.service.UserService; -import com.jeesite.modules.sys.utils.LogUtils; -import com.jeesite.modules.sys.utils.UserUtils; +import javax.naming.AuthenticationNotSupportedException; +import javax.naming.NamingException; +import javax.naming.ldap.LdapContext; /** * 系统认证授权实现类 diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index 1cb88e8e..71ca58c4 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -10,7 +10,7 @@ import java.util.Map; import jakarta.servlet.Filter; import org.apache.shiro.cache.CacheManager; -import org.apache.shiro.cas.CasSubjectFactory; +import com.jeesite.common.shiro.cas.CasSubjectFactory; import org.apache.shiro.realm.Realm; import org.apache.shiro.realm.ldap.JndiLdapContextFactory; import org.apache.shiro.spring.LifecycleBeanPostProcessor;