diff --git a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java index bb440154d..609dacf34 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCApi/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; @@ -64,6 +67,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PushLimit.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -81,6 +88,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxScoreRules.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -98,6 +109,12 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCUser.class); + + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); + // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -115,6 +132,12 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(BaseCUserEntity.class); + + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); + // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -132,6 +155,11 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCUserBasicInfo.class); + + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -149,6 +177,11 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxMall.class); + + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -166,6 +199,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate> template = new RedisTemplate>(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -183,6 +220,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCouponCVo.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); template.setHashKeySerializer(j); @@ -200,6 +241,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate> template = new RedisTemplate<>(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -218,6 +263,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxBuser.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -236,6 +285,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate<>(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxOrder.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); @@ -254,6 +307,10 @@ public class RedisConfig extends CachingConfigurerSupport { RedisTemplate template = new RedisTemplate<>(); Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxAppinfo.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + j.setObjectMapper(om); // value值的序列化 template.setValueSerializer(j); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index e1decd1b4..c61fe5d2f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -57,9 +57,6 @@ public class BaseController { @Autowired private CUserTokenService cUserTokenService; - @Autowired - private CUserServiceFactory cuserFactory; - @Autowired @Qualifier("cUserBasicInfoRedisTemplate") RedisTemplate cuserBasicInfoTemplate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java index 936472004..e9317eb81 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseCUserEntity.java @@ -32,13 +32,9 @@ public class BaseCUserEntity extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") private Date expireTime; - @io.swagger.annotations.ApiModelProperty(value="真实对象如wxCUser,因为放到缓存之后,实体会变为map,索性就存map",name="realUser") + @io.swagger.annotations.ApiModelProperty(value="真实对象如wxCUser",name="realUser") @TableField(exist = false) - private Map realUser; - - public T getObjectFromMap(Class clazz) { - return JSONObject.parseObject(JSONObject.toJSONString(realUser), clazz); - } + private Object realUser; /** * 是否是会员