Browse Source

fix: token颁发时间和过期时间调整为utc时间

pull/148/head
zzzwangjun@gmail.com 6 months ago
parent
commit
6474ce7c73
  1. 10
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs
  2. 18
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs

10
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs

@ -94,7 +94,7 @@ namespace Lion.AbpPro.BasicManagement.Users
/// <returns></returns> /// <returns></returns>
private string GenerateJwt(Guid userId, string userName, string name, string email, string tenantId, List<string> roles) private string GenerateJwt(Guid userId, string userName, string name, string email, string tenantId, List<string> roles)
{ {
var dateNow = Clock.Now; var dateNow = Clock.Now.ToUniversalTime();
var expirationTime = dateNow.AddHours(_jwtOptions.ExpirationTime); var expirationTime = dateNow.AddHours(_jwtOptions.ExpirationTime);
var key = Encoding.ASCII.GetBytes(_jwtOptions.SecurityKey); var key = Encoding.ASCII.GetBytes(_jwtOptions.SecurityKey);
@ -117,10 +117,10 @@ namespace Lion.AbpPro.BasicManagement.Users
var tokenDescriptor = new SecurityTokenDescriptor() var tokenDescriptor = new SecurityTokenDescriptor()
{ {
Subject = new ClaimsIdentity(claims), Subject = new ClaimsIdentity(claims),
Expires = expirationTime, // token 过期时间 Expires = expirationTime,
NotBefore = dateNow, // token 签发时间 NotBefore = dateNow,
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), IssuedAt = dateNow,
SecurityAlgorithms.HmacSha256Signature) SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key),SecurityAlgorithms.HmacSha256Signature)
}; };
var handler = new JwtSecurityTokenHandler(); var handler = new JwtSecurityTokenHandler();
var token = handler.CreateToken(tokenDescriptor); var token = handler.CreateToken(tokenDescriptor);

18
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs

@ -16,15 +16,15 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide
/// </summary> /// </summary>
private static void OverrideDefaultSettings(ISettingDefinitionContext context) private static void OverrideDefaultSettings(ISettingDefinitionContext context)
{ {
context.Add( // context.Add(
new SettingDefinition(TimingSettingNames.TimeZone, // new SettingDefinition(TimingSettingNames.TimeZone,
"China Standard Time", // "China Standard Time",
L("DisplayName:Abp.Timing.Timezone"), // L("DisplayName:Abp.Timing.Timezone"),
L("Description:Abp.Timing.Timezone")) // L("Description:Abp.Timing.Timezone"))
.WithProperty(BasicManagementSettings.Group.Default, // .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) // BasicManagementSettings.Group.SystemManagement)
.WithProperty(AbpProSettingConsts.ControlType.Default, // .WithProperty(AbpProSettingConsts.ControlType.Default,
AbpProSettingConsts.ControlType.TypeText)); // AbpProSettingConsts.ControlType.TypeText));
context.GetOrNull(IdentitySettingNames.Password.RequiredLength) context.GetOrNull(IdentitySettingNames.Password.RequiredLength)
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,

Loading…
Cancel
Save