refactor: 移除 Ehcache，默认缓存设置为 Redis

novel-admin/pom.xml

@@ -200,10 +200,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
 
         <!--war包部署需要-->
         <!--<dependency>-->

novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java

@@ -5,11 +5,8 @@ import com.java2nb.common.redis.shiro.RedisCacheManager;
 import com.java2nb.common.redis.shiro.RedisManager;
 import com.java2nb.common.redis.shiro.RedisSessionDAO;
 import com.java2nb.system.shiro.UserRealm;
-import net.sf.ehcache.CacheManager;
-import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.SessionListener;
-import org.apache.shiro.session.mgt.eis.MemorySessionDAO;
 import org.apache.shiro.session.mgt.eis.SessionDAO;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
@@ -29,6 +26,7 @@ import java.util.LinkedHashMap;
  */
 @Configuration
 public class ShiroConfig {
+
     @Value("${spring.redis.host}")
     private String host;
     @Value("${spring.redis.password}")
@@ -38,9 +36,6 @@ public class ShiroConfig {
     @Value("${spring.redis.timeout}")
     private int timeout;
 
-    @Value("${spring.cache.type}")
-    private String cacheType ;
-
     @Value("${server.session-timeout}")
     private int tomcatTimeout;
 
@@ -67,8 +62,8 @@ public class ShiroConfig {
         shiroFilterFactoryBean.setSuccessUrl("/index");
         shiroFilterFactoryBean.setUnauthorizedUrl("/403");
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
-        filterChainDefinitionMap.put("/login","anon");
-        filterChainDefinitionMap.put("/getVerify","anon");
+        filterChainDefinitionMap.put("/login", "anon");
+        filterChainDefinitionMap.put("/getVerify", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/fonts/**", "anon");
@@ -92,11 +87,7 @@ public class ShiroConfig {
         //设置realm.
         securityManager.setRealm(userRealm());
         // 自定义缓存实现 使用redis
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
-            securityManager.setCacheManager(rediscacheManager());
-        } else {
-            securityManager.setCacheManager(ehCacheManager());
-        }
+        securityManager.setCacheManager(rediscacheManager());
         securityManager.setSessionManager(sessionManager());
         return securityManager;
     }
@@ -108,8 +99,7 @@ public class ShiroConfig {
     }
 
     /**
-     * 开启shiro aop注解支持.
-     * 使用代理方式;所以需要开启代码支持;
+     * 开启shiro aop注解支持. 使用代理方式;所以需要开启代码支持;
      *
      * @param securityManager
      * @return
@@ -138,8 +128,7 @@ public class ShiroConfig {
     }
 
     /**
-     * cacheManager 缓存 redis实现
-     * 使用的是shiro-redis开源插件
+     * cacheManager 缓存 redis实现 使用的是shiro-redis开源插件
      *
      * @return
      */
@@ -151,8 +140,7 @@ public class ShiroConfig {
 
 
     /**
-     * RedisSessionDAO shiro sessionDao层的实现 通过redis
-     * 使用的是shiro-redis开源插件
+     * RedisSessionDAO shiro sessionDao层的实现 通过redis 使用的是shiro-redis开源插件
      */
     @Bean
     public RedisSessionDAO redisSessionDAO() {
@@ -163,11 +151,7 @@ public class ShiroConfig {
 
     @Bean
     public SessionDAO sessionDAO() {
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
-            return redisSessionDAO();
-        } else {
-            return new MemorySessionDAO();
-        }
+        return redisSessionDAO();
     }
 
     /**
@@ -184,19 +168,4 @@ public class ShiroConfig {
         return sessionManager;
     }
 
-    @Bean
-    public EhCacheManager ehCacheManager() {
-        EhCacheManager em = new EhCacheManager();
-        em.setCacheManager(cacheManager());
-        return em;
-    }
-
-    @Bean("cacheManager2")
-    CacheManager cacheManager(){
-        return CacheManager.create();
-    }
-
-
-
-
 }

novel-admin/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ spring:
   redis:
     host: 127.0.0.1
     port: 6379
-    password: test
+    password: test123456
     # 连接超时时间（毫秒）
     timeout: 10000
     jedis:

novel-admin/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 server:
   session-timeout: 18000
-#    tomcat:
-#        max-threads: 1000
-#        min-spare-threads: 30
+  #    tomcat:
+  #        max-threads: 1000
+  #        min-spare-threads: 30
   port: 80
 #    uri-encoding: utf-8
 #security:
@@ -15,7 +15,7 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
+  profiles:
     active: dev
   servlet:
     multipart:
@@ -24,10 +24,7 @@ spring:
   devtools:
     restart:
       enabled: true
-  cache:
-    type: ehcache
-    ehcache:
-      config: classpath:ehcache.xml
+
 mybatis:
   configuration:
     #自动将数据库带下划线的表字段值映射到Java类的驼峰字段上