From e828cd7f19ec84c1936cab635bf5ce4dce4ceade Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Thu, 29 Apr 2021 17:13:36 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20closed=20#2675=20OpenFeign=20Get?=
 =?UTF-8?q?=20@SpringQueryMap=20=E5=8F=82=E6=95=B0=E6=9B=BF=E4=BB=A3=20Pos?=
 =?UTF-8?q?t=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/auth/endpoint/PigxTokenEndpoint.java | 19 +++++++------------
 .../admin/api/feign/RemoteTokenService.java   |  6 ++++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
index d118966da..8422580d8 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
@@ -19,13 +19,11 @@
 
 package com.pig4cloud.pigx.auth.endpoint;
 
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.admin.api.entity.SysTenant;
 import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService;
 import com.pig4cloud.pigx.auth.service.PigxTokenDealServiceImpl;
-import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
@@ -127,22 +125,19 @@ public class PigxTokenEndpoint {
 
 	/**
 	 * 查询token
-	 * @param params 分页参数
+	 * @param page 分页参数
+	 * @param username 用户名
 	 * @return
 	 */
 	@Inner
-	@PostMapping("/page")
-	public R<Page> tokenList(@RequestBody Map<String, Object> params) {
-		Page result = new Page(MapUtil.getInt(params, PaginationConstants.CURRENT),
-				MapUtil.getInt(params, PaginationConstants.SIZE));
-
+	@GetMapping("/page")
+	public R<Page> tokenList(Page page, String username) {
 		// 根据username 查询 token 列表
-		Object username = params.get("username");
-		if (username != null) {
-			return dealService.queryTokenByUsername(result, (String) username);
+		if (StrUtil.isNotBlank(username)) {
+			return dealService.queryTokenByUsername(page, username);
 		}
 
-		return dealService.queryToken(result);
+		return dealService.queryToken(page);
 	}
 
 }
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 259c7a206..f2579b757 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
@@ -22,6 +22,7 @@ import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants;
 import com.pig4cloud.pigx.common.core.util.R;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -40,8 +41,9 @@ public interface RemoteTokenService {
 	 * @param from 内部调用标志
 	 * @return page
 	 */
-	@PostMapping("/token/page")
-	R<Page> getTokenPage(@RequestBody Map<String, Object> params, @RequestHeader(SecurityConstants.FROM) String from);
+	@GetMapping("/token/page")
+	R<Page> getTokenPage(@SpringQueryMap Map<String, Object> params,
+			@RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 删除token