From 8cef0673dbca8fcb85571c2a18e83b38b4dbe4b1 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 14:01:08 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
index 232979c..f9d47e6 100644
--- a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
+++ b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
@@ -29,19 +29,25 @@
// 鐢熸垚 token
logier.AccessToken = JWTEncryption.Encrypt(new Dictionary<string, object>()
{
- { "UserInfoId", logier.UserInfoId },
+ { "Id", logier.Id },
{ "Avatar",logier.Avatar },
{ "Name",logier.Name },
{ "UserName",logier.UserName },
{ "PhoneNumber",logier.PhoneNumber },
{ "Level",logier.Level },
+ { "Type",logier.Type },
+ { "ClientType",logier.ClientType },
+ { "EnterpriseId",logier.EnterpriseId },
});
// 鑾峰彇鍒锋柊 token
logier.RefreshToken = JWTEncryption.GenerateRefreshToken(logier.AccessToken, 60 * 24);
// 璁剧疆鍝嶅簲鎶ユ枃澶�
- httpContextAccessor.HttpContext.Response.Headers["access-token"] = logier.AccessToken;
- httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = logier.RefreshToken;
+ if (httpContextAccessor.HttpContext != null)
+ {
+ httpContextAccessor.HttpContext.Response.Headers["access-token"] = logier.AccessToken;
+ httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = logier.RefreshToken;
+ }
}
/// <summary>
@@ -53,13 +59,15 @@
if (App.User != null && App.User.Identity.IsAuthenticated)
{
var logier = new CurrentLogier();
- if (Guid.TryParse(App.User?.FindFirstValue("UserInfoId"), out var userInfoId)) logier.UserInfoId = userInfoId;
- else return null;
- logier.Level = App.User?.FindFirstValue("Level")?.ToInt() ?? 0;
- logier.Avatar = App.User?.FindFirstValue("Avatar");
- logier.Name = App.User?.FindFirstValue("Name");
- logier.UserName = App.User?.FindFirstValue("UserName");
- logier.PhoneNumber = App.User?.FindFirstValue("PhoneNumber");
+ logier.Id = App.User.FindFirstValue("Id").ToGuid("缂哄け鐢ㄦ埛Id锛岃閲嶆柊鐧诲綍").Value;
+ logier.Level = App.User.FindFirstValue("Level")?.ToInt() ?? 0;
+ logier.Avatar = App.User.FindFirstValue("Avatar");
+ logier.Name = App.User.FindFirstValue("Name");
+ logier.UserName = App.User.FindFirstValue("UserName");
+ logier.PhoneNumber = App.User.FindFirstValue("PhoneNumber");
+ logier.Type = App.User.FindFirstValue("Type").ToEnum<EnumUserType>("缂哄け鐢ㄦ埛绫诲瀷锛岃閲嶆柊鐧诲綍").Value;
+ logier.ClientType = App.User.FindFirstValue("ClientType").ToEnum<EnumClientType>("缂哄け瀹㈡埛绔被鍨嬶紝璇烽噸鏂扮櫥褰�").Value;
+ logier.EnterpriseId = App.User.FindFirstValue("EnterpriseId").ToGuid();
return logier;
}
return null;
--
Gitblit v1.9.1