From 237f3ff325fb40638a67f697e8df39d41a539fea Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@gmail.com>
Date: Mon, 19 Jul 2021 17:16:16 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. closed #2952 up hutool
 5.7.4

---
 .../pigx/common/data/cache/RedisCacheAutoConfiguration.java  | 5 ++---
 pom.xml                                                      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
index b5550f6bb..54877e89a 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisCacheAutoConfiguration.java
@@ -22,12 +22,11 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.cache.CacheManagerCustomizers;
 import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 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.core.io.ResourceLoader;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
@@ -48,7 +47,6 @@ import java.util.Map;
 @Configuration
 @AutoConfigureAfter({ RedisAutoConfiguration.class })
 @ConditionalOnBean({ RedisConnectionFactory.class })
-@ConditionalOnMissingBean({ CacheManager.class })
 @EnableConfigurationProperties(CacheProperties.class)
 public class RedisCacheAutoConfiguration {
 
@@ -67,6 +65,7 @@ public class RedisCacheAutoConfiguration {
 	}
 
 	@Bean
+	@Primary
 	public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory, ResourceLoader resourceLoader) {
 		DefaultRedisCacheWriter redisCacheWriter = new DefaultRedisCacheWriter(connectionFactory);
 		RedisCacheConfiguration cacheConfiguration = this.determineConfiguration(resourceLoader.getClassLoader());
diff --git a/pom.xml b/pom.xml
index a276c72c3..4372c52e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 		<spring.checkstyle.version>0.0.28</spring.checkstyle.version>
 		<git.commit.version>2.2.5</git.commit.version>
 		<spring-boot-admin.version>2.4.2</spring-boot-admin.version>
-		<hutool.version>5.7.3</hutool.version>
+		<hutool.version>5.7.4</hutool.version>
 		<captcha.version>1.2.7</captcha.version>
 		<swagger.fox.version>3.0.0</swagger.fox.version>
 		<knife4j.version>2.0.9</knife4j.version>