1

system/Tnb.OAuth/OAuthService.cs

@@ -42,6 +42,8 @@ using JNPF.Message.Interfaces.Message;
 using JNPF.Extras.DatabaseAccessor.SqlSugar.Models;
 using Aop.Api.Domain;
 using Tnb.WarehouseMgr;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace JNPF.OAuth;
 
@@ -141,6 +143,8 @@ public class OAuthService : IDynamicApiController, ITransient
 
     private readonly IMHandler _imHandler;
 
+    
+
     /// <summary>
     /// 初始化一个<see cref="OAuthService"/>类型的新实例.
     /// </summary>
@@ -383,14 +387,14 @@ public class OAuthService : IDynamicApiController, ITransient
     [HttpGet("Logout")]
     public async Task Logout([FromQuery] string ticket)
     {
-        //用户退出时停止Wms定时任务 modify by ly on 20230804
-        var conditionalBackgroundService = App.GetRequiredService<ConditionalBackgroundService>();
-        await conditionalBackgroundService.StopAsync(CancellationToken.None);
 
         var tenantId = _userManager.TenantId ?? "default";
         var userId = _userManager.UserId ?? "admim";
         var httpContext = _httpContextAccessor.HttpContext;
         httpContext.SignoutToSwagger();
+        //用户退出时停止Wms定时任务 modify by ly on 20230804
+        var timedTaskService = ActivatorUtilities.CreateInstance<TimedTaskBackgroundService>(httpContext.RequestServices);
+        await timedTaskService.StopAsync(CancellationToken.None);
 
         // 清除IM中的webSocket
         var list = await GetOnlineUserList(tenantId);
@@ -678,9 +682,11 @@ public class OAuthService : IDynamicApiController, ITransient
         }
 
         //启动Wms定时服务 modify by ly on 20230804
-        var conditionalBackgroundService = App.GetRequiredService<ConditionalBackgroundService>();
-        await conditionalBackgroundService.StartAsync(CancellationToken.None);
-
+        //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
         {
             theme = user.Theme == null ? "classic" : user.Theme,