From 61aad62d817ddb6494f52a531fccb7e82bcfd13c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 17:39:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
index 97b22f9..0743dc1 100644
--- a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
+++ b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
@@ -29,14 +29,18 @@
// 鐢熸垚 token
logier.AccessToken = JWTEncryption.Encrypt(new Dictionary<string, object>()
{
- { "UserInfoId", logier.UserInfoId },
- { "Avatar",logier.AvatarId },
+ { "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);
+ logier.RefreshToken = JWTEncryption.GenerateRefreshToken(logier.AccessToken, 60 * 24);
// 璁剧疆鍝嶅簲鎶ユ枃澶�
httpContextAccessor.HttpContext.Response.Headers["access-token"] = logier.AccessToken;
@@ -52,13 +56,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;
- if (Guid.TryParse(App.User?.FindFirstValue("AvatarId"), out var avatarId)) logier.AvatarId = avatarId;
- else return null;
- 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