升级admin2.2.0

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.json

@@ -3,14 +3,12 @@
     "id": 161223411986501,
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A33112",
-    "nickName": "管理员",
-    "avatar": "",
-    "remark": ""
+    "name": "管理员"
   },
   {
     "id": 162605614280773,
     "userName": "user",
     "password": "96E79218965EB72C92A549DD5A33112",
-    "nickName": "员工"
+    "name": "员工"
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.tenant.json

@@ -4,22 +4,20 @@
     "id": 161223411986501,
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A33112",
-    "nickName": "管理员",
-    "avatar": "",
-    "remark": ""
+    "name": "管理员"
   },
   {
     "tenantId": 162083448455237,
     "id": 162083448746053,
     "userName": "18988889999",
     "password": "96E79218965EB72C92A549DD5A33112",
-    "nickName": "租户"
+    "name": "租户"
   },
   {
     "tenantId": 161223412138053,
     "id": 162605614280773,
     "userName": "user",
     "password": "96E79218965EB72C92A549DD5A33112",
-    "nickName": "员工"
+    "name": "员工"
   }
 ]

src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -39,4 +39,6 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
+
+	<ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
 </Project>

src/platform/ZhonTai.Admin/Core/Auth/ClaimAttributes.cs

@@ -13,12 +13,12 @@ public static class ClaimAttributes
     /// <summary>
     /// 用户名
     /// </summary>
-    public const string UserName = "na";
+    public const string UserName = "un";
 
     /// <summary>
     /// 姓名
     /// </summary>
-    public const string UserNickName = "nn";
+    public const string Name = "na";
 
     /// <summary>
     /// 刷新有效期

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -9,19 +9,19 @@ namespace ZhonTai.Admin.Core.Auth;
 public interface IUser
 {
     /// <summary>
-    /// 主键
+    /// 用户Id
     /// </summary>
     long Id { get; }
 
     /// <summary>
     /// 用户名
     /// </summary>
-    string Name { get; }
+    string UserName { get; }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    string NickName { get; }
+    string Name { get; }
 
     /// <summary>
     /// 租户Id
@@ -34,7 +34,7 @@ public interface IUser
     TenantType? TenantType { get; }
 
     /// <summary>
-    /// 数据隔离
+    /// 数据隔离类型
     /// </summary>
     DataIsolationType? DataIsolationType { get; }
 }

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -36,7 +36,7 @@ public class User : IUser
     /// <summary>
     /// 用户名
     /// </summary>
-    public string Name
+    public string UserName
     {
         get
         {
@@ -52,13 +52,13 @@ public class User : IUser
     }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    public string NickName
+    public string Name
     {
         get
         {
-            var name = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.UserNickName);
+            var name = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.Name);
 
             if (name != null && name.Value.NotNull())
             {
@@ -102,7 +102,7 @@ public class User : IUser
     }
 
     /// <summary>
-    /// 数据隔离
+    /// 数据隔离类型
     /// </summary>
     public virtual DataIsolationType? DataIsolationType
     {

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -163,7 +163,7 @@ public class DbHelper
                 case "CreatedUserName":
                     if (e.Value == null || ((string)e.Value).IsNull())
                     {
-                        e.Value = user.Name;
+                        e.Value = user.UserName;
                     }
                     break;
 
@@ -184,7 +184,7 @@ public class DbHelper
                     break;
 
                 case "ModifiedUserName":
-                    e.Value = user.Name;
+                    e.Value = user.UserName;
                     break;
             }
         }

src/platform/ZhonTai.Admin/Core/Logs/LogHandler.cs

@@ -56,8 +56,8 @@ public class LogHandler : ILogHandler
 
             if (actionExecutedContext.Result is ObjectResult result && result.Value is IResultOutput res)
             {
-                input.Status = res.Success;
-                input.Msg = res.Msg;
+                input.Status = res?.Success;
+                input.Msg = res?.Msg;
             }
 
             input.ApiLabel = _apiHelper.GetApis().FirstOrDefault(a => a.Path == input.ApiPath)?.Label;

src/platform/ZhonTai.Admin/Core/Repositories/RepositoryBase.cs

@@ -38,7 +38,7 @@ namespace ZhonTai.Admin.Core.Repositories
                 {
                     IsDeleted = true,
                     ModifiedUserId = User.Id,
-                    ModifiedUserName = User.Name
+                    ModifiedUserName = User.UserName
                 })
                 .WhereDynamic(id)
                 .ExecuteAffrowsAsync();
