登录token信息补充

performance/Performance.Api/Controllers/AccountController.cs

-using FluentValidation.AspNetCore;
+using AngleSharp.Dom;
+using FluentValidation.AspNetCore;
+using MassTransit.Internals.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using Performance.DtoModels;
 using Performance.DtoModels.AppSettings;
 using Performance.EntityModels;
@@ -66,7 +69,7 @@ public ApiResponse<JwtToken> Login([FromBody] LoginRequest request)
             if (user == null)
                 return new ApiResponse<JwtToken>(ResponseType.Fail, "用户不存在");
 
-            var claims = new Claim[]
+            var claims = new List<Claim>
             {
                 new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
                 new Claim(JwtClaimTypes.Login, user.Login),
@@ -75,10 +78,19 @@ public ApiResponse<JwtToken> Login([FromBody] LoginRequest request)
                 new Claim(JwtClaimTypes.AppName, request.AppName ?? ""),
                 new Claim(JwtClaimTypes.Device, request.Device ?? ""),
                 new Claim(JwtClaimTypes.Department, user.Department ?? ""),
+                new Claim(JwtClaimTypes.AccountingUnit, user.Department ?? ""),
+                new Claim(JwtClaimTypes.JobNumber, user.Login ?? ""),
+                new Claim(JwtClaimTypes.PersonnelNumber, user.Login ?? ""),
                 new Claim(JwtClaimTypes.QuickLogin, EQuickLogin.NO.ToString()),
             };
+            var roles = _roleService.GetUserRole(user.UserID);
+            if (roles?.Any() == true)
+            {
+                var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>());
+                claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes)));
+            }
 
-            var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.ExpirationMinutes);
+            var jwtToken = JwtTokenHelper.GenerateToken(claims.ToArray(), _options.ExpirationMinutes);
             return new ApiResponse<JwtToken>(ResponseType.OK, jwtToken);
         }
 
@@ -96,7 +108,7 @@ public ApiResponse<JwtToken> QuickLogin([FromBody] ResetPwdRequest request)
             if (user == null)
                 return new ApiResponse<JwtToken>(ResponseType.Fail, "用户不存在");
 
-            var claims = new Claim[]
+            var claims = new List<Claim>
             {
                 new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
                 new Claim(JwtClaimTypes.Login, user.Login),
@@ -105,10 +117,18 @@ public ApiResponse<JwtToken> QuickLogin([FromBody] ResetPwdRequest request)
                 new Claim(JwtClaimTypes.AppName, request.AppName ?? ""),
                 new Claim(JwtClaimTypes.Device, request.Device ?? ""),
                 new Claim(JwtClaimTypes.Department, user.Department ?? ""),
+                new Claim(JwtClaimTypes.AccountingUnit, user.Department ?? ""),
+                new Claim(JwtClaimTypes.JobNumber, user.Login ?? ""),
+                new Claim(JwtClaimTypes.PersonnelNumber, user.Login ?? ""),
                 new Claim(JwtClaimTypes.QuickLogin, EQuickLogin.YES.ToString()),
             };
-
-            var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.ExpirationMinutes);
+            var roles = _roleService.GetUserRole(user.UserID);
+            if (roles?.Any() == true)
+            {
+                var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>());
+                claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes)));
+            }
+            var jwtToken = JwtTokenHelper.GenerateToken(claims.ToArray(), _options.ExpirationMinutes);
             return new ApiResponse<JwtToken>(ResponseType.OK, jwtToken);
         }
 
@@ -130,6 +150,10 @@ public ApiResponse<JwtToken> Refresh()
                 new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName)?.Value??""),
                 new Claim(JwtClaimTypes.Device, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device)?.Value??""),
                 new Claim(JwtClaimTypes.Department, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Department)?.Value??""),
+                new Claim(JwtClaimTypes.AccountingUnit, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AccountingUnit)?.Value??""),
+                new Claim(JwtClaimTypes.JobNumber, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.JobNumber)?.Value??""),
+                new Claim(JwtClaimTypes.PersonnelNumber, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.PersonnelNumber)?.Value??""),
+                new Claim(JwtClaimTypes.UnitType, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.UnitType)?.Value??""),
             };
 
             var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.ExpirationMinutes);
@@ -260,7 +284,7 @@ public ApiResponse<JwtToken> DemoUsers(int userId)
 
             var user = _userService.GetDemoUserIdentity(userId);
             var userClaim = _claim.GetUserClaim();
-            var claims = new Claim[]
+            var claims = new List<Claim>
             {
                 new Claim(JwtClaimTypes.Id, user.UserID.ToString()),
                 new Claim(JwtClaimTypes.Login, user.Login),
@@ -269,9 +293,17 @@ public ApiResponse<JwtToken> DemoUsers(int userId)
                 new Claim(JwtClaimTypes.AppName, userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.AppName)?.Value??""),
                 new Claim(JwtClaimTypes.Device,userClaim.FirstOrDefault(t => t.Type == JwtClaimTypes.Device)?.Value??""),
                 new Claim(JwtClaimTypes.Department, user.Department ?? ""),
+                new Claim(JwtClaimTypes.AccountingUnit, user.Department ?? ""),
+                new Claim(JwtClaimTypes.JobNumber, user.Login ?? ""),
+                new Claim(JwtClaimTypes.PersonnelNumber, user.Login ?? ""),
             };
-
-            var jwtToken = JwtTokenHelper.GenerateToken(claims, _options.ExpirationMinutes);
+            var roles = _roleService.GetUserRole(user.UserID);
+            if (roles?.Any() == true)
+            {
+                var unitTypes = UnitTypeUtil.Maps.GetOrAdd(roles.First().RoleID, (key) => Array.Empty<string>());
+                claims.Add(new Claim(JwtClaimTypes.UnitType, JsonConvert.SerializeObject(unitTypes)));
+            }
+            var jwtToken = JwtTokenHelper.GenerateToken(claims.ToArray(), _options.ExpirationMinutes);
             return new ApiResponse<JwtToken>(ResponseType.OK, jwtToken);
         }
 

performance/Performance.Api/Util/JwtToken.cs

@@ -98,6 +98,10 @@ public static class JwtClaimTypes
         public const string Mail = "mail";
         public const string AppName = "appname";
         public const string Device = "device";
+        public const string JobNumber = "jobnumber";
+        public const string PersonnelNumber = "personnelnumber";
+        public const string UnitType = "unittype";
+        public const string AccountingUnit = "accountingunit";
         public const string Department = "department";
         public const string QuickLogin = "quicklogin";
     }