From 59fe6a334559f984fc3dfa4421e7365ad54651c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 27 Jan 2020 22:44:57 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BB=A4=E7=89=8C?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E6=9F=A5=E8=AF=A2token=20=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=20=E5=BC=BA=E5=88=B6=E5=88=A0=E9=99=A4token?=
 =?UTF-8?q?=20=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig/auth/endpoint/PigTokenEndpoint.java   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java
index 65ccfa9d..8e0e75cd 100755
--- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java
+++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java
@@ -120,9 +120,21 @@ public class PigTokenEndpoint {
 		}
 
 		String tokenValue = authHeader.replace(OAuth2AccessToken.BEARER_TYPE, StrUtil.EMPTY).trim();
-		OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue);
+		return removeToken(tokenValue);
+	}
+
+	/**
+	 * 令牌管理调用
+	 *
+	 * @param token token
+	 * @param from  内部调用标志
+	 */
+	@Inner
+	@DeleteMapping("/{token}")
+	public R<Boolean> removeToken(@PathVariable("token") String token) {
+		OAuth2AccessToken accessToken = tokenStore.readAccessToken(token);
 		if (accessToken == null || StrUtil.isBlank(accessToken.getValue())) {
-			return R.ok(Boolean.TRUE, "退出失败，token 无效");
+			return R.failed("删除失败，token 无效");
 		}
 
 		OAuth2Authentication auth2Authentication = tokenStore.readAuthentication(accessToken);
@@ -136,19 +148,7 @@ public class PigTokenEndpoint {
 		// 清空 refresh token
 		OAuth2RefreshToken refreshToken = accessToken.getRefreshToken();
 		tokenStore.removeRefreshToken(refreshToken);
-		return R.ok(Boolean.TRUE);
-	}
-
-	/**
-	 * 令牌管理调用
-	 *
-	 * @param token token
-	 * @param from  内部调用标志
-	 */
-	@Inner
-	@DeleteMapping("/{token}")
-	public R<Boolean> removeToken(@PathVariable("token") String token) {
-		return R.ok(redisTemplate.delete(CacheConstants.PROJECT_OAUTH_ACCESS + token));
+		return R.ok();
 	}
 
 
@@ -162,15 +162,15 @@ public class PigTokenEndpoint {
 	@PostMapping("/page")
 	public R<Page> tokenList(@RequestBody Map<String, Object> params) {
 		//根据分页参数获取对应数据
-		List<String> pages = findKeysForPage(CacheConstants.PROJECT_OAUTH_ACCESS
-			, MapUtil.getInt(params, CommonConstants.CURRENT)
+		String key = String.format("%sauth_to_access:*", CacheConstants.PROJECT_OAUTH_ACCESS);
+		List<String> pages = findKeysForPage(key, MapUtil.getInt(params, CommonConstants.CURRENT)
 			, MapUtil.getInt(params, CommonConstants.SIZE));
 
 		redisTemplate.setKeySerializer(new StringRedisSerializer());
 		redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
 		Page result = new Page(MapUtil.getInt(params, CommonConstants.CURRENT), MapUtil.getInt(params, CommonConstants.SIZE));
 		result.setRecords(redisTemplate.opsForValue().multiGet(pages));
-		result.setTotal((long) redisTemplate.keys(CacheConstants.PROJECT_OAUTH_ACCESS).size());
+		result.setTotal((long) redisTemplate.keys(key).size());
 		return R.ok(result);
 	}