zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-03-03 00:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复登录过期token的发放

Browse Source
This commit is contained in:
陈淳
2023-12-11 10:51:38 +08:00
parent 098d4bc85f
commit 10a608c0af
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Furion.Net6/Yi.Framework.Infrastructure/Sqlsugar/SqlSugarDbContext.cs
View File

@@ -112,7 +112,7 @@ namespace Yi.Framework.Infrastructure.Sqlsugar
if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModificationTime)))
{
//不等于默认最小值，其他null或者有值都进行赋值
if (!DateTime.MinValue.Equals((DateTime)oldValue))
if (!DateTime.MinValue.Equals(oldValue))
{
entityInfo.SetValue(DateTime.Now);
}
@@ -138,7 +138,7 @@ namespace Yi.Framework.Infrastructure.Sqlsugar
if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreationTime)))
{
//为空或者为默认最小值都进行赋值
if (oldValue is null || DateTime.MinValue.Equals((DateTime)oldValue))
if (oldValue is null || DateTime.MinValue.Equals(oldValue))
{
entityInfo.SetValue(DateTime.Now);
}

11
Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs
View File

@@ -1,4 +1,5 @@
using System.Text.RegularExpressions;
using Furion.Authorization;
using Furion.EventBus;
using IPTools.Core;
using Microsoft.AspNetCore.Http;
@@ -27,10 +28,10 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
public class AccountService : ApplicationService, IAccountService, ITransient, IDynamicApiController
{
public AccountService(IUserRepository userRepository, ICurrentUser currentUser, AccountManager accountManager, IRepository<MenuEntity> menuRepository, SmsAliyunManager smsAliyunManager, IOptions<SmsAliyunOptions> smsAliyunManagerOptions, SecurityCodeHelper securityCode, IMemoryCache memoryCache, IEventPublisher eventPublisher, IHttpContextAccessor httpContextAccessor) =>
(_userRepository, _currentUser, _accountManager, _menuRepository, _smsAliyunManager, _smsAliyunManagerOptions, _securityCode, _memoryCache, _eventPublisher, _httpContextAccessor) =
(userRepository, currentUser, accountManager, menuRepository, smsAliyunManager, smsAliyunManagerOptions, securityCode, memoryCache, eventPublisher, httpContextAccessor);
public AccountService(IUserRepository userRepository, ICurrentUser currentUser, AccountManager accountManager, IRepository<MenuEntity> menuRepository, SmsAliyunManager smsAliyunManager, IOptions<SmsAliyunOptions> smsAliyunManagerOptions, SecurityCodeHelper securityCode, IMemoryCache memoryCache, IEventPublisher eventPublisher, IHttpContextAccessor httpContextAccessor,IOptions<JWTSettingsOptions> jwtOptions) =>
(_userRepository, _currentUser, _accountManager, _menuRepository, _smsAliyunManager, _smsAliyunManagerOptions, _securityCode, _memoryCache, _eventPublisher, _httpContextAccessor, _jwtOptions) =
(userRepository, currentUser, accountManager, menuRepository, smsAliyunManager, smsAliyunManagerOptions, securityCode, memoryCache, eventPublisher, httpContextAccessor, jwtOptions);
private IOptions<JWTSettingsOptions> _jwtOptions;
private IUserRepository _userRepository { get; set; }
@@ -144,7 +145,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
//创建token
var accessToken = JWTEncryption.Encrypt(_accountManager.UserInfoToClaim(userInfo));
var accessToken = JWTEncryption.Encrypt(_accountManager.UserInfoToClaim(userInfo), _jwtOptions.Value.ExpiredTime);
return new { Token = accessToken };
}