From 849b3a7ec092050f3d54888703b98e00c94a9ad0 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 12 Aug 2018 19:55:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86web=E9=A1=B9=E7=9B=AE=E7=9A=84config?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E6=95=A3=E5=88=B0jar=E5=8C=85?= =?UTF-8?q?=E9=87=8C=EF=BC=8C=E8=AE=A9web=E9=A1=B9=E7=9B=AE=E6=9B=B4?= =?UTF-8?q?=E7=AE=80=E6=B4=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/config/ShiroConfig.java | 17 +++++++++ .../modules/config/web/PageCacheConfig.java | 37 ++----------------- .../modules/sys/sysIndex/topMenuOnline.html | 3 +- .../modules/config/web/ListenerConfig.java | 31 ---------------- .../modules/config/web/ServletConfig.java | 16 -------- 5 files changed, 23 insertions(+), 81 deletions(-) rename web/src/main/java/com/jeesite/modules/config/web/FilterConfig.java => modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java (58%) delete mode 100644 web/src/main/java/com/jeesite/modules/config/web/ListenerConfig.java delete mode 100644 web/src/main/java/com/jeesite/modules/config/web/ServletConfig.java 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 9df869c5..1c7fc44a 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 @@ -14,9 +14,12 @@ import org.apache.shiro.realm.Realm; import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; +import org.springframework.core.annotation.Order; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.config.Global; @@ -44,6 +47,20 @@ import com.jeesite.common.shiro.web.WebSecurityManager; @Configuration public class ShiroConfig { + /** + * Apache Shiro Filter + * @throws Exception + */ + @Bean + @Order(3000) + @ConditionalOnMissingBean(name="shiroFilterProxy") + public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { + FilterRegistrationBean bean = new FilterRegistrationBean(); + bean.setFilter((Filter) shiroFilter.getInstance()); + bean.addUrlPatterns("/*"); + return bean; + } + /** * CAS登录过滤器 */ diff --git a/web/src/main/java/com/jeesite/modules/config/web/FilterConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java similarity index 58% rename from web/src/main/java/com/jeesite/modules/config/web/FilterConfig.java rename to modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java index 847c348b..ac9c15a3 100644 --- a/web/src/main/java/com/jeesite/modules/config/web/FilterConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java @@ -3,19 +3,16 @@ */ package com.jeesite.modules.config.web; -import javax.servlet.Filter; - import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; 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 com.jeesite.common.config.Global; -import com.jeesite.common.shiro.web.ShiroFilterFactoryBean; import com.jeesite.common.web.PageCachingFilter; /** @@ -24,28 +21,15 @@ import com.jeesite.common.web.PageCachingFilter; * @version 2017年11月30日 */ @Configuration -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("/*"); - return bean; - } - +public class PageCacheConfig { + /** * PageCache Filter, cache .html suffix. */ @Bean @Order(2000) @ConditionalOnProperty(name = "ehcache.pageCaching.enabled", havingValue = "true") + @ConditionalOnMissingBean(name="pageCachingFilter") public FilterRegistrationBean pageCachingFilter(EhCacheManagerFactoryBean ehCacheManager) { FilterRegistrationBean bean = new FilterRegistrationBean(); PageCachingFilter pageCachingFilter = new PageCachingFilter(); @@ -56,18 +40,5 @@ public class FilterConfig { "ehcache.pageCaching.urlPatterns"), ",")); return bean; } - - /** - * Apache Shiro Filter - * @throws Exception - */ - @Bean - @Order(3000) - public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { - FilterRegistrationBean bean = new FilterRegistrationBean(); - bean.setFilter((Filter) shiroFilter.getInstance()); - bean.addUrlPatterns("/*"); - return bean; - } } diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html index 8b2f44b7..064c9841 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuOnline.html @@ -5,7 +5,8 @@