修正Shiro过滤器重复加载及加载顺序问题

web/src/main/java/com/jeesite/config/Application.java

@@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Profile;
 
 import com.jeesite.common.io.PropertiesUtils;
 
@@ -15,6 +16,7 @@ import com.jeesite.common.io.PropertiesUtils;
  * @author ThinkGem
  * @version 2018-1-8
  */
+@Profile("default")
 @SpringBootApplication(scanBasePackages={"com.jeesite.config"})
 public class Application extends SpringBootServletInitializer {
 	

web/src/main/java/com/jeesite/config/web/FilterConfig.java

@@ -3,17 +3,19 @@
  */
 package com.jeesite.config.web;
 
+import javax.servlet.Filter;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.filter.DelegatingFilterProxy;
-import org.springframework.web.filter.RequestContextFilter;
 
 import com.jeesite.common.config.Global;
+import com.jeesite.common.shiro.web.ShiroFilterFactoryBean;
 import com.jeesite.common.web.PageCachingFilter;
 
 /**
@@ -28,13 +30,13 @@ public class FilterConfig {
 	 * Encoding Filter
 	 */
 	@Bean
+	@Order(1000)
 	public FilterRegistrationBean characterEncodingFilter() {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
 		bean.setFilter(new CharacterEncodingFilter());
 		bean.addInitParameter("encoding", "UTF-8");
 		bean.addInitParameter("forceEncoding", "true");
 		bean.addUrlPatterns("/*");
-		bean.setOrder(1000);
 		return bean;
 	}
 
@@ -42,6 +44,7 @@ public class FilterConfig {
 	 * PageCache Filter, cache .html suffix.
 	 */
 	@Bean
+	@Order(2000)
 	@ConditionalOnProperty(name = "ehcache.pageCaching.enabled", havingValue = "true")
 	public FilterRegistrationBean pageCachingFilter(EhCacheManagerFactoryBean ehCacheManager) {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
@@ -51,33 +54,20 @@ public class FilterConfig {
 		bean.addInitParameter("cacheName", "pageCachingFilter");
 		bean.addUrlPatterns(StringUtils.split(Global.getProperty(
 				"ehcache.pageCaching.urlPatterns"), ","));
-		bean.setOrder(2000);
 		return bean;
 	}
 
 	/**
 	 * Apache Shiro Filter
+	 * @throws Exception 
 	 */
 	@Bean
-	public FilterRegistrationBean shiroFilterProxy() {
+	@Order(3000)
+	public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
-		bean.setFilter(new DelegatingFilterProxy("shiroFilter"));
-		bean.addInitParameter("targetFilterLifecycle", "true");
+		bean.setFilter((Filter) shiroFilter.getInstance());
 		bean.addUrlPatterns("/*");
-		bean.setOrder(3000);
 		return bean;
 	}
-
-	/**
-	 * Request Context Filter 需要放在shiroFilter后，否则request获取不到session
-	 */
-	@Bean
-	public FilterRegistrationBean requestContextFilter() {
-		FilterRegistrationBean bean = new FilterRegistrationBean();
-		bean.setFilter(new RequestContextFilter());
-		bean.addUrlPatterns("/*");
-		bean.setOrder(4000);
-		return bean;
-	}
-
+	
 }

web/src/main/java/com/jeesite/config/web/ListenerConfig.java

@@ -6,10 +6,9 @@ package com.jeesite.config.web;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.web.context.request.RequestContextListener;
 
-import com.jeesite.common.shiro.cas.CasOutSessionListener;
-
 /**
  * Listener 配置
  * @author ThinkGem
@@ -17,26 +16,15 @@ import com.jeesite.common.shiro.cas.CasOutSessionListener;
  */
 @Configuration
 public class ListenerConfig {
-
-	/**
-	 * CAS Session Listener
-	 */
-	@Bean
-	public ServletListenerRegistrationBean<CasOutSessionListener> casOutSessionListener() {
-		ServletListenerRegistrationBean<CasOutSessionListener> bean = new ServletListenerRegistrationBean<>();
-		bean.setListener(new CasOutSessionListener());
-		bean.setOrder(1000);
-		return bean;
-	}
-
+	
 	/**
 	 * Request Context Listener
 	 */
 	@Bean
+	@Order(1000)
 	public ServletListenerRegistrationBean<RequestContextListener> requestContextListener() {
 		ServletListenerRegistrationBean<RequestContextListener> bean = new ServletListenerRegistrationBean<>();
 		bean.setListener(new RequestContextListener());
-		bean.setOrder(2000);
 		return bean;
 	}