wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-08-04 11:41:32 +08:00
parent 772ca35dc1 987d4ac652
commit 39c445fca0
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/Tnb.OAuth/OAuthService.cs
View File

@@ -392,9 +392,6 @@ public class OAuthService : IDynamicApiController, ITransient
var userId = _userManager.UserId ?? "admim"; var userId = _userManager.UserId ?? "admim";
var httpContext = _httpContextAccessor.HttpContext; var httpContext = _httpContextAccessor.HttpContext;
httpContext.SignoutToSwagger(); httpContext.SignoutToSwagger();
//用户退出时停止Wms定时任务 modify by ly on 20230804
var timedTaskService = ActivatorUtilities.CreateInstance<TimedTaskBackgroundService>(httpContext.RequestServices);
await timedTaskService.StopAsync(CancellationToken.None);
// 清除IM中的webSocket // 清除IM中的webSocket
var list = await GetOnlineUserList(tenantId); var list = await GetOnlineUserList(tenantId);
@@ -680,13 +677,6 @@ public class OAuthService : IDynamicApiController, ITransient
} }
} }
} }
//启动Wms定时服务 modify by ly on 20230804
//var conditionalBackgroundService = App.GetRequiredService<ConditionalBackgroundService>();
//await conditionalBackgroundService.StartAsync(CancellationToken.None);
var httpContext = _httpContextAccessor.HttpContext;
var timedTaskService = ActivatorUtilities.CreateInstance<TimedTaskBackgroundService>(httpContext.RequestServices);
await timedTaskService.StartAsync(default);
return new return new
{ {
theme = user.Theme == null ? "classic" : user.Theme, theme = user.Theme == null ? "classic" : user.Theme,