diff --git a/zlt-uaa/src/main/java/com/central/oauth/config/ClientDetailsConfig.java b/zlt-uaa/src/main/java/com/central/oauth/config/ClientDetailsConfig.java deleted file mode 100644 index 8ee59a77b71a4c101349c79c3b0d68e21b57fcc1..0000000000000000000000000000000000000000 --- a/zlt-uaa/src/main/java/com/central/oauth/config/ClientDetailsConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.central.oauth.config; - -import com.central.oauth.service.impl.RedisAuthorizationCodeServices; -import com.central.oauth.service.impl.RedisClientDetailsService; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.oauth2.provider.code.RandomValueAuthorizationCodeServices; - -import javax.annotation.Resource; -import javax.sql.DataSource; - -/** - * @author zlt - * @date 2018/12/12 - */ -@Configuration -public class ClientDetailsConfig { - @Resource - private DataSource dataSource; - @Resource - private RedisTemplate redisTemplate; - - /** - * 声明 ClientDetails实现 - */ - @Bean - public RedisClientDetailsService clientDetailsService() { - RedisClientDetailsService clientDetailsService = new RedisClientDetailsService(dataSource); - clientDetailsService.setRedisTemplate(redisTemplate); - return clientDetailsService; - } - - @Bean - public RandomValueAuthorizationCodeServices authorizationCodeServices() { - RedisAuthorizationCodeServices redisAuthorizationCodeServices = new RedisAuthorizationCodeServices(); - redisAuthorizationCodeServices.setRedisTemplate(redisTemplate); - return redisAuthorizationCodeServices; - } -} diff --git a/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisAuthorizationCodeServices.java b/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisAuthorizationCodeServices.java index a9fe50485eccf9c4291d884a37b36e384ad54488..4dd83f306ef02a739fa036b8c6fbcf640eac3481 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisAuthorizationCodeServices.java +++ b/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisAuthorizationCodeServices.java @@ -3,6 +3,7 @@ package com.central.oauth.service.impl; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.code.RandomValueAuthorizationCodeServices; +import org.springframework.stereotype.Service; import java.util.concurrent.TimeUnit; @@ -10,15 +11,11 @@ import java.util.concurrent.TimeUnit; * @author zlt * JdbcAuthorizationCodeServices替换 */ +@Service public class RedisAuthorizationCodeServices extends RandomValueAuthorizationCodeServices { - private RedisTemplate redisTemplate; - public RedisTemplate getRedisTemplate() { - return redisTemplate; - } - - public void setRedisTemplate(RedisTemplate redisTemplate) { + public RedisAuthorizationCodeServices(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; } diff --git a/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisClientDetailsService.java b/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisClientDetailsService.java index 6d8655f922110e7f6177839c73ccc8ba369e32b5..aa3f278c7764b790e13d1045a31903c1b97ed689 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisClientDetailsService.java +++ b/zlt-uaa/src/main/java/com/central/oauth/service/impl/RedisClientDetailsService.java @@ -7,6 +7,7 @@ import org.springframework.security.oauth2.common.exceptions.InvalidClientExcept import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.NoSuchClientException; import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService; +import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.sql.DataSource; @@ -21,18 +22,12 @@ import java.util.List; * 注意对oauth_client_details清楚redis db部分数据的清空 */ @Slf4j +@Service public class RedisClientDetailsService extends JdbcClientDetailsService { private RedisTemplate redisTemplate; - public RedisClientDetailsService(DataSource dataSource) { + public RedisClientDetailsService(DataSource dataSource, RedisTemplate redisTemplate) { super(dataSource); - } - - public RedisTemplate getRedisTemplate() { - return redisTemplate; - } - - public void setRedisTemplate(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; }