From 47f746e99d453db416927ec2ada90a29528228ad Mon Sep 17 00:00:00 2001
From: zlt <zltdiablo@163.com>
Date: Mon, 23 Mar 2020 22:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bean=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oauth/config/ClientDetailsConfig.java     | 40 -------------------
 .../impl/RedisAuthorizationCodeServices.java  |  9 ++---
 .../impl/RedisClientDetailsService.java       | 11 ++---
 3 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 zlt-uaa/src/main/java/com/central/oauth/config/ClientDetailsConfig.java

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 8ee59a7..0000000
--- 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<String, Object> 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 a9fe504..4dd83f3 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<String, Object> redisTemplate;
 
-    public RedisTemplate<String, Object> getRedisTemplate() {
-        return redisTemplate;
-    }
-
-    public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
+    public RedisAuthorizationCodeServices(RedisTemplate<String, Object> 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 6d8655f..aa3f278 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<String, Object> redisTemplate;
 
-    public RedisClientDetailsService(DataSource dataSource) {
+    public RedisClientDetailsService(DataSource dataSource, RedisTemplate<String, Object> redisTemplate) {
         super(dataSource);
-    }
-
-    public RedisTemplate<String, Object> getRedisTemplate() {
-        return redisTemplate;
-    }
-
-    public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
         this.redisTemplate = redisTemplate;
     }
 
-- 
GitLab