Merge remote-tracking branch 'origin/dev' into dev

community-service/src/main/java/com/tanpu/community/config/CacheConfig.java

@@ -2,16 +2,26 @@ package com.tanpu.community.config;
 
 import com.tanpu.community.cache.RedisCache;
 import com.tanpu.community.util.SpringUtils;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
-@Configuration
+@Slf4j
+@Data
+@Component
+@ConfigurationProperties(prefix = "cache")
 public class CacheConfig {
 
+    private String caffeineSpec;
+
     @Autowired
     private SpringUtils springUtils;
 
@@ -22,10 +32,16 @@ public class CacheConfig {
 
     @Bean
     public CaffeineCacheManager caffeineCacheManager() {
+
+        log.info("initialize local cache with caffeineSpec:{}", caffeineSpec);
+        if (StringUtils.isBlank(caffeineSpec)) {
+            caffeineSpec = "maximumSize=10000,expireAfterWrite=300s";
+        }
+
         CaffeineCacheManager cacheManager = new CaffeineCacheManager();
         cacheManager.setCacheNames(Arrays.asList("local"));
         // todo 配置化
-        cacheManager.setCacheSpecification("maximumSize=1000,expireAfterWrite=30s");
+        cacheManager.setCacheSpecification(caffeineSpec);
         return cacheManager;
     }
 }