diff --git a/.gitignore b/.gitignore index 82f0e6ab..ebd2d09c 100644 --- a/.gitignore +++ b/.gitignore @@ -259,7 +259,7 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ *.pyc -/ZR.Admin.WebApi/appsettings.Stage.json +/ZR.Admin.WebApi/appsettings.Development.json /CodeGenerate /ZR.Admin.WebApi/appsettings.Production.json /ZR.Admin.WebApi/wwwroot/uploads diff --git a/ZR.Service/System/SysLoginService.cs b/ZR.Service/System/SysLoginService.cs index ec3ba38a..95990ada 100644 --- a/ZR.Service/System/SysLoginService.cs +++ b/ZR.Service/System/SysLoginService.cs @@ -31,8 +31,10 @@ namespace ZR.Service.System /// public SysUser Login(LoginBodyDto loginBody, SysLogininfor logininfor) { - //密码md5 - loginBody.Password = NETCore.Encrypt.EncryptProvider.Md5(loginBody.Password); + if (loginBody.Password.Length != 32) + { + loginBody.Password = NETCore.Encrypt.EncryptProvider.Md5(loginBody.Password); + } SysUser user = SysUserService.Login(loginBody); logininfor.UserName = loginBody.Username;