From a476e3ab191b2e1ff268cb53ac154fd6c784eb2c Mon Sep 17 00:00:00 2001
From: zhangchuanxi <zhangchuanxi@cdzhnf.com>
Date: Tue, 23 Oct 2018 14:59:29 +0800
Subject: [PATCH] #feat:添加redis 的cachename对应过期时间

---
 pom.xml                                                                  |  2 +-
 src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java     |  1 +
 src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java |  9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02a212c..d8bd51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.irrigation</groupId>
     <artifactId>common-lib</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java b/src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java
index e03efe0..e8dcbb1 100644
--- a/src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java
+++ b/src/main/java/com/irrigation/icl/cache/LayeringCacheAutoFactory.java
@@ -32,6 +32,7 @@ public class LayeringCacheAutoFactory {
         LayeringCacheManager cacheManager = new LayeringCacheManager(redisTemplate, layeringCacheProperties);
         cacheManager.setUsePrefix(true);
         long expire = layeringCacheProperties.getExpire() > 0L ? layeringCacheProperties.getExpire() : 120L;
+        cacheManager.setExpires(layeringCacheProperties.getExpires());
         cacheManager.setDefaultExpiration(expire);
         return cacheManager;
     }
diff --git a/src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java b/src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java
index aaa213b..80db5a1 100644
--- a/src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java
+++ b/src/main/java/com/irrigation/icl/cache/core/LayeringCacheProperties.java
@@ -3,6 +3,8 @@ package com.irrigation.icl.cache.core;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import java.util.Map;
+
 /**
  * @Author: boni
  * @Date: 2018/8/24-下午2:59
@@ -25,6 +27,13 @@ public class LayeringCacheProperties {
      */
     private long expire;
 
+
+    /**
+     * L2级缓存的过期时间，name :time
+     */
+    private Map<String, Long> expires;
+
+
     @Data
     // ehcache设置
     public static class L1 {
--
libgit2 0.21.4