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..9e08985e 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 @@ -1,32 +1,34 @@ package com.hzya.frame.mdm.mdmModule.config; -import org.springframework.cache.Cache; -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.support.SimpleCacheManager; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; 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; } } diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml index fb8310d6..ad69560e 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml @@ -73,11 +73,11 @@ - + + + + +