diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs index 4f12174d..a04a1979 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Users/AccountAppService.cs @@ -94,7 +94,7 @@ namespace Lion.AbpPro.BasicManagement.Users /// private string GenerateJwt(Guid userId, string userName, string name, string email, string tenantId, List roles) { - var dateNow = Clock.Now; + var dateNow = Clock.Now.ToUniversalTime(); var expirationTime = dateNow.AddHours(_jwtOptions.ExpirationTime); var key = Encoding.ASCII.GetBytes(_jwtOptions.SecurityKey); @@ -117,10 +117,10 @@ namespace Lion.AbpPro.BasicManagement.Users var tokenDescriptor = new SecurityTokenDescriptor() { Subject = new ClaimsIdentity(claims), - Expires = expirationTime, // token 过期时间 - NotBefore = dateNow, // token 签发时间 - SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), - SecurityAlgorithms.HmacSha256Signature) + Expires = expirationTime, + NotBefore = dateNow, + IssuedAt = dateNow, + SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key),SecurityAlgorithms.HmacSha256Signature) }; var handler = new JwtSecurityTokenHandler(); var token = handler.CreateToken(tokenDescriptor); diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs index 273baf9a..3d4e704f 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs @@ -16,15 +16,15 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide /// private static void OverrideDefaultSettings(ISettingDefinitionContext context) { - context.Add( - new SettingDefinition(TimingSettingNames.TimeZone, - "China Standard Time", - L("DisplayName:Abp.Timing.Timezone"), - L("Description:Abp.Timing.Timezone")) - .WithProperty(BasicManagementSettings.Group.Default, - BasicManagementSettings.Group.SystemManagement) - .WithProperty(AbpProSettingConsts.ControlType.Default, - AbpProSettingConsts.ControlType.TypeText)); + // context.Add( + // new SettingDefinition(TimingSettingNames.TimeZone, + // "China Standard Time", + // L("DisplayName:Abp.Timing.Timezone"), + // L("Description:Abp.Timing.Timezone")) + // .WithProperty(BasicManagementSettings.Group.Default, + // BasicManagementSettings.Group.SystemManagement) + // .WithProperty(AbpProSettingConsts.ControlType.Default, + // AbpProSettingConsts.ControlType.TypeText)); context.GetOrNull(IdentitySettingNames.Password.RequiredLength) .WithProperty(BasicManagementSettings.Group.Default,