Explorar el Código

优化用户更新基本信息和修改密码方法

zhontai hace 2 años
padre
commit
7bff107500

+ 2 - 2
src/hosts/ZhonTai.Host/InitData/Admin/ad_permission.json

@@ -34,7 +34,7 @@
         "type": 1,
         "path": "/platform/auth",
         "redirect": "/platform/auth/user",
-        "icon": "iconfont icon-quanxian",
+        "icon": "iconfont icon-zidingyibuju",
         "opened": true,
         "isKeepAlive": true,
         "sort": 2,
@@ -863,7 +863,7 @@
             "viewId": 161227168456774,
             "name": "admin/doc",
             "path": "/platform/system/document",
-            "icon": "ele-Folder",
+            "icon": "iconfont icon-gongju",
             "opened": true,
             "external": true,
             "isKeepAlive": true,

+ 2 - 3
src/platform/ZhonTai.Admin/Services/User/Dto/UserChangePasswordInput.cs

@@ -1,12 +1,11 @@
-using ZhonTai.Admin.Core.Entities;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace ZhonTai.Admin.Services.User.Dto;
 
 /// <summary>
 /// 修改密码
 /// </summary>
-public class UserChangePasswordInput : Entity
+public class UserChangePasswordInput
 {
     /// <summary>
     /// 旧密码

+ 1 - 1
src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateBasicInput.cs

@@ -6,7 +6,7 @@ namespace ZhonTai.Admin.Services.User.Dto;
 /// <summary>
 /// 更新基本信息
 /// </summary>
-public class UserUpdateBasicInput : Entity
+public class UserUpdateBasicInput
 {
     /// <summary>
     /// 姓名

+ 2 - 2
src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -505,7 +505,7 @@ public partial class UserService : BaseService, IUserService, IDynamicApi
     [Login]
     public async Task UpdateBasicAsync(UserUpdateBasicInput input)
     {
-        var entity = await _userRepository.GetAsync(input.Id);
+        var entity = await _userRepository.GetAsync(User.Id);
         entity = Mapper.Map(input, entity);
         await _userRepository.UpdateAsync(entity);
     }
@@ -523,7 +523,7 @@ public partial class UserService : BaseService, IUserService, IDynamicApi
             throw ResultOutput.Exception("新密码和确认密码不一致");
         }
 
-        var entity = await _userRepository.GetAsync(input.Id);
+        var entity = await _userRepository.GetAsync(User.Id);
         var oldPassword = MD5Encrypt.Encrypt32(input.OldPassword);
         if (oldPassword != entity.Password)
         {

+ 4 - 2
src/platform/ZhonTai.Common/ZhonTai.Common.xml

@@ -333,18 +333,20 @@
             </code>
             </remarks>
         </member>
-        <member name="M:ZhonTai.Common.Helpers.DataMaskHelper.PhoneMask(System.String)">
+        <member name="M:ZhonTai.Common.Helpers.DataMaskHelper.PhoneMask(System.String,System.String)">
             <summary>
             手机号脱敏
             </summary>
             <param name="input"></param>
+            <param name="mask"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Common.Helpers.DataMaskHelper.EmailMask(System.String)">
+        <member name="M:ZhonTai.Common.Helpers.DataMaskHelper.EmailMask(System.String,System.String)">
             <summary>
             邮箱脱敏
             </summary>
             <param name="input"></param>
+            <param name="mask"></param>
             <returns></returns>
         </member>
         <member name="T:ZhonTai.Common.Helpers.DesEncrypt">