From bcfc4597e352a96a145df490fa01e78e61b2fcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Thu, 14 Nov 2024 11:28:39 +0800 Subject: [PATCH] bug fixed --- New_College.Api/Controllers/OAuthController.cs | 6 +++--- .../Authorizations/OverWrite/JwtHelper.cs | 4 +++- New_College.Model/ViewModels/Result/CasDoorTokenResult.cs | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/New_College.Api/Controllers/OAuthController.cs b/New_College.Api/Controllers/OAuthController.cs index 51d0f54..4c83155 100644 --- a/New_College.Api/Controllers/OAuthController.cs +++ b/New_College.Api/Controllers/OAuthController.cs @@ -104,9 +104,9 @@ namespace New_College.Controllers { user.NickName = "学霸" + RadomHelper.RandNum(4); } - var tokenModel = new SSOTokenModelJwt { UserId = user.Id.ToString(), NickName = user.NickName, LoginMode = LoginModeEnum.APP.ToString() }; - jwtStr = JwtHelper.ssoIssueJwt(tokenModel); - response.token = jwtStr; + //var tokenModel = new SSOTokenModelJwt { UserId = user.Id.ToString(), NickName = user.NickName, LoginMode = LoginModeEnum.APP.ToString() }; + //jwtStr = JwtHelper.ssoIssueJwt(tokenModel); + response.token = userinfo.result.accessToken; response.Id = user.Id; suc = true; } diff --git a/New_College.Extensions/Authorizations/OverWrite/JwtHelper.cs b/New_College.Extensions/Authorizations/OverWrite/JwtHelper.cs index 323cf56..3c3313d 100644 --- a/New_College.Extensions/Authorizations/OverWrite/JwtHelper.cs +++ b/New_College.Extensions/Authorizations/OverWrite/JwtHelper.cs @@ -112,7 +112,9 @@ namespace New_College.AuthHelper.OverWrite */ - + new Claim("UserId", tokenModel.UserId.ToString()), + new Claim("RealName", tokenModel.NickName), + new Claim("LoginMode", tokenModel.LoginMode), new Claim(JwtRegisteredClaimNames.Jti, tokenModel.UserId.ToString()), new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"), new Claim(JwtRegisteredClaimNames.Nbf,$"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") , diff --git a/New_College.Model/ViewModels/Result/CasDoorTokenResult.cs b/New_College.Model/ViewModels/Result/CasDoorTokenResult.cs index 507c408..c8894e4 100644 --- a/New_College.Model/ViewModels/Result/CasDoorTokenResult.cs +++ b/New_College.Model/ViewModels/Result/CasDoorTokenResult.cs @@ -96,6 +96,8 @@ namespace New_College.Model.ViewModels /// public long? TenantId { get; set; } + public string accessToken { get; set; } + } public class CasdoorRequest