From c3934168a5fc919f9eed4d87a7d2efb337ff4d20 Mon Sep 17 00:00:00 2001
From: b2baccline <23131013+b2baccline@users.noreply.github.com>
Date: Mon, 11 May 2020 11:01:42 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=85=AC=E7=94=A8conf=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0condition,=E4=BE=BF=E4=BA=8E=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hccake/ballcat/common/conf/config/JacksonConfig.java   | 2 ++
 .../hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java  | 3 ++-
 .../java/com/hccake/ballcat/common/conf/redis/RedisConfig.java | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/JacksonConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/JacksonConfig.java
index 2651e908..7fc2a44c 100644
--- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/JacksonConfig.java
+++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/JacksonConfig.java
@@ -5,6 +5,7 @@ import com.hccake.ballcat.common.core.jackson.ArraySerializerModifier;
 import com.hccake.ballcat.common.core.jackson.JavaTimeModule;
 import com.hccake.ballcat.common.core.jackson.NullSerializer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -24,6 +25,7 @@ public class JacksonConfig {
      */
     @Bean
     @Primary
+    @ConditionalOnMissingBean(ObjectMapper.class)
     public ObjectMapper objectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
 
diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java
index de483e46..b96f48c3 100644
--- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java
+++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java
@@ -11,7 +11,6 @@ import org.springframework.context.annotation.Configuration;
  * 默认配置MybatisPlus分页插件，通过conditional注解达到覆盖效用
  */
 @Configuration
-@ConditionalOnMissingBean(PaginationInterceptor.class)
 public class MybatisPlusConfig {
 
 	/**
@@ -19,6 +18,7 @@ public class MybatisPlusConfig {
 	 * @return PaginationInterceptor
 	 */
 	@Bean
+	@ConditionalOnMissingBean(PaginationInterceptor.class)
 	public PaginationInterceptor paginationInterceptor() {
 		return new PaginationInterceptor();
 	}
@@ -28,6 +28,7 @@ public class MybatisPlusConfig {
 	 * @return FillMetaObjectHandle
 	 */
 	@Bean
+	@ConditionalOnMissingBean(FillMetaObjectHandle.class)
 	public FillMetaObjectHandle fillMetaObjectHandle() {
 		return new FillMetaObjectHandle();
 	}
diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/redis/RedisConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/redis/RedisConfig.java
index 79f8b9ab..a156b932 100644
--- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/redis/RedisConfig.java
+++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/redis/RedisConfig.java
@@ -1,6 +1,7 @@
 package com.hccake.ballcat.common.conf.redis;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,6 +26,7 @@ public class RedisConfig {
     private String redisKeyPrefix;
 
     @Bean
+    @ConditionalOnMissingBean(StringRedisTemplate.class)
     public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
         StringRedisTemplate template = new StringRedisTemplate();
         template.setConnectionFactory(redisConnectionFactory);
@@ -33,6 +35,7 @@ public class RedisConfig {
     }
 
     @Bean
+    @ConditionalOnMissingBean(RedisTemplate.class)
     public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(redisConnectionFactory);