优化，升级Nuge包

Admin.Core.Common/Admin.Core.Common.csproj

@@ -5,18 +5,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSRedisCore" Version="3.5.1" />
+    <PackageReference Include="CSRedisCore" Version="3.5.5" />
     <PackageReference Include="FreeSql" Version="1.2.1" />
     <PackageReference Include="FreeSql.Provider.MySql" Version="1.2.1" />
     <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.2.1" />
     <PackageReference Include="FreeSql.Repository" Version="1.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
   </ItemGroup>
 
 </Project>

Admin.Core.Common/Auth/User.cs

@@ -51,6 +51,24 @@ namespace Admin.Core.Common.Auth
             }
         }
 
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string RealName
+        {
+            get
+            {
+                var name = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.UserRealName);
+
+                if (name != null && name.Value.NotNull())
+                {
+                    return name.Value;
+                }
+
+                return "";
+            }
+        }
+
 
         /// <summary>
         /// 用户IP
@@ -128,5 +146,10 @@ namespace Admin.Core.Common.Auth
         /// 用户名
         /// </summary>
         public const string UserName = "na";
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public const string UserRealName = "rna";
     }
 }

Admin.Core.Common/Cache/CacheKey.cs

@@ -18,7 +18,7 @@ namespace Admin.Core.Common.Cache
         /// 密码加密 admin:password:encrypt:guid
         /// </summary>
         [Description("密码加密")]
-        public const string PassWordEncryptKey = "admin:password:{0}";
+        public const string PassWordEncryptKey = "admin:password:encrypt:{0}";
 
         /// <summary>
         /// 用户权限 admin:user:用户主键:permissions

Admin.Core.Services/Admin/Auth/AuthService.cs

@@ -97,7 +97,8 @@ namespace Admin.Core.Service.Admin.Auth
             var claims = new[]
             {
                 new Claim(ClaimAttributes.UserId, user.Id.ToString()),
-                new Claim(ClaimAttributes.UserName, user.Name.IsNull()?user.NickName:user.Name)
+                new Claim(ClaimAttributes.UserName, user.UserName),
+                new Claim(ClaimAttributes.UserRealName, user.Name)
             };
             var token = _userToken.Build(claims);
 

Admin.Core.Services/Admin/Permission/Input/PermissionAssignInput.cs

@@ -1,10 +1,14 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace Admin.Core.Service.Admin.Permission.Input
 {
     public class PermissionAssignInput
     {
-        public List<int> PermissionIds { get; set; }
+        [Required(ErrorMessage = "角色不能为空！")]
         public int RoleId { get; set; }
+
+        [Required(ErrorMessage = "权限不能为空！")]
+        public List<int> PermissionIds { get; set; }
     }
 }

Admin.Core.Services/Admin/Permission/PermissionService.cs

