From 436b5748c0023a4569fb71e9380a4ce79886a697 Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Mon, 12 Dec 2022 16:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=20:bug:=20Fixing=20a=20bug.=20=E4=BB=A4?=
 =?UTF-8?q?=E7=89=8C=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java    | 4 ++--
 .../pig4cloud/pigx/admin/api/feign/RemoteTokenService.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java
index 527a5197d..5d94656cb 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java
@@ -192,14 +192,14 @@ public class PigTokenEndpoint {
 	 */
 	@Inner
 	@PostMapping("/page")
-	public R<Page> tokenList(@RequestBody Map<String, Object> params) {
+	public R<Page<TokenVo>> tokenList(@RequestBody Map<String, Object> params) {
 		// 根据分页参数获取对应数据
 		String key = String.format("%s::*", CacheConstants.PROJECT_OAUTH_ACCESS);
 		int current = MapUtil.getInt(params, CommonConstants.CURRENT);
 		int size = MapUtil.getInt(params, CommonConstants.SIZE);
 		Set<String> keys = redisTemplate.keys(key);
 		List<String> pages = keys.stream().skip((current - 1) * size).limit(size).collect(Collectors.toList());
-		Page result = new Page(current, size);
+		Page<TokenVo> result = new Page(current, size);
 
 		List<TokenVo> tokenVoList = redisTemplate.opsForValue().multiGet(pages).stream().map(obj -> {
 			OAuth2Authorization authorization = (OAuth2Authorization) obj;
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java
index 142f6d9a5..0d8f430f2 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java
@@ -43,7 +43,7 @@ public interface RemoteTokenService {
 	 * @return page
 	 */
 	@GetMapping("/token/page")
-	R<Page> getTokenPage(@SpringQueryMap Map<String, Object> params,
+	R<Page> getTokenPage(@RequestBody Map<String, Object> params,
 			@RequestHeader(SecurityConstants.FROM) String from);
 
 	/**