From 80802269acee2035b3d6fe8f1838b147dae65b8a Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Mon, 9 Apr 2018 17:01:17 +0800
Subject: [PATCH] merge

---
 .../main/java/com/xwbing/shiro/ShiroConfig.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java b/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
index 2810ca7..c034e30 100644
--- a/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
+++ b/boot-web/src/main/java/com/xwbing/shiro/ShiroConfig.java
@@ -134,14 +134,6 @@ public class ShiroConfig {
         return redisManager;
     }
 
-    ///////////////////////sessionManager///////////////////
-    @Bean
-    public DefaultWebSessionManager sessionManager() {
-        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
-        sessionManager.setSessionDAO(redisSessionDAO());
-        return sessionManager;
-    }
-
     ///////////////////////cacheManager///////////////////
     @Bean
     @DependsOn("lifecycleBeanPostProcessor")
@@ -151,6 +143,14 @@ public class ShiroConfig {
         return redisCacheManager;
     }
 
+    ///////////////////////sessionManager///////////////////
+    @Bean
+    public DefaultWebSessionManager sessionManager() {
+        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+        sessionManager.setSessionDAO(redisSessionDAO());
+        return sessionManager;
+    }
+
     @Bean
     public RedisSessionDAO redisSessionDAO() {
         RedisSessionDAO redisSessionDAO = new RedisSessionDAO();