@@ -159,11 +159,6 @@ namespace Admin.Core.Service.Admin.Permission
         [Transaction]
         public async Task<IResponseOutput> AssignAsync(PermissionAssignInput input)
         {
-            if (!(input.RoleId > 0))
-            {
-                return ResponseOutput.NotOk("角色不能为空");
-            }
-
             //查询角色权限
             var permissionIds = await _rolePermissionRepository.Select.Where(d => d.RoleId == input.RoleId).ToListAsync(m=>m.PermissionId);
 

Admin.Core.Services/Admin/User/Input/UserAddInput.cs

@@ -23,6 +23,7 @@ namespace Admin.Core.Service.Admin.User.Input
         /// <summary>
         /// 姓名
         /// </summary>
+        [Required(ErrorMessage = "请输入姓名")]
         public string Name { get; set; }
 
         /// <summary>

Admin.Core.Services/Admin/User/Input/UserChangePasswordInput.cs

@@ -1,4 +1,5 @@
 using Admin.Core.Model;
+using System.ComponentModel.DataAnnotations;
 
 namespace Admin.Core.Service.Admin.User.Input
 {
@@ -7,26 +8,29 @@ namespace Admin.Core.Service.Admin.User.Input
     /// </summary>
     public class UserChangePasswordInput: Entity
     {
-        /// <summary>
-        /// 密码
-        /// </summary>
-        public string Password { get; set; }
-
         /// <summary>
         /// 旧密码
         /// </summary>
+        [Required(ErrorMessage = "请输入旧密码")]
         public string OldPassword { get; set; }
 
         /// <summary>
         /// 新密码
         /// </summary>
+        [Required(ErrorMessage = "请输入新密码")]
         public string NewPassword { get; set; }
 
         /// <summary>
         /// 确认新密码
         /// </summary>
+        [Required(ErrorMessage = "请输入确认新密码")]
         public string ConfirmPassword { get; set; }
 
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password { get; set; }
+
         /// <summary>
         /// 版本
         /// </summary>

Admin.Core.Services/Admin/User/Input/UserUpdateInput.cs

@@ -1,4 +1,6 @@
 
+using System.ComponentModel.DataAnnotations;
+
 namespace Admin.Core.Service.Admin.User.Input
 {
     /// <summary>
@@ -14,11 +16,13 @@ namespace Admin.Core.Service.Admin.User.Input
         /// <summary>
         /// 账号
         /// </summary>
+        [Required(ErrorMessage = "请输入账号")]
         public string UserName { get; set; }
 
         /// <summary>
         /// 姓名
         /// </summary>
+        [Required(ErrorMessage = "请输入姓名")]
         public string Name { get; set; }
 
         /// <summary>

Admin.Core/Admin.Core.Service.xml

@@ -675,11 +675,6 @@
             修改密码
             </summary>
         </member>
-        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
         <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.OldPassword">
             <summary>
             旧密码
@@ -695,6 +690,11 @@
             确认新密码
             </summary>
         </member>
+        <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
         <member name="P:Admin.Core.Service.Admin.User.Input.UserChangePasswordInput.Version">
             <summary>
             版本

Admin.Core/Admin.Core.csproj

@@ -35,10 +35,10 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.2.1" />
 
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
     <PackageReference Include="NLog" Version="4.7.0" />

Admin.Core/Controllers/Admin/CacheController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Admin.Core.Model.Output;
 using Admin.Core.Service.Admin.Cache;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Admin.Core.Controllers.Admin
 {

Admin.Core/Controllers/Admin/PermissionController.cs

@@ -124,7 +124,7 @@ namespace Admin.Core.Controllers.Admin
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPut]
         public async Task<IResponseOutput> UpdateGroup(PermissionUpdateGroupInput input)
         {
             return await _permissionServices.UpdateGroupAsync(input);
@@ -135,7 +135,7 @@ namespace Admin.Core.Controllers.Admin
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPut]
         public async Task<IResponseOutput> UpdateMenu(PermissionUpdateMenuInput input)
         {
             return await _permissionServices.UpdateMenuAsync(input);
@@ -146,7 +146,7 @@ namespace Admin.Core.Controllers.Admin
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPut]
         public async Task<IResponseOutput> UpdateApi(PermissionUpdateApiInput input)
         {
             return await _permissionServices.UpdateApiAsync(input);

Admin.Core/Db/DbHelper.cs

@@ -142,10 +142,10 @@ namespace Admin.Core.Db
                 switch (e.Property.Name)
                 {
                     case "CreatedUserId":
-                        e.Value = 1;
+                        e.Value = 2;
                         break;
                     case "CreatedUserName":
-                        e.Value = "小雪转中雪";
+                        e.Value = "xiaoxue";
                         break;
                 }
             }
@@ -154,10 +154,10 @@ namespace Admin.Core.Db
                 switch (e.Property.Name)
                 {
                     case "ModifiedUserId":
-                        e.Value = 1;
+                        e.Value = 2;
                         break;
                     case "ModifiedUserName":
-                        e.Value = "小雪转中雪";
+                        e.Value = "xiaoxue";
                         break;
                 }
             }