zhouweidong@lab.ibiz5.com 发布系统代码

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -9,7 +9,7 @@ services:
     deploy:
       resources:
            limits:
-               memory: 800M
+               memory: 1024M
            reservations:
                memory: 400M    
       mode: replicated

ibzwf-util/src/main/java/cn/ibizlab/util/cache/CacheConfig.java

 package cn.ibizlab.util.cache;
 
-import com.alibaba.fastjson.parser.ParserConfig;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.benmanes.caffeine.cache.CaffeineSpec;
-import cn.ibizlab.util.enums.RedisChannelTopic;
-import cn.ibizlab.util.cache.layering.LayeringCacheManager;
-import cn.ibizlab.util.cache.redis.KryoRedisSerializer;
-import cn.ibizlab.util.cache.redis.StringRedisSerializer;
-import cn.ibizlab.util.cache.setting.FirstCacheSetting;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.cache.CacheProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cache.CacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.redis.cache.RedisCacheConfiguration;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.cache.RedisCacheWriter;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 缓存配置类
- * 1级缓存为caffeine
- * 2级缓存为redis
- */
-@EnableCaching
-@Configuration
-@EnableConfigurationProperties(CacheProperties.class)
-@ConditionalOnProperty("ibiz.enableCache")
-public class CacheConfig {
-
-    @Bean
-    public RedisCacheManager redisCacheManager(RedisConnectionFactory connectionFactory) {
-        return RedisCacheManager.create(connectionFactory);
-    }
-
-    @Bean
-    public RedisCacheWriter redisCacheWriter(RedisConnectionFactory connectionFactory){
-        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
-        return redisCacheWriter;
-    }
-
-    @Autowired
-    private RedisCacheWriter redisCacheWriter;
-    @Autowired
-    private RedisCacheConfiguration configuration;
-
-
-    /**
-     * 重写Redis序列化方式，使用Json方式:
-     * 当我们的数据存储到Redis的时候，我们的键（key）和值（value）都是通过Spring提供的Serializer序列化到数据库的。RedisTemplate默认使用的是JdkSerializationRedisSerializer，StringRedisTemplate默认使用的是StringRedisSerializer。
-     * Spring Data JPA为我们提供了下面的Serializer：
-     * GenericToStringSerializer、Jackson2JsonRedisSerializer、JacksonJsonRedisSerializer、JdkSerializationRedisSerializer、OxmSerializer、StringRedisSerializer。
-     * 在此我们将自己配置RedisTemplate并定义Serializer。
-     *
-     * @param redisConnectionFactory
-     * @return
-     */
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
-        ObjectMapper om = new ObjectMapper();
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
-        KryoRedisSerializer<Object> kryoRedisSerializer = new KryoRedisSerializer<>(Object.class);
-        redisTemplate.setValueSerializer(kryoRedisSerializer);// 设置值（value）的序列化采用KryoRedisSerializer。
-        redisTemplate.setHashValueSerializer(kryoRedisSerializer);
-        redisTemplate.setKeySerializer(new StringRedisSerializer());// 设置键（key）的序列化采用StringRedisSerializer。
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-
-    @Bean
-    @Primary
-    public CacheManager cacheManager(RedisTemplate<String, Object> redisTemplate) {
-        LayeringCacheManager layeringCacheManager = new LayeringCacheManager(redisTemplate);
-        setFirstCacheConfig(layeringCacheManager);//Caffeine缓存设置
-        layeringCacheManager.setAllowNullValues(true); //允许存null，防止缓存击穿
-        layeringCacheManager.setRedisCacheWriter(redisCacheWriter);
-        layeringCacheManager.setRedisConfiguration(configuration);
-        return layeringCacheManager;
-    }
-
-    @Autowired
-    private CacheProperties cacheProperties;
-    private void setFirstCacheConfig(LayeringCacheManager layeringCacheManager) {
-        String specification = cacheProperties.getCaffeine().getSpec();
-        if (StringUtils.hasText(specification)) {
-            layeringCacheManager.setCaffeineSpec(CaffeineSpec.parse(specification));
-        }
-        Map<String, FirstCacheSetting> firstCacheSettings = new HashMap<>();
-        layeringCacheManager.setFirstCacheSettings(firstCacheSettings);
-    }
+public class RedisCacheConfig {
 
 }
\ No newline at end of file