From b9bf0d14b9b168348cefd5a878904847115dd144 Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Fri, 6 Jan 2023 14:18:00 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A4=E7=89=8C=E7=AE=A1=E7=90=86=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B7id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pig4cloud/pigx/auth/endpoint/PigTokenEndpoint.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 313af0ed7..1ee0e4723 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
@@ -34,6 +34,7 @@ import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.core.util.RetOps;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
+import com.pig4cloud.pigx.common.security.service.PigxUser;
 import com.pig4cloud.pigx.common.security.util.OAuth2ErrorCodesExpand;
 import com.pig4cloud.pigx.common.security.util.OAuthClientException;
 import lombok.RequiredArgsConstructor;
@@ -45,6 +46,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.security.authentication.event.LogoutSuccessEvent;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
@@ -217,6 +219,11 @@ public class PigTokenEndpoint {
 			String issuedAt = TemporalAccessorUtil.format(accessToken.getToken().getIssuedAt(),
 					DatePattern.NORM_DATETIME_PATTERN);
 			tokenVo.setIssuedAt(issuedAt);
+
+			Map<String, Object> attributes = authorization.getAttributes();
+			Authentication authentication = (Authentication)attributes.get(Principal.class.getName());
+			PigxUser pigxUser = (PigxUser) authentication.getPrincipal();
+			tokenVo.setUserId(pigxUser.getId());
 			return tokenVo;
 		}).collect(Collectors.toList());
 		result.setRecords(tokenVoList);