#feat:增加二级缓存过期时间配置项，默认120秒

ci-aliyun
1 parent 465b6add
Showing 2 changed files with 12 additions and 5 deletions
src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java
src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java
 package com.irrigation.icl.cache;
  
-import com.irrigation.icl.cache.config.CacheConfig;
 import com.irrigation.icl.cache.core.LayeringCacheLoadCondition;
 import com.irrigation.icl.cache.core.LayeringCacheManager;
 import com.irrigation.icl.cache.core.LayeringCacheProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +31,8 @@ public class LayeringCacheAutoFactory {
                                              LayeringCacheProperties layeringCacheProperties) {
         LayeringCacheManager cacheManager = new LayeringCacheManager(redisTemplate, layeringCacheProperties);
         cacheManager.setUsePrefix(true);
-        cacheManager.setDefaultExpiration(90);
+        long expire = layeringCacheProperties.getExpire() > 0L ? layeringCacheProperties.getExpire() : 120L;
+        cacheManager.setDefaultExpiration(expire);
         return cacheManager;
     }
  
@@ -64,9 +62,11 @@ public class LayeringCacheAutoFactory {
             public void onMessage(Message message, byte[] pattern) {
                 byte[] content = message.getBody();
                 if (content != null) {
+//                    String commandString = new String(content, Charset.defaultCharset());
+//                    Command command = JSON.parseObject(commandString, Command.class);
                     Command command = (Command) redisTemplate.getValueSerializer().deserialize(content);
                     if (command != null) {
-                        log.info(command.toString());
+                        log.debug(command.toString());
                         handler.handle(command);
                     }
                 }
@@ -16,7 +16,14 @@ public class LayeringCacheProperties {
      * L1缓存配置
      */
     private L1 cacheL1;
+    /**
+     * 是否启用缓存
+     */
     private boolean enable = true;
+    /**
+     * L2级缓存的过期时间，单位秒
+     */
+    private long expire;
  
     @Data
     // ehcache设置