From 32288af3e5f12bc48d8360114c872fde5d9ff4a8 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 09:09:08 +0800
Subject: [PATCH] pref:优化

---
 FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
index 5f1f8ad..0743dc1 100644
--- a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
+++ b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs
@@ -29,7 +29,7 @@
             // 鐢熸垚 token
             logier.AccessToken = JWTEncryption.Encrypt(new Dictionary<string, object>()
             {
-                { "UserInfoId", logier.UserInfoId },
+                { "Id", logier.Id },
                 { "Avatar",logier.Avatar },
                 { "Name",logier.Name },
                 { "UserName",logier.UserName },
@@ -37,6 +37,7 @@
                 { "Level",logier.Level },
                 { "Type",logier.Type },
                 { "ClientType",logier.ClientType },
+                { "EnterpriseId",logier.EnterpriseId },
             });
             // 鑾峰彇鍒锋柊 token
             logier.RefreshToken = JWTEncryption.GenerateRefreshToken(logier.AccessToken, 60 * 24);
@@ -55,15 +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;
+                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.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