From 87c64e644f69f97f581fffdc2a98cd207aeb69f7 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 15 Aug 2023 16:53:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/BaseWareHouseService.cs | 5 +++-- .../Tnb.WarehouseMgr/WmsSetSortingService.cs | 5 ++--- .../Tnb.WarehouseMgr/WmskittingOutService.cs | 16 ++++++++++------ system/Tnb.OAuth/OAuthService.cs | 5 +++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index a7cd8a08..86575a74 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -22,6 +22,7 @@ using JNPF.FriendlyException; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using NPOI.HSSF.UserModel; @@ -68,9 +69,9 @@ namespace Tnb.WarehouseMgr } } - protected Task GetUserIdentity(string aToken) + protected Task GetUserIdentity() { - var claims = JWTEncryption.ReadJwtToken(aToken)?.Claims; + var claims = JWTEncryption.ReadJwtToken(UserManager.AsscessToken)?.Claims; ClaimsIdentity toKen = new ClaimsIdentity(); foreach (Claim item in claims) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs index e519dfa0..317080a4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs @@ -61,9 +61,8 @@ namespace Tnb.WarehouseMgr [HttpPost, Timed(Name = nameof(PackSortingByAdd))] public async Task PackSortingByAdd(CancellationTokenSource? cts = default) { - var aToken = await _cacheManager.GetAsync("AccessToken"); - if (aToken.IsNullOrWhiteSpace()) return; - var curUser = await GetUserIdentity(aToken); + if (UserManager.AsscessToken.IsNullOrWhiteSpace()) return; + var curUser = await GetUserIdentity(); var curDb = _db.CopyNew(); string firstLocationId = "27010980724501", secondLocationId = "27010987857941"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 6a66e2f5..d2f68622 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -80,6 +80,8 @@ namespace Tnb.WarehouseMgr [HttpPost, Timed(Name = nameof(KittingOutByAdd))] public async Task KittingOutByAdd(CancellationTokenSource? cts = default) { + if (UserManager.AsscessToken.IsNullOrWhiteSpace()) return; + var curUser = await GetUserIdentity(); var curDb = _db.CopyNew(); try { @@ -133,8 +135,8 @@ namespace Tnb.WarehouseMgr setSortingH.id = SnowflakeIdHelper.NextId(); setSortingH.kittingout_id = ko.id; setSortingH.seq = ko.seq; - setSortingH.org_id = _userManager.User.OrganizeId; - setSortingH.create_id = _userManager.UserId; + setSortingH.org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value; + setSortingH.create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)!.Value; setSortingH.create_time = DateTime.Now; await curDb.Insertable(setSortingH).ExecuteCommandAsync(); @@ -145,8 +147,8 @@ namespace Tnb.WarehouseMgr x.id = SnowflakeIdHelper.NextId(); x.bill_id = setSortingH.id; x.warehouse_id = setSortingH.warehouse_id; - x.org_id = _userManager.User.OrganizeId; - x.create_id = _userManager.UserId; + x.org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value; + x.create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)!.Value; x.create_time = DateTime.Now; }); await curDb.Insertable(setSortDetails).ExecuteCommandAsync(); @@ -173,6 +175,8 @@ namespace Tnb.WarehouseMgr [HttpPost, Timed(Name = nameof(KittingOutByIsToBeShipped))] public async Task KittingOutByIsToBeShipped(CancellationTokenSource? cts = default) { + if (UserManager.AsscessToken.IsNullOrWhiteSpace()) return; + var curUser = await GetUserIdentity(); var curDb = _db.CopyNew(); try { @@ -211,7 +215,7 @@ namespace Tnb.WarehouseMgr WmsPretaskH preTask = new() { - org_id = _userManager.User.OrganizeId, + org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value, startlocation_id = sPoint?.location_id!, startlocation_code = sPoint?.location_code!, endlocation_id = ePoint?.location_id!, @@ -232,7 +236,7 @@ namespace Tnb.WarehouseMgr area_code = it.Key, require_id = ko.id, require_code = ko.bill_code, - create_id = _userManager.UserId, + create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)!.Value, create_time = DateTime.Now, source_id = ko.source_id, source_code = ko.source_code diff --git a/system/Tnb.OAuth/OAuthService.cs b/system/Tnb.OAuth/OAuthService.cs index a701c81b..9dd7f421 100644 --- a/system/Tnb.OAuth/OAuthService.cs +++ b/system/Tnb.OAuth/OAuthService.cs @@ -386,7 +386,7 @@ public class OAuthService : IDynamicApiController, ITransient [HttpGet("Logout")] public async Task Logout([FromQuery] string ticket) { - await _cacheManager.DelAsync("AsscessToken"); + //await _cacheManager.DelAsync("AsscessToken"); var tenantId = _userManager.TenantId ?? "default"; var userId = _userManager.UserId ?? "admim"; @@ -607,7 +607,8 @@ public class OAuthService : IDynamicApiController, ITransient }, tokenTimeout); //modify by ly on 20230804 - await _cacheManager.SetAsync("AsscessToken", accessToken, TimeSpan.FromMinutes(-1)); + UserManager.AsscessToken = accessToken; + //await _cacheManager.SetAsync("AsscessToken", accessToken, TimeSpan.FromMinutes(-1)); // 单点登录标识缓存 if (_oauthOptions.Enabled) _cacheManager.Set("OnlineTicket_" + input.online_ticket, options.ConfigId);