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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-09-19 09:21:59 +08:00
parent a80a6fb0bf 767076a513
commit b9e9636d72
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ using Aop.Api.Domain;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using bf = System.Reflection.BindingFlags; using bf = System.Reflection.BindingFlags;
using System.Linq.Expressions;
namespace JNPF.OAuth; namespace JNPF.OAuth;
@@ -145,6 +146,7 @@ public class OAuthService : IDynamicApiController, ITransient
private readonly BackgroundService _backgroundService; //added by ly on 20230916 private readonly BackgroundService _backgroundService; //added by ly on 20230916
private static CancellationTokenSource stopTimedTaskSvcCTS = new(); private static CancellationTokenSource stopTimedTaskSvcCTS = new();
private static Dictionary<string, Func<BackgroundService, object>> _fetchPropValue = new();
/// <summary> /// <summary>
@@ -295,14 +297,25 @@ public class OAuthService : IDynamicApiController, ITransient
if (!userId.IsNullOrWhiteSpace()) if (!userId.IsNullOrWhiteSpace())
{ {
var isStartedProperty = _backgroundService.GetType().GetProperty("IsStarted"); var isStartedProperty = _backgroundService.GetType().GetProperty("IsStarted");
//if (!_fetchPropValue.TryGetValue("IsStarted", out var action))
//{
// var isStartedProp = _backgroundService.GetType().GetProperty("IsStarted");
// var paramExp = Expression.Parameter(typeof(BackgroundService), "_backgroundSvc");
// var propExp = Expression.Property(paramExp, isStartedProp);
// var body = Expression.Lambda<Func<BackgroundService, object>>(propExp, paramExp);
// action = body.Compile();
// _fetchPropValue["IsStarted"] = action;
//}
//if(!action?.Invoke(_backgroundService)?.ParseToBool() ?? false)
//{
// await _backgroundService.StartAsync(stopTimedTaskSvcCTS.Token);
//}
if (isStartedProperty?.GetValue(_backgroundService) is bool isStarted && !isStarted) if (isStartedProperty?.GetValue(_backgroundService) is bool isStarted && !isStarted)
{ {
await _backgroundService.StartAsync(stopTimedTaskSvcCTS.Token); await _backgroundService.StartAsync(stopTimedTaskSvcCTS.Token);
} }
} }
var loginOutput = new CurrentUserOutput(); var loginOutput = new CurrentUserOutput();
loginOutput.userInfo = await _userManager.GetUserInfo(); loginOutput.userInfo = await _userManager.GetUserInfo();