Skip to content

Commit b9e0250

Browse files
committed
升级springboot为2.1.2.RELEASE版本
1 parent d32fe62 commit b9e0250

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

src/main/java/com/geekcattle/core/shiro/ShiroConfiguration.java

+22-28
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public class ShiroConfiguration {
6868
public AdminShiroRealm adminShiroRealm(){
6969
logger.debug("ShiroConfiguration.adminShiroRealm()");
7070
AdminShiroRealm adminShiroRealm = new AdminShiroRealm();
71-
//adminShiroRealm.setCacheManager(redisCacheManager());//单redis缓存
72-
adminShiroRealm.setCacheManager(shiroJ2CacheCacheManager());//j2cache二级缓存
71+
adminShiroRealm.setCacheManager(redisCacheManager());//单redis缓存
72+
//adminShiroRealm.setCacheManager(shiroJ2CacheCacheManager());//j2cache二级缓存
7373
//redisCacheManager和shiroJ2CacheCacheManager以上两种模式可任选其一,现在默认使用J2Cache
7474
adminShiroRealm.setCredentialsMatcher(adminHashedCredentialsMatcher());
7575
return adminShiroRealm;
@@ -113,26 +113,26 @@ public CustomSessionListener customSessionListener(){
113113
public DefaultWebSessionManager defaultWebSessionManager() {
114114
logger.debug("ShiroConfiguration.defaultWebSessionManager()");
115115
DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
116-
//用户信息必须是序列化格式,要不创建用户信息创建不过去,此坑很大,
117-
//sessionManager.setSessionDAO(redisSessionDAO());//单redis的session存储
118-
sessionManager.setSessionDAO(shiroJ2CacheSession());//J2Cache的session存储
119-
//redisSessionDAO和shiroJ2CacheSession以上两种模式可任选其一,现在默认使用J2Cache
120-
Collection<SessionListener> sessionListeners = new ArrayList<>();
121-
sessionListeners.add(customSessionListener());
122-
sessionManager.setSessionListeners(sessionListeners);
123-
//单位为毫秒(1秒=1000毫秒) 3600000毫秒为1个小时
124-
sessionManager.setSessionValidationInterval(3600000*12);
125-
//3600000 milliseconds = 1 hour
126-
sessionManager.setGlobalSessionTimeout(3600000*12);
127-
//是否删除无效的,默认也是开启
128-
sessionManager.setDeleteInvalidSessions(true);
129-
//是否开启 检测,默认开启
130-
sessionManager.setSessionValidationSchedulerEnabled(true);
131-
//创建会话Cookie
132-
Cookie cookie = new SimpleCookie(ShiroHttpSession.DEFAULT_SESSION_ID_NAME);
133-
cookie.setName("WEBID");
134-
cookie.setHttpOnly(true);
135-
sessionManager.setSessionIdCookie(cookie);
116+
// //用户信息必须是序列化格式,要不创建用户信息创建不过去,此坑很大,
117+
// sessionManager.setSessionDAO(redisSessionDAO());//单redis的session存储
118+
// //sessionManager.setSessionDAO(shiroJ2CacheSession());//J2Cache的session存储
119+
// //redisSessionDAO和shiroJ2CacheSession以上两种模式可任选其一,现在默认使用J2Cache
120+
// Collection<SessionListener> sessionListeners = new ArrayList<>();
121+
// sessionListeners.add(customSessionListener());
122+
// sessionManager.setSessionListeners(sessionListeners);
123+
// //单位为毫秒(1秒=1000毫秒) 3600000毫秒为1个小时
124+
// sessionManager.setSessionValidationInterval(3600000*12);
125+
// //3600000 milliseconds = 1 hour
126+
// sessionManager.setGlobalSessionTimeout(3600000*12);
127+
// //是否删除无效的,默认也是开启
128+
// sessionManager.setDeleteInvalidSessions(true);
129+
// //是否开启 检测,默认开启
130+
// sessionManager.setSessionValidationSchedulerEnabled(true);
131+
// //创建会话Cookie
132+
// Cookie cookie = new SimpleCookie(ShiroHttpSession.DEFAULT_SESSION_ID_NAME);
133+
// cookie.setName("WEBID");
134+
// cookie.setHttpOnly(true);
135+
// sessionManager.setSessionIdCookie(cookie);
136136
return sessionManager;
137137
}
138138

@@ -186,11 +186,7 @@ public FilterRegistrationBean filterProxy(){
186186
DelegatingFilterProxy proxy = new DelegatingFilterProxy();
187187
proxy.setTargetFilterLifecycle(true);
188188
proxy.setTargetBeanName("shiroFilter");
189-
//该值缺省为false,表示生命周期由SpringApplicationContext管理,设置为true则表示由ServletContainer管理
190189
registrationBean.setFilter(proxy);
191-
/*List<String> urlPatterns = new ArrayList<String>();
192-
urlPatterns.add("/*");
193-
registrationBean.setUrlPatterns(urlPatterns);*/
194190
return registrationBean;
195191
}
196192

@@ -235,8 +231,6 @@ public ShiroFilterFactoryBean shiroFilter(DefaultWebSecurityManager securityMana
235231

236232
//<!-- 过滤链定义,从上向下顺序执行,一般将 /**放在最为下边 -->:这是一个坑呢,一不小心代码就不好使了;
237233
//<!-- authc:所有url都必须认证通过才可以访问; anon:所有url都都可以匿名访问-->
238-
filterChainDefinitionMap.put("/monitor/**", "anon");
239-
filterChainDefinitionMap.put("/error", "anon");
240234
filterChainDefinitionMap.put("/console/login", "anon");
241235
filterChainDefinitionMap.put("/console/logout", "logout");
242236
//配置记住我或认证通过可以访问的地址

src/main/resources/application.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ server:
1111
logging:
1212
level:
1313
com.springframework.boot.web: warn
14-
com.geekcattl : debug
14+
com.geekcattle : debug
1515
de.codecentric.boot.admin: warn
16+
org.apache.shiro.util: trace
1617
file : "${user.home}/logs/spring-boot-logging.log"
1718

1819
management:
1920
endpoints:
2021
web:
2122
exposure:
22-
include: ["*"]
23+
include: "*"
2324
base-path: /monitor/actuator
2425
endpoint:
2526
health:
@@ -54,9 +55,10 @@ spring:
5455
boot:
5556
admin:
5657
client:
57-
url: http://localhost:${server.port}/admin
58+
url: http://localhost:${server.port}/monitor
5859
instance:
5960
service-base-url: http://localhost:${server.port}
61+
enabled: true
6062
context-path: monitor
6163
#json配置
6264
jackson:

0 commit comments

Comments
 (0)