소스 검색

修复Encrypt32丢失0的问题

zhontai 2 년 전
부모
커밋
05ff61bb99

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

@@ -49,5 +49,5 @@ public class UserAddInput
     /// <summary>
     /// 员工
     /// </summary>
-    public StaffAddInput Emp { get; set; }
+    public StaffAddInput Staff { get; set; }
 }

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

@@ -206,16 +206,16 @@ public class UserService : BaseService, IUserService, IDynamicApi
         }
 
         // 员工信息
-        var emp = Mapper.Map<StaffEntity>(input.Emp);
-        emp.Id = user.Id;
-        await _staffRepository.InsertAsync(emp);
+        var staff = Mapper.Map<StaffEntity>(input.Staff);
+        staff.Id = user.Id;
+        await _staffRepository.InsertAsync(staff);
 
         //所属部门
-        if (input.Emp.OrgIds != null && input.Emp.OrgIds.Any())
+        if (input.Staff.OrgIds != null && input.Staff.OrgIds.Any())
         {
-            var orgs = input.Emp.OrgIds.Select(orgId => new StaffOrgEntity
+            var orgs = input.Staff.OrgIds.Select(orgId => new StaffOrgEntity
             {
-                StaffId = emp.Id,
+                StaffId = staff.Id,
                 OrgId = orgId
             });
             await _staffOrgRepository.InsertAsync(orgs);

+ 1 - 1
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -5179,7 +5179,7 @@
             状态
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Emp">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Staff">
             <summary>
             员工
             </summary>

+ 7 - 4
src/platform/ZhonTai.Common/Helpers/MD5Encrypt.cs

@@ -13,22 +13,24 @@ public class MD5Encrypt
     /// 16位MD5加密
     /// </summary>
     /// <param name="password"></param>
+    /// <param name="lowerCase"></param>
     /// <returns></returns>
-    public static string Encrypt16(string password)
+    public static string Encrypt16(string password, bool lowerCase = false)
     {
         if (password.IsNull())
             return null;
 
         using var md5 = MD5.Create();
-        return md5.ComputeHash(Encoding.UTF8.GetBytes(password)).ToHex();
+        return md5.ComputeHash(Encoding.UTF8.GetBytes(password)).ToHex(lowerCase);
     }
 
     /// <summary>
     /// 32位MD5加密
     /// </summary>
     /// <param name="password"></param>
+    /// <param name="lowerCase"></param>
     /// <returns></returns>
-    public static string Encrypt32(string password = "")
+    public static string Encrypt32(string password = "", bool lowerCase = false)
     {
         if (password.IsNull())
             return null;
@@ -36,9 +38,10 @@ public class MD5Encrypt
         using var md5 = MD5.Create();
         string pwd = string.Empty;
         byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
+        var format = lowerCase ? "x2" : "X2";
         foreach (var item in s)
         {
-            pwd = string.Concat(pwd, item.ToString("X"));
+            pwd = string.Concat(pwd, item.ToString(format));
         }
         return pwd;
     }

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

@@ -421,18 +421,20 @@
             MD5加密
             </summary>
         </member>
-        <member name="M:ZhonTai.Common.Helpers.MD5Encrypt.Encrypt16(System.String)">
+        <member name="M:ZhonTai.Common.Helpers.MD5Encrypt.Encrypt16(System.String,System.Boolean)">
             <summary>
             16位MD5加密
             </summary>
             <param name="password"></param>
+            <param name="lowerCase"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Common.Helpers.MD5Encrypt.Encrypt32(System.String)">
+        <member name="M:ZhonTai.Common.Helpers.MD5Encrypt.Encrypt32(System.String,System.Boolean)">
             <summary>
             32位MD5加密
             </summary>
             <param name="password"></param>
+            <param name="lowerCase"></param>
             <returns></returns>
         </member>
         <member name="M:ZhonTai.Common.Helpers.MD5Encrypt.Encrypt64(System.String)">