From 1cefb51aa9379607f6c9109c52d127be7611043f Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Sep 2023 11:01:18 +0800 Subject: [PATCH] 1 --- WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 1 + system/Tnb.OAuth/OAuthService.cs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index 85731617..4be44c46 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -83,6 +83,7 @@ namespace Tnb.WarehouseMgr protected Task GetUserIdentity(string? asscessToken = null) { + asscessToken = asscessToken.Replace("Bearer ", "").Replace("bearer ", ""); var at = asscessToken ?? UserManager.AsscessToken; var claims = JWTEncryption.ReadJwtToken(at)?.Claims; ClaimsIdentity toKen = new ClaimsIdentity(); diff --git a/system/Tnb.OAuth/OAuthService.cs b/system/Tnb.OAuth/OAuthService.cs index 186c6dd8..20d851ea 100644 --- a/system/Tnb.OAuth/OAuthService.cs +++ b/system/Tnb.OAuth/OAuthService.cs @@ -43,7 +43,7 @@ using JNPF.Extras.DatabaseAccessor.SqlSugar.Models; using Aop.Api.Domain; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using bf = System.Reflection.BindingFlags; +using bf = System.Reflection.BindingFlags; namespace JNPF.OAuth; @@ -296,7 +296,7 @@ public class OAuthService : IDynamicApiController, ITransient if (!userId.IsNullOrWhiteSpace()) { var isStartedProperty = _backgroundService.GetType().GetProperty("IsStarted"); - + if (isStartedProperty?.GetValue(_backgroundService) is bool isStarted && !isStarted) { CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); @@ -409,7 +409,9 @@ public class OAuthService : IDynamicApiController, ITransient //modify by ly on 20230918 - _backgroundService.PropertySetValue("IsStarted", false); + var isStartedProperty = _backgroundService.GetType().GetProperty("IsStarted"); + isStartedProperty?.SetValue(_backgroundService, false); + UserManager.AsscessToken = string.Empty; var tenantId = _userManager.TenantId ?? "default";