From d1954cb64b3d14c3f8c9a03282a6107482fbb1c7 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sat, 23 Aug 2025 14:20:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/mdmModule/config/CacheConfig.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java index 2eed9fd8..2b48243c 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java @@ -5,28 +5,35 @@ import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.concurrent.ConcurrentMapCache; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.cache.support.SimpleCacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Configuration @EnableCaching public class CacheConfig extends CachingConfigurerSupport { + @Override @Bean - public CacheManager cacheManager() { - SimpleCacheManager cacheManager = new SimpleCacheManager(); - - // 添加所有需要的缓存(包括缺失的mdmModuleDb) - List caches = new ArrayList<>(); - caches.add(new ConcurrentMapCache("mdmModuleDb")); - caches.add(new ConcurrentMapCache("mdmModuleDbFileds")); - caches.add(new ConcurrentMapCache("mdmModule")); - - cacheManager.setCaches(caches); + public ConcurrentMapCacheManager cacheManager() { + // 整合所有需要的缓存名称:原有的mdm相关缓存 + 新的业务缓存 + List cacheNames = Arrays.asList( + // 原有缓存(来自SimpleCacheManager的配置) + "mdmModuleDb", + "mdmModuleDbFileds", + "mdmModule", + // 新添加的业务缓存(来自之前的ConcurrentMapCacheManager配置) + "sysApplicationPlugin", + "IntegrationTask", + "IntegrationTaskLiving" + ); + ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager(); + cacheManager.setCacheNames(cacheNames); // 注册所有缓存名称 return cacheManager; } }