From 3af30a0e9e5b1d7f6a30a0f4800d9f37aed43092 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 2 Feb 2021 11:07:41 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20RedisTemplate?=
 =?UTF-8?q?Config=20=E4=BC=98=E5=85=88=E4=BA=8E=20Redisson=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/common/data/cache/RedisTemplateConfig.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
index bbcc9560d..68668851e 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java
@@ -19,10 +19,10 @@ package com.pig4cloud.pigx.common.data.cache;
 
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 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.serializer.JdkSerializationRedisSerializer;
@@ -36,10 +36,12 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @EnableCaching
 @Configuration
 @AllArgsConstructor
-@AutoConfigureBefore(RedisAutoConfiguration.class)
+@AutoConfigureBefore(name = {"org.redisson.spring.starter.RedissonAutoConfiguration"
+		, "org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration"})
 public class RedisTemplateConfig {
 
 	@Bean
+	@Primary
 	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setKeySerializer(new StringRedisSerializer());