From d92ae7b50410e2ed0d1ff20f65bd035894dcbe89 Mon Sep 17 00:00:00 2001 From: aeizzz Date: Wed, 14 Dec 2022 16:00:10 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E6=A3=80=E6=9F=A5token=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java | 9 +++++++++ .../pig4cloud/pigx/bi/config/JimuReportTokenService.java | 4 ++-- 2 files changed, 11 insertions(+), 2 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 5d94656cb..09f9b6271 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 @@ -224,4 +224,13 @@ public class PigTokenEndpoint { return R.ok(result); } + + @Inner + @GetMapping("/query-token") + public R queryToken(String token) { + OAuth2Authorization authorization = authorizationService.findByToken(token,OAuth2TokenType.ACCESS_TOKEN); + return R.ok(authorization); + + } + } diff --git a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java index 60934064b..0248ee5bd 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java +++ b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java @@ -34,7 +34,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { // @formatter:off return RetOps.of(tokenService.queryToken(splitList.get(1), splitList.get(0) ,SecurityConstants.FROM_IN)) .getDataIf(RetOps.CODE_SUCCESS) - .map(o -> (String)o.get("username")) + .map(o -> (String)o.get("principalName")) .orElse(null); // @formatter:off } @@ -43,7 +43,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { public Map getUserInfo(String token) { String username = this.getUsername(token); Map map = new HashMap<>(4); - map.put("username", username); + map.put("principalName", username); map.put("access_token", token); // 将所有信息存放至map 解析sql会根据map的键值解析,可自定义其他值 return map;