From 4bc0e18b94a2bf17c1b7277910d63ef82fbe616a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 09:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
index 15b0ead..4ad30c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
@@ -9,6 +9,7 @@
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.Extensions;
using WIDESEA_Core.Helper;
using ICacheService = WIDESEA_Core.Caches.ICacheService;
@@ -46,21 +47,19 @@
public string GetToken()
{
- string token = _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
+ string token = "";
+ token = _cacheService.Get(UserId.ToString());
+ if (!string.IsNullOrEmpty(token)) { return token; }
+ token = _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
if (!token.IsNullOrEmpty())
{
return token;
}
- //if (_accessor.HttpContext?.IsSuccessSwagger() == true)
+ //if (_accessor.HttpContext?.IsSuccessSwagger() ?? false)
//{
// token = _accessor.HttpContext.GetSuccessSwaggerJwt();
// if (token.IsNotEmptyOrNull())
// {
- // //UserInfo userInfo = JwtHelper.SerializeJwt(token);
- // //if (userInfo.UserId > 0)
- // //{
- // // return token;
- // //}
// List<Claim> claims1 = _accessor.HttpContext.User.Claims.ToList();
// if (_accessor.HttpContext.User.Claims.Any(s => s.Type == JwtRegisteredClaimNames.Jti))
// {
@@ -72,8 +71,6 @@
// return token;
// }
//}
- token = _cacheService.Get(UserId.ToString());
- if (!string.IsNullOrEmpty(token)) { return token; }
return token;
// string token = _cacheService.Get(UserId.ToString());
--
Gitblit v1.9.3