Merge branch 'master' of http://112.124.40.88:5510/root/BeijingSafeguard

04.系统编码/App/Controllers/UserController.cs

@@ -3,6 +3,7 @@ using System.Web.Mvc;
 
 using Pingchuan.BeijingSafeguard.BLL;
 using Pingchuan.BeijingSafeguard.Model;
+using Pingchuan.BeijingSafeguard.Utility;
 
 namespace Pingchuan.BeijingSafeguard.App.Controllers
 {
@@ -16,7 +17,7 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers
         [HttpPost]
         public JsonResult Login(string name, string password)
         {
-            User user = UserBLL.GetUser(name ,password);
+            User user = UserBLL.GetUser(name, Helper.CalcMD5(password));
             if (user != null)
             {
                 SetLoginUser(user);

04.系统编码/App/Controllers/UserManagementController.cs

@@ -3,6 +3,7 @@ using System.Web.Mvc;
 
 using Pingchuan.BeijingSafeguard.BLL;
 using Pingchuan.BeijingSafeguard.Model;
+using Pingchuan.BeijingSafeguard.Utility;
 
 namespace Pingchuan.BeijingSafeguard.App.Controllers
 {
@@ -17,6 +18,7 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers
         [HttpPost]
         public JsonResult Add(User user)
         {
+            user.LoginPassword = Helper.CalcMD5(user.LoginPassword);
             int id = UserBLL.Add(user);
             return Json(id);
         }

04.系统编码/Model/User.cs

@@ -29,7 +29,7 @@ namespace Pingchuan.BeijingSafeguard.Model
         public string LoginName { set; get; }
 
         [Column("login_password")]
-        public string LoginPassWord { set; get; }
+        public string LoginPassword { set; get; }
 
         [Column("compute_count")]
         public int ComputeCount { get; set; }

04.系统编码/Utility/Helper.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Text;
+using System.Security.Cryptography;
+
+namespace Pingchuan.BeijingSafeguard.Utility
+{
+    public class Helper
+    {
+        public static string CalcMD5(string input)
+        {
+            // Use input string to calculate MD5 hash
+            using (MD5 md5 = MD5.Create())
+            {
+                byte[] inputBytes = Encoding.ASCII.GetBytes(input);
+                byte[] hashBytes = md5.ComputeHash(inputBytes);
+
+                // Convert the byte array to hexadecimal string
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < hashBytes.Length; i++)
+                    sb.Append(hashBytes[i].ToString("x2"));
+
+                return sb.ToString();
+            }
+        }
+    }
+}

04.系统编码/Utility/Utility.csproj

@@ -42,6 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />