ibizdev提交

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml

@@ -16,7 +16,7 @@ zuul:
       serviceId: ibzdict-api
       stripPrefix: false
     wf_group_member:
-      path: /wf_group_members/**
+      path: /wfmembers/**
       serviceId: ibzwf-api
       stripPrefix: false
     ibzdict:
@@ -24,15 +24,15 @@ zuul:
       serviceId: ibzdict-api
       stripPrefix: false
     wf_user:
-      path: /wf_users/**
+      path: /wfusers/**
       serviceId: ibzwf-api
       stripPrefix: false
     ibzorg:
-      path: /ibzorgs/**
+      path: /ibzorganizations/**
       serviceId: ibzou-api
       stripPrefix: false
     wf_group:
-      path: /wf_groups/**
+      path: /wfgroups/**
       serviceId: ibzwf-api
       stripPrefix: false
     sys_user_role:
@@ -44,7 +44,7 @@ zuul:
       serviceId: ibzuaa-api
       stripPrefix: false
     ibzdept:
-      path: /ibzdepts/**
+      path: /ibzdepartments/**
       serviceId: ibzou-api
       stripPrefix: false
     sys_permission:
@@ -52,7 +52,7 @@ zuul:
       serviceId: ibzuaa-api
       stripPrefix: false
     ibzemp:
-      path: /ibzemps/**
+      path: /ibzemployees/**
       serviceId: ibzou-api
       stripPrefix: false
     loginv7:

ibzrt-util/src/main/java/cn/ibizlab/util/cache/CaffeineCacheConfig.java

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

ibzrt-util/src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java

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

ibzrt-util/src/main/java/cn/ibizlab/util/cache/cacheManager/CaffeineCacheManager.java

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('oneLevel')")
+@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('L1')")
 public class CaffeineCacheManager implements CacheManager {
 
     private static final int DEFAULT_EXPIRE_AFTER_WRITE = 1;

ibzrt-util/src/main/java/cn/ibizlab/util/cache/cacheManager/LayeringCacheManager.java

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Data
 @Component
-@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('twoLevel')")
+@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('L2')")
 public class LayeringCacheManager implements CacheManager {
 
     private static final int DEFAULT_EXPIRE_AFTER_WRITE = 1;

ibzrt-util/src/main/java/cn/ibizlab/util/cache/listener/RedisMessageListener.java

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 
 @Component
-@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('twoLevel')")
+@ConditionalOnExpression("'${ibiz.cacheLevel:None}'.equals('L2')")
 public class RedisMessageListener extends MessageListenerAdapter {
     private static final Logger logger = LoggerFactory.getLogger(RedisPublisher.class);
     @Autowired

ibzrt-util/src/main/resources/application-sys.yml

@@ -78,9 +78,9 @@ ribbon:
   ConnectTimeout: 60000
 
 #系统是否开启权限验证、是否开启缓存
-#缓存级别：无缓存(无配置项)、一级缓存(oneLevel)、二级缓存(twoLevel)
+#缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
   enablePermissionValid: true
-  cacheLevel: oneLevel #一级缓存，本地caffeine缓存
-  #cacheLevel: twoLevel #二级缓存，本地caffeine缓存+Redis缓存
+  cacheLevel: L1 #一级缓存，本地caffeine缓存
+  #cacheLevel: L2 #二级缓存，本地caffeine缓存+Redis缓存