缓存配置

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/cache/CaffeineCacheConfig.java.ftl

@@ -7,7 +7,7 @@ import com.github.benmanes.caffeine.cache.CaffeineSpec;
 import ${pub.getPKGCodeName()}.util.cache.cacheManager.CaffeineCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
 @EnableCaching
 @Configuration
 @EnableConfigurationProperties(CacheProperties.class)
-@ConditionalOnProperty("ibiz.enableCaffeineCache")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('oneLevel')")
 public class CaffeineCacheConfig {
 
     @Autowired

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/cache/RedisCacheConfig.java.ftl

@@ -14,7 +14,7 @@ import ${pub.getPKGCodeName()}.util.cache.redis.StringRedisSerializer;
 import ${pub.getPKGCodeName()}.util.enums.RedisChannelTopic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
 @EnableCaching
 @Configuration
 @EnableConfigurationProperties(CacheProperties.class)
-@ConditionalOnProperty("ibiz.enableRedisCache")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
 public class RedisCacheConfig {
 
     @Autowired

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/cache/cacheManager/CaffeineCacheManager.java.ftl

@@ -6,7 +6,7 @@ package ${pub.getPKGCodeName()}.util.cache.cacheManager;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.CaffeineSpec;
 import lombok.Data;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.caffeine.CaffeineCache;
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnProperty("ibiz.enableCaffeineCache")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('oneLevel')")
 public class CaffeineCacheManager implements CacheManager {
 
     private static final int DEFAULT_EXPIRE_AFTER_WRITE = 1;

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/cache/cacheManager/LayeringCacheManager.java.ftl

@@ -8,7 +8,7 @@ import com.github.benmanes.caffeine.cache.CaffeineSpec;
 import lombok.Data;
 import ${pub.getPKGCodeName()}.util.cache.cache.LayeringCache;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnProperty("ibiz.enableRedisCache")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
 public class LayeringCacheManager implements CacheManager {
 
     private static final int DEFAULT_EXPIRE_AFTER_WRITE = 1;

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/cache/listener/RedisMessageListener.java.ftl

@@ -8,7 +8,7 @@ import ${pub.getPKGCodeName()}.util.enums.RedisChannelTopic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.connection.Message;
@@ -25,7 +25,7 @@ import java.util.Map;
  */
 
 @Component
-@ConditionalOnProperty("ibiz.enableRedisCache")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
 public class RedisMessageListener extends MessageListenerAdapter {
     private static final Logger logger = LoggerFactory.getLogger(RedisPublisher.class);
     @Autowired

SLN/%PUBPRJ%-util/src/main/resources/application-sys.yml.ftl

@@ -203,12 +203,12 @@ ribbon:
 
 <#assign enableDataAcc="false">
 #系统是否开启权限验证、是否开启缓存
-#缓存模式：关闭缓存(无配置项)、本地缓存(enableCaffeineCache=true-默认)、caffeine+redis两级缓存(enableRedisCache=true)
+#缓存级别：无缓存(无配置项)、一级缓存(oneLevel)、二级缓存(twoLevel)
 ibiz:
   <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
     <#assign enableDataAcc="true">
   </#if>
   enablePermissionValid: ${enableDataAcc}
-  enableCaffeineCache: true
-  #enableRedisCache: ${enableDataAcc}
+  cacheLevel: oneLevel #一级缓存，本地caffeine缓存
+  #cacheLevel: twoLevel #二级缓存，本地caffeine缓存+Redis缓存