1、升级J2cache为2.7.0版本，主要修复channel获取次数过多导致的错误问题，另个j2cache后期可能会移除对jedis的支持，所以还是提前升级了

2、调整二级缓存redis为lettuce，lettuce为spring推荐的redis操作方式，另个j2cache也推荐使用
3、配置文件application.yml和j2cache配置文件都增加了对lettuce的支持
4、修改com.geekcattle.core.redis包下的RedisCacheManage为RedisShiroCacheManage,因为此文件名和spring源码中的一个文件重名，为了区分特些改名
5、优化RedisConfiguration的JedisConnectionFactory为LettuceConnctionFoctory

Author: geekcattle

pom.xml

@@ -146,7 +146,7 @@
         <dependency>
             <groupId>net.oschina.j2cache</groupId>
             <artifactId>j2cache-core</artifactId>
-            <version>2.3.22-release</version>
+            <version>2.7.0-release</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

src/main/java/com/geekcattle/core/j2cache/autoconfigure/J2CacheAutoConfiguration.java

@@ -16,6 +16,7 @@
 
 package com.geekcattle.core.j2cache.autoconfigure;
 
+import com.geekcattle.core.j2cache.cache.support.util.SpringJ2CacheConfigUtil;
 import com.geekcattle.core.j2cache.cache.support.util.SpringUtil;
 import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
@@ -27,23 +28,31 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.StandardEnvironment;
 
 import java.io.IOException;
 
 @ConditionalOnClass(J2Cache.class)
 @EnableConfigurationProperties({J2CacheExtendConfig.class})
 @Configuration
+@PropertySource(value = "${j2cache.config-location}")
 public class J2CacheAutoConfiguration {
 
     @Autowired
-    private J2CacheExtendConfig cacheExtendConfig;
+    private StandardEnvironment standardEnvironment;
 
     @Bean
-    @DependsOn("springUtil")
-    public CacheChannel cacheChannel() throws IOException {
+    public J2CacheConfig j2CacheConfig() throws IOException{
         J2CacheConfig cacheConfig = new J2CacheConfig();
-        cacheConfig = cacheConfig.initFromConfig(cacheExtendConfig.getConfigLocation());
-        J2CacheBuilder builder = J2CacheBuilder.init(cacheConfig);
+        cacheConfig = SpringJ2CacheConfigUtil.initFromConfig(standardEnvironment);
+        return cacheConfig;
+    }
+
+    @Bean
+    @DependsOn({"springUtil","j2CacheConfig"})
+    public CacheChannel cacheChannel(J2CacheConfig j2CacheConfig) throws IOException {
+        J2CacheBuilder builder = J2CacheBuilder.init(j2CacheConfig);
         return builder.getChannel();
     }
 

src/main/java/com/geekcattle/core/j2cache/autoconfigure/J2CacheExtendConfig.java

@@ -1,33 +1,45 @@
-/*
- * Copyright (c) 2017-2018.  放牛极客<l_iupeiyu@qq.com>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *      http://www.apache.org/licenses/LICENSE-2.0
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * </p>
- *
- */
-
 package com.geekcattle.core.j2cache.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-
+/**
+ * 相关的配置信息
+ * @author 小雨哥哥
+ *
+ */
 @ConfigurationProperties(prefix = "j2cache")
 public class J2CacheExtendConfig {
-
     private String configLocation = "/j2cache.properties";
 
     /**
-     * 是否开启spring cache缓存,注意:开启后需要添加spring.cache.type=none,将缓存类型设置为none
+     * 是否开启spring cache缓存,注意:开启后需要添加spring.cache.type=GENERIC,将缓存类型设置为GENERIC
      */
     private Boolean openSpringCache = false;
 
+    /**
+     * 缓存清除模式，
+     * <ul>
+     * <li>active:主动清除，二级缓存过期主动通知各节点清除，优点在于所有节点可以同时收到缓存清除</li>
+     * <li>passive:被动清除，一级缓存过期进行通知各节点清除一二级缓存，</li>
+     * <li> blend:两种模式一起运作，对于各个节点缓存准确以及及时性要求高的可以使用，正常用前两种模式中一个就可</li>
+     * </ul>
+     */
+    private String cacheCleanMode = "passive";
+
+    /**
+     * 是否允许缓存空值,默认:true
+     */
+    private boolean allowNullValues = true;
+
+    /**
+     * 使用哪种redis客户端,默认：jedis
+     * <ul>
+     * <li><a href ='https://github.com/xetorthio/jedis'>jedis: https://github.com/xetorthio/jedis</a></li>
+     * <li><a href ='https://github.com/lettuce-io/lettuce-core'>lettuce: https://github.com/lettuce-io/lettuce-core</a></li>
+     * </ul>
+     */
+    private String redisClient = "jedis";
+
+
     public String getConfigLocation() {
         return configLocation;
     }
@@ -43,4 +55,28 @@ public Boolean getOpenSpringCache() {
     public void setOpenSpringCache(Boolean openSpringCache) {
         this.openSpringCache = openSpringCache;
     }
+
+    public String getCacheCleanMode() {
+        return cacheCleanMode;
+    }
+
+    public void setCacheCleanMode(String cacheCleanMode) {
+        this.cacheCleanMode = cacheCleanMode;
+    }
+
+    public boolean isAllowNullValues() {
+        return allowNullValues;
+    }
+
+    public void setAllowNullValues(boolean allowNullValues) {
+        this.allowNullValues = allowNullValues;
+    }
+
+    public String getRedisClient() {
+        return redisClient;
+    }
+
+    public void setRedisClient(String redisClient) {
+        this.redisClient = redisClient;
+    }
 }

src/main/java/com/geekcattle/core/j2cache/autoconfigure/J2CacheSpringCacheAutoConfiguration.java

@@ -43,15 +43,19 @@ public class J2CacheSpringCacheAutoConfiguration {
 
     private final CacheProperties cacheProperties;
 
-    J2CacheSpringCacheAutoConfiguration(CacheProperties cacheProperties) {
+    private final J2CacheExtendConfig j2CacheExtendConfig;
+
+    J2CacheSpringCacheAutoConfiguration(CacheProperties cacheProperties, J2CacheExtendConfig j2CacheExtendConfig) {
         this.cacheProperties = cacheProperties;
+        this.j2CacheExtendConfig = j2CacheExtendConfig;
     }
 
     @Bean
     @ConditionalOnBean(CacheChannel.class)
     public J2CacheCacheManger cacheManager(CacheChannel cacheChannel) {
         List<String> cacheNames = cacheProperties.getCacheNames();
         J2CacheCacheManger cacheCacheManger = new J2CacheCacheManger(cacheChannel);
+        cacheCacheManger.setAllowNullValues(j2CacheExtendConfig.isAllowNullValues());
         cacheCacheManger.setCacheNames(cacheNames);
         return cacheCacheManger;
     }