From 6fca049e8c61c2c5aa64f3ef4f5d18576c7f5c01 Mon Sep 17 00:00:00 2001
From: Don <don@163.com>
Date: Thu, 17 Sep 2020 10:02:47 +0800
Subject: [PATCH] :rewind: Reverting RedisTokenStore #I1PYDZ

---
 .../config/AuthorizationServerConfig.java     |  4 +-
 .../component/PigRedisTokenStore.java         | 79 -------------------
 2 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java

diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java
index 6a4fd2a5..72563a4f 100755
--- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java
+++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java
@@ -18,7 +18,6 @@ package com.pig4cloud.pig.auth.config;
 
 import com.pig4cloud.pig.common.core.constant.CacheConstants;
 import com.pig4cloud.pig.common.core.constant.SecurityConstants;
-import com.pig4cloud.pig.common.security.component.PigRedisTokenStore;
 import com.pig4cloud.pig.common.security.component.PigWebResponseExceptionTranslator;
 import com.pig4cloud.pig.common.security.service.PigClientDetailsService;
 import com.pig4cloud.pig.common.security.service.PigUser;
@@ -38,6 +37,7 @@ import org.springframework.security.oauth2.config.annotation.web.configurers.Aut
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 import org.springframework.security.oauth2.provider.token.TokenEnhancer;
 import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
 
 import javax.sql.DataSource;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
 
 	@Bean
 	public TokenStore tokenStore() {
-		PigRedisTokenStore tokenStore = new PigRedisTokenStore(redisConnectionFactory);
+		RedisTokenStore tokenStore = new RedisTokenStore(redisConnectionFactory);
 		tokenStore.setPrefix(CacheConstants.PROJECT_OAUTH_ACCESS);
 		return tokenStore;
 	}
diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java
deleted file mode 100644
index 83f430cc..00000000
--- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pig4cloud.pig.common.security.component;
-
-import cn.hutool.core.util.StrUtil;
-import com.pig4cloud.pig.common.core.constant.CacheConstants;
-import lombok.Cleanup;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisStringCommands;
-import org.springframework.data.redis.core.types.Expiration;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
-import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
-
-/**
- * @author lengleng
- * @date 2020/8/3
- * <p>
- * 重写默认tokenStore 保存 username and token 关系
- */
-public class PigRedisTokenStore extends RedisTokenStore {
-
-	private RedisConnectionFactory connectionFactory;
-
-	public PigRedisTokenStore(RedisConnectionFactory connectionFactory) {
-		super(connectionFactory);
-		this.connectionFactory = connectionFactory;
-	}
-
-	/**
-	 * 序列化保存认证信息
-	 * @param token token 详细信息
-	 * @param authentication 认证相关信息
-	 */
-	@Override
-	public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authentication) {
-		super.storeAccessToken(token, authentication);
-		@Cleanup
-		RedisConnection connection = connectionFactory.getConnection();
-		// KEY
-		byte[] key = StrUtil.bytes(CacheConstants.PROJECT_OAUTH_TOKEN + authentication.getName());
-		// value
-		byte[] tokenVal = StrUtil.bytes(token.getValue());
-		RedisStringCommands stringCommand = connection.stringCommands();
-		stringCommand.set(key, tokenVal, Expiration.seconds(token.getExpiresIn()),
-				RedisStringCommands.SetOption.SET_IF_ABSENT);
-	}
-
-	/**
-	 * 删除token
-	 * @param accessToken token
-	 */
-	@Override
-	public void removeAccessToken(OAuth2AccessToken accessToken) {
-		super.removeAccessToken(accessToken);
-		@Cleanup
-		RedisConnection connection = connectionFactory.getConnection();
-		// KEY
-		OAuth2Authentication authentication = readAuthentication(accessToken);
-		byte[] key = StrUtil.bytes(CacheConstants.PROJECT_OAUTH_TOKEN + authentication.getName());
-		connection.del(key);
-	}
-
-}