@@ -53,7 +53,7 @@ namespace ZhonTai.Admin.Core.Repositories
                 {
                     IsDeleted = true,
                     ModifiedUserId = User.Id,
-                    ModifiedUserName = User.Name
+                    ModifiedUserName = User.UserName
                 })
                 .WhereDynamic(ids)
                 .ExecuteAffrowsAsync();
@@ -68,7 +68,7 @@ namespace ZhonTai.Admin.Core.Repositories
                 {
                     IsDeleted = true,
                     ModifiedUserId = User.Id,
-                    ModifiedUserName = User.Name
+                    ModifiedUserName = User.UserName
                 })
                 .Where(exp)
                 .DisableGlobalFilter(disableGlobalFilterNames)
@@ -100,7 +100,7 @@ namespace ZhonTai.Admin.Core.Repositories
             {
                 IsDeleted = true,
                 ModifiedUserId = User.Id,
-                ModifiedUserName = User.Name
+                ModifiedUserName = User.UserName
             })
             .ExecuteAffrowsAsync();
 

src/platform/ZhonTai.Admin/Domain/LogAbstract/LogAbstract.cs

@@ -15,10 +15,10 @@ public abstract class LogAbstract : EntityAdd, ITenant
     public long? TenantId { get; set; }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
     [Column(StringLength = 60)]
