更新 JWT

StoreHub.Framework/Security/TokenService.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
 using System.Security.Claims;
@@ -50,7 +50,7 @@ public class TokenService : ITokenService
 		return new TokenResult
 		{
 			Token = token,
-			ExpiresAt = expires,
+			ExpiresInMinutes = (uint)_options.ExpiresMinutes,
 		};
 	}
 
@@ -74,9 +74,9 @@ public class TokenService : ITokenService
 			ClaimsPrincipal principal = new(result.ClaimsIdentity);
 
 			// 单点登录校验：会话必须仍然有效（未被退出、未被新登录顶替）
-			string? userIdValue = principal.FindFirst(JwtClaimTypes.UserId)?.Value;
+			string? userName = principal.FindFirst(JwtClaimTypes.UserName)?.Value;
 			string? jti = principal.FindFirst(JwtClaimTypes.Jti)?.Value;
-			if (!int.TryParse(userIdValue, out int userId) || string.IsNullOrWhiteSpace(jti) || !_onlineUserStore.IsTokenActive(userId, jti))
+			if (string.IsNullOrWhiteSpace(userName) || string.IsNullOrWhiteSpace(jti) || !_onlineUserStore.IsTokenActive(userName, jti))
 			{
 				return null;
 			}
@@ -94,16 +94,15 @@ public class TokenService : ITokenService
 	/// </summary>
 	private void RegisterSession(IEnumerable<Claim> claims, string jti, DateTime loginTime, DateTime expiresAt)
 	{
-		string? userIdValue = claims.FirstOrDefault(c => c.Type == JwtClaimTypes.UserId)?.Value;
-		if (!int.TryParse(userIdValue, out int userId))
+		string? userName = claims.FirstOrDefault(c => c.Type == JwtClaimTypes.UserName)?.Value;
+		if (string.IsNullOrWhiteSpace(userName))
 		{
-			return; // 未携带用户ID的令牌不纳入在线会话管理
+			return; // 未携带登录账户的令牌不纳入在线会话管理
 		}
 
 		_onlineUserStore.SignIn(new OnlineUserInfo
 		{
-			UserId = userId,
-			UserName = claims.FirstOrDefault(c => c.Type == JwtClaimTypes.UserName)?.Value ?? string.Empty,
+			UserName = userName,
 			NickName = claims.FirstOrDefault(c => c.Type == JwtClaimTypes.NickName)?.Value ?? string.Empty,
 			Jti = jti,
 			LoginTime = loginTime,