From 9a57281e2c39f484940ca00d4c6ce3dc01a7ffa2 Mon Sep 17 00:00:00 2001
From: b2baccline <23131013+b2baccline@users.noreply.github.com>
Date: Fri, 30 Oct 2020 00:41:48 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BD=BF=E7=94=A8Conditional=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E4=BE=BF=E4=BA=8E=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?token=E5=A2=9E=E5=BC=BA=E5=A4=84=E7=90=86=20=E5=92=8C=20tokenSt?=
 =?UTF-8?q?ore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oauth/config/CustomAuthorizationServerConfigurer.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java
index 99b9d491..9c24d852 100644
--- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java
+++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java
@@ -7,6 +7,7 @@ import com.hccake.ballcat.admin.oauth.exception.CustomWebResponseExceptionTransl
 import com.hccake.ballcat.admin.oauth.mobile.MobileTokenGranter;
 import com.hccake.ballcat.common.redis.config.CachePropertiesHolder;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
@@ -104,6 +105,7 @@ public class CustomAuthorizationServerConfigurer implements AuthorizationServerC
 	 */
 	@Bean
 	@DependsOn("cachePropertiesHolder")
+	@ConditionalOnMissingBean
 	public TokenStore tokenStore() {
 		RedisTokenStore tokenStore = new RedisTokenStore(redisConnectionFactory);
 		tokenStore.setPrefix(CachePropertiesHolder.keyPrefix() + SecurityConst.OAUTH_PREFIX);
@@ -115,6 +117,7 @@ public class CustomAuthorizationServerConfigurer implements AuthorizationServerC
 	 * @return TokenEnhancer Token增强处理器
 	 */
 	@Bean
+	@ConditionalOnMissingBean
 	public TokenEnhancer tokenEnhancer() {
 		return new CustomTokenEnhancer();
 	}