-    public string NickName { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// IP

src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs

@@ -1,7 +1,7 @@
-using ZhonTai.Admin.Core.Entities;
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
+using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.UserRole;

src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -1,8 +1,20 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
+using System.Text;
+using System.Security.Claims;
 using System.Threading.Tasks;
+using StackExchange.Profiling;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.IdentityModel.JsonWebTokens;
+using ZhonTai.Admin.Core.Auth;
+using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Core.Configs;
-using ZhonTai.Common.Helpers;
+using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Domain.Permission;
 using ZhonTai.Admin.Domain.User;
@@ -11,25 +23,13 @@ using ZhonTai.Admin.Services.Auth.Dto;
 using ZhonTai.Admin.Domain.RolePermission;
 using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Tools.Captcha;
-using ZhonTai.DynamicApi;
-using ZhonTai.DynamicApi.Attributes;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors;
-using StackExchange.Profiling;
-using Microsoft.AspNetCore.Mvc;
-using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Services.LoginLog.Dto;
-using System.Diagnostics;
 using ZhonTai.Admin.Services.LoginLog;
-using ZhonTai.Admin.Core.Auth;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using ZhonTai.Common.Extensions;
 using ZhonTai.Admin.Services.User;
-using ZhonTai.Admin.Core.Consts;
-using System.Text;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.JsonWebTokens;
+using ZhonTai.Common.Extensions;
+using ZhonTai.Common.Helpers;
+using ZhonTai.DynamicApi;
+using ZhonTai.DynamicApi.Attributes;
 
 namespace ZhonTai.Admin.Services.Auth;
 
@@ -79,7 +79,7 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
         {
             new Claim(ClaimAttributes.UserId, user.Id.ToString()),
             new Claim(ClaimAttributes.UserName, user.UserName),
-            new Claim(ClaimAttributes.UserNickName, user.NickName),
+            new Claim(ClaimAttributes.Name, user.Name),
             new Claim(ClaimAttributes.TenantId, user.TenantId.ToString()),
             new Claim(ClaimAttributes.TenantType, user.TenantType.ToString()),
             new Claim(ClaimAttributes.DataIsolationType, user.DataIsolationType.ToString())
@@ -236,12 +236,12 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
 
         var loginLogAddInput = new LoginLogAddInput
         {
-            CreatedUserName = input.UserName,
+            TenantId = authLoginOutput.TenantId,
+            Name = authLoginOutput.Name,
             ElapsedMilliseconds = sw.ElapsedMilliseconds,
             Status = true,
             CreatedUserId = authLoginOutput.Id,
-            NickName = authLoginOutput.NickName,
-            TenantId = authLoginOutput.TenantId
+            CreatedUserName = input.UserName,
         };
 
         await LazyGetRequiredService<ILoginLogService>().AddAsync(loginLogAddInput);

src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthLoginOutput.cs

@@ -17,7 +17,7 @@ public class AuthLoginOutput
     /// <summary>
     /// 姓名
     /// </summary>
-    public string NickName { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Services/Cache/CacheService.cs

@@ -68,7 +68,7 @@ public class CacheService : BaseService, ICacheService, IDynamicApi
     /// <returns></returns>
     public async Task<IResultOutput> ClearAsync(string cacheKey)
     {
-        Logger.LogWarning($"{User.Id}.{User.Name}清除缓存[{cacheKey}]");
+        Logger.LogWarning($"{User.Id}.{User.UserName}清除缓存[{cacheKey}]");
         await Cache.DelByPatternAsync(cacheKey);
         return ResultOutput.Ok();
     }

src/platform/ZhonTai.Admin/Services/LoginLog/Dto/LoginLogAddInput.cs

@@ -11,9 +11,9 @@ public class LoginLogAddInput
     public long? TenantId { get; set; }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    public string NickName { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// IP

src/platform/ZhonTai.Admin/Services/OprationLog/Dto/OprationLogAddInput.cs

@@ -6,9 +6,9 @@
 public class OprationLogAddInput
 {
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    public string NickName { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// 接口名称

src/platform/ZhonTai.Admin/Services/OprationLog/OprationLogService.cs

@@ -76,7 +76,7 @@ public class OprationLogService : BaseService, IOprationLogService, IDynamicApi
             input.BrowserInfo = ua;
         }
 
-        input.NickName = User.NickName;
+        input.Name = User.Name;
         input.IP = IPHelper.GetIP(_context?.HttpContext?.Request);
 
         var entity = Mapper.Map<OprationLogEntity>(input);

src/platform/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Services.User.Dto;
 
@@ -20,14 +21,15 @@ public class UserAddInput
     public string Password { get; set; }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    public string NickName { get; set; }
+    [Required(ErrorMessage = "请输入姓名")]
+    public string Name { get; set; }
 
     /// <summary>
     /// 状态
     /// </summary>
-    public int Status { get; set; }
+    public UserStatusEnum Status { get; set; }
 
     /// <summary>
     /// 备注

src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateInput.cs

@@ -19,9 +19,9 @@ public partial class UserUpdateInput
     public string UserName { get; set; }
 
     /// <summary>
-    /// 昵称
+    /// 姓名
     /// </summary>
-    public string NickName { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// 状态

src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -1,6 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
 using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Admin.Core.Repositories;
@@ -17,9 +20,6 @@ using ZhonTai.Admin.Services.Auth.Dto;
 using ZhonTai.Admin.Services.User.Dto;
 using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 using ZhonTai.Admin.Core.Helpers;
 using ZhonTai.Admin.Core.Consts;
 

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -64,7 +64,7 @@
             用户名
             </summary>
         </member>
-        <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.UserNickName">
+        <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.Name">
             <summary>
             姓名
             </summary>
@@ -109,17 +109,17 @@
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.Id">
             <summary>
-            主键
+            用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.IUser.Name">
+        <member name="P:ZhonTai.Admin.Core.Auth.IUser.UserName">
             <summary>
             用户名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.IUser.NickName">
+        <member name="P:ZhonTai.Admin.Core.Auth.IUser.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.TenantId">
@@ -134,7 +134,7 @@
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.DataIsolationType">
             <summary>
-            数据隔离
+            数据隔离类型
             </summary>
         </member>
         <member name="T:ZhonTai.Admin.Core.Auth.PermissionHandler">
@@ -165,14 +165,14 @@
             用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.User.Name">
+        <member name="P:ZhonTai.Admin.Core.Auth.User.UserName">
             <summary>
             用户名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.User.NickName">
+        <member name="P:ZhonTai.Admin.Core.Auth.User.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.TenantId">
@@ -187,7 +187,7 @@
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.DataIsolationType">
             <summary>
-            数据隔离
+            数据隔离类型
             </summary>
         </member>
         <member name="T:ZhonTai.Admin.Core.BaseController">
@@ -2016,9 +2016,9 @@
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.LogAbstract.NickName">
+        <member name="P:ZhonTai.Admin.Domain.LogAbstract.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Domain.LogAbstract.IP">
@@ -3312,7 +3312,7 @@
             账号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthLoginOutput.NickName">
+        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthLoginOutput.Name">
             <summary>
             姓名
             </summary>
@@ -4260,9 +4260,9 @@
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.LoginLog.Dto.LoginLogAddInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.LoginLog.Dto.LoginLogAddInput.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.LoginLog.Dto.LoginLogAddInput.IP">
@@ -4404,9 +4404,9 @@
             添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.OprationLog.Dto.OprationLogAddInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.OprationLog.Dto.OprationLogAddInput.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.OprationLog.Dto.OprationLogAddInput.ApiLabel">
@@ -5733,9 +5733,9 @@
             密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Status">
@@ -5863,9 +5863,9 @@
             账号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.Name">
             <summary>
-            昵称
+            姓名
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.Status">