gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🍒 fix(Login): 修复token黑名单导致无法登陆的问题

Browse Source
This commit is contained in:
喵你个汪呀 2025-08-28 10:32:06 +08:00
parent 3f37395e15
commit 0eb4e6c351
9 changed files with 1656 additions and 1607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -90,5 +90,4 @@
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.8" />
<PackageReference Include="My.Extensions.Localization.Json" Version="3.4.0" />
</ItemGroup>
</Project>

47
Admin.NET/Admin.NET.Core/Job/SysDailyJob.cs Normal file
View File

@ -0,0 +1,47 @@
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
//
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
namespace Admin.NET.Core;
/// <summary>
/// 系统每日作业任务（每天 00:00:00 执行）
/// </summary>
[JobDetail("job_daily", Description = "系统每日作业任务", GroupName = "default", Concurrent = false)]
[Daily(TriggerId = "trigger_daily", Description = "系统每日作业任务")]
public class SysDailyJob(IServiceScopeFactory serviceScopeFactory) : IJob
{
public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
{
using var serviceScope = serviceScopeFactory.CreateScope();
var db = serviceScope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew();
var sysConfigService = serviceScope.ServiceProvider.GetRequiredService<SysConfigService>();
// 日志保留天数
var daysAgo = await sysConfigService.GetConfigValueByCode<int>(ConfigConst.SysLogRetentionDays);
// 删除访问日志
await db.Deleteable<SysLogVis>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken);
// 删除操作日志
await db.Deleteable<SysLogOp>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken);
// 删除差异日志
await db.Deleteable<SysLogDiff>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken);
// 删除作业触发器运行记录
await db.Deleteable<SysJobTriggerRecord>().Where(u => u.CreatedTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken);
var originColor = Console.ForegroundColor;
Console.ForegroundColor = ConsoleColor.Green;
var message = $"【定时任务】清理系统日志成功，清理 {daysAgo} 天前的日志数据 {DateTime.Now}";
Console.WriteLine(message);
Log.Information(message);
Console.ForegroundColor = originColor;
// 重置用户Token版本号
serviceScope.ServiceProvider.GetRequiredService<SysUserService>().ResetTokenVersion();
message = $"【启动任务】重置用户Token版本号 {DateTime.Now}";
Console.WriteLine(message);
Log.Information(message);
}
}

2
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -262,12 +262,14 @@ public class SysAuthService : IDynamicApiController, ITransient
// ke.global.setAllHeader('Authorization', 'Bearer ' + ke.response.headers['access-token']);
// 更新用户登录信息
user.TokenVersion += 1;
user.LastLoginIp = _httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(true);
(user.LastLoginAddress, double? longitude, double? latitude) = CommonHelper.GetIpAddress(user.LastLoginIp);
user.LastLoginTime = DateTime.Now;
user.LastLoginDevice = CommonHelper.GetClientDeviceInfo(_httpContextAccessor.HttpContext?.Request?.Headers?.UserAgent);
await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new
{
u.TokenVersion,
u.LastLoginIp,
u.LastLoginAddress,
u.LastLoginTime,

2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
View File

@ -35,7 +35,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
{
return await _sysDictDataRep.AsQueryable()
.Where(u => u.DictTypeId == input.DictTypeId)
.WhereIF(!string.IsNullOrEmpty(input.Value?.Trim()), u => u.Code.Contains(input.Value))
.WhereIF(!string.IsNullOrEmpty(input.Value?.Trim()), u => u.Code.Contains(input.Value))
.WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code))
.WhereIF(!string.IsNullOrEmpty(input.Label?.Trim()), u => u.Label.Contains(input.Label))
.OrderBy(u => new { u.OrderNo, u.Code })

12
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs
View File

@ -468,6 +468,18 @@ public class SysUserService : IDynamicApiController, ITransient
return await _sysUserExtOrgService.GetUserExtOrgList(userId);
}
/// <summary>
/// 重置用户Token版本
/// </summary>
[NonAction]
public void ResetTokenVersion()
{
_sysUserRep.AsUpdateable()
.Where(u => u.TokenVersion > int.MaxValue / 2)
.UpdateColumns(u => u.TokenVersion)
.ExecuteCommand();
}
/// <summary>
/// 强制下线账号和失效Token
/// </summary>

13
Admin.NET/Admin.NET.Web.Core/Handlers/JwtHandler.cs
View File

@ -70,10 +70,7 @@ namespace Admin.NET.Web.Core
return;
}
// 验证Token版本号
var tokenVersion1 = httpContext.User.FindFirst(ClaimConst.TokenVersion)?.Value;
var tokenVersion2 = sysCacheService.Get<string>($"{CacheConst.KeyUserToken}{userId}");
if (string.IsNullOrWhiteSpace(tokenVersion2) && !string.IsNullOrWhiteSpace(userId))
if (!string.IsNullOrWhiteSpace(userId))
{
// 查库并缓存用户Token版本
var user = await serviceScope.ServiceProvider.GetRequiredService<ISqlSugarClient>().Queryable<SysUser>().FirstAsync(u => u.Id == long.Parse(userId));
@ -85,14 +82,6 @@ namespace Admin.NET.Web.Core
return;
}
sysCacheService.Set($"{CacheConst.KeyUserToken}{user.Id}", $"{user.TokenVersion}");
tokenVersion2 = user.TokenVersion.ToString();
}
if (string.IsNullOrWhiteSpace(tokenVersion1) || tokenVersion1 != tokenVersion2)
{
context.Fail(new AuthorizationFailureReason(this, "令牌已失效，请重新登录。"));
context.StatusCode(StatusCodes.Status401Unauthorized);
context.GetCurrentHttpContext().SignoutToSwagger();
return;
}
// 验证租户有效期