Merge branch 'feature/REQ-2046' into dev

src/main/java/cn/axzo/pokonyan/config/redis/RedisConfiguration.java

@@ -3,6 +3,7 @@ package cn.axzo.pokonyan.config.redis;
 import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -30,6 +31,7 @@ public class RedisConfiguration {
     /**
      * RedisTemplate配置
      */
+    @Primary
     @Bean(name = "genericRedisTemplate")
     public StringRedisTemplate genericRedisTemplate(RedisConnectionFactory factory, RedisSerializer<String> redisKeySerializer, RedisSerializer<Object> redisValueSerializer) {
         StringRedisTemplate redisTemplate = new StringRedisTemplate();