缓存配置

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

@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
 @EnableCaching
 @Configuration
 @EnableConfigurationProperties(CacheProperties.class)
-@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('oneLevel')")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('L1')")
 public class CaffeineCacheConfig {
 
     @Autowired

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

@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
 @EnableCaching
 @Configuration
 @EnableConfigurationProperties(CacheProperties.class)
-@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('L2')")
 public class RedisCacheConfig {
 
     @Autowired

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

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('oneLevel')")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('L1')")
 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

@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('L2')")
 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

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 
 @Component
-@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('twoLevel')")
+@ConditionalOnExpression("'${r'${ibiz.cacheLevel:None}'}'.equals('L2')")
 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">
 #系统是否开启权限验证、是否开启缓存
-#缓存级别：无缓存(无配置项)、一级缓存(oneLevel)、二级缓存(twoLevel)
+#缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
   <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
     <#assign enableDataAcc="true">
   </#if>
   enablePermissionValid: ${enableDataAcc}
-  cacheLevel: oneLevel #一级缓存，本地caffeine缓存
-  #cacheLevel: twoLevel #二级缓存，本地caffeine缓存+Redis缓存
+  cacheLevel: L1 #一级缓存，本地caffeine缓存
+  #cacheLevel: L2 #二级缓存，本地caffeine缓存+Redis缓存