From 19334bb3b91a7c0245ab2eebba8b379ad7298188 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 4 Sep 2020 00:51:43 +0800 Subject: [PATCH] fix cache --- .../java/com/iformall/config/RedisConfig.java | 39 +++++--------- .../java/com/iformall/config/RedisConfig.java | 51 +++++++------------ .../java/com/iformall/config/RedisConfig.java | 37 +++++--------- .../java/com/iformall/config/RedisConfig.java | 38 +++++--------- .../java/com/iformall/config/RedisConfig.java | 39 +++++--------- .../java/com/iformall/config/RedisConfig.java | 39 +++++--------- .../java/com/iformall/config/RedisConfig.java | 39 +++++--------- .../java/com/iformall/config/RedisConfig.java | 39 +++++--------- 8 files changed, 108 insertions(+), 213 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java index d5b729fa9..46616ae3b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -260,40 +263,24 @@ public class RedisConfig extends CachingConfigurerSupport { template.setConnectionFactory(connectionFactory); return template; } - - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } diff --git a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java index eb59174c5..5b092435a 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -228,47 +231,31 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + @Bean("stringValueOperations") + public ValueOperations getStringValueOperations(RedisConnectionFactory connectionFactory) { + StringRedisTemplate template = new StringRedisTemplate(); template.setConnectionFactory(connectionFactory); - return template; + template.afterPropertiesSet(); + return template.opsForValue(); } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(connectionFactory); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("stringValueOperations") - public ValueOperations getStringValueOperations(RedisConnectionFactory connectionFactory) { - StringRedisTemplate template = new StringRedisTemplate(); - template.setConnectionFactory(connectionFactory); template.afterPropertiesSet(); - return template.opsForValue(); + return template; } } diff --git a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java index 0dd8a6c91..ae4ab7b33 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -260,39 +263,23 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } diff --git a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java index 8bdf29d82..266b1eeb7 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -246,41 +249,24 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } - } diff --git a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java index d2d3390cc..04f667935 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -228,40 +231,24 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } - + } diff --git a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java index 7f3bc2878..b8006da26 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -245,40 +248,24 @@ public class RedisConfig extends CachingConfigurerSupport { template.setConnectionFactory(connectionFactory); return template; } - - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java index e1cbd1fe7..c80f34de3 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -258,40 +261,24 @@ public class RedisConfig extends CachingConfigurerSupport { template.setConnectionFactory(connectionFactory); return template; } - - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } } diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java b/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java index ee67d949b..a4478de5b 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java @@ -1,5 +1,8 @@ package com.iformall.config; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; @@ -244,40 +247,24 @@ public class RedisConfig extends CachingConfigurerSupport { template.setConnectionFactory(connectionFactory); return template; } - - @Bean("wxAppinfoRedisTemplate") - public RedisTemplate getWxAppinfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - + + @Bean("objectCommonRedisTemplate") + public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("wxLevelConfigListRedisTemplate") - public RedisTemplate> getWxLevelConfigListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); - template.setHashKeySerializer(j); + template.setHashValueSerializer(j); // key的序列化 template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); + template.afterPropertiesSet(); return template; } }