ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update second

Browse Source
This commit is contained in:
ky_xiaz
2021-05-11 18:07:10 +08:00
parent fc3f3bec48 82e7ac70bd
commit 77e0f3bec1
55 changed files with 1754 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Application/Entity/BsHouseProjectInfo.cs
View File

@@ -29,7 +29,7 @@ namespace Ewide.Application.Entity
[Comment("区域ID")]
[MaxLength(36)]
[Required]
public string AreaId { get; set; }
public string AreaCode { get; set; }
[Comment("类型")]
[Required]

2
Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs
View File

@@ -13,7 +13,7 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
public string Name { get; set; }
public string Note { get; set; }
public int Sort { get; set; }
public string AreaId { get; set; }
public string AreaCode { get; set; }
public int Type { get; set; }
}
public class AddProjectInput : HouseProjectInfoInput

2
Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs
View File

@@ -12,7 +12,7 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
public string Name { get; set; }
public string Note { get; set; }
public int Sort { get; set; }
public string AreaId { get; set; }
public string AreaCode { get; set; }
public string AreaName { get; set; }
public int Type { get; set; }
}

7
Api/Ewide.Core/Entity/SysUser.cs
View File

@@ -30,6 +30,13 @@ namespace Ewide.Core
[Required]
public string Password { get; set; }
/// <summary>
/// 密码安全级别，在注册和修改密码时生成
/// </summary>
[Comment("密码安全级别")]
[Required]
public int SecurityLevel { get; set; }
/// <summary>
/// 昵称
/// </summary>

19
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -1679,6 +1679,11 @@
密码（采用MD5加密）
</summary>
</member>
<member name="P:Ewide.Core.SysUser.SecurityLevel">
<summary>
密码安全级别，在注册和修改密码时生成
</summary>
</member>
<member name="P:Ewide.Core.SysUser.NickName">
<summary>
昵称
@@ -3080,6 +3085,11 @@
账号
</summary>
</member>
<member name="P:Ewide.Core.Service.LoginOutput.SecurityLevel">
<summary>
密码安全级别
</summary>
</member>
<member name="P:Ewide.Core.Service.LoginOutput.NickName">
<summary>
昵称
@@ -6604,11 +6614,6 @@
用户Id
</summary>
</member>
<member name="P:Ewide.Core.Service.ChangePasswordUserInput.Id">
<summary>
用户Id
</summary>
</member>
<member name="P:Ewide.Core.Service.ChangePasswordUserInput.Password">
<summary>
密码
@@ -6824,7 +6829,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SysUserService.UpdateUserInfo(Ewide.Core.Service.UpdateUserInput)">
<member name="M:Ewide.Core.Service.SysUserService.UpdateUserInfo(Ewide.Core.Service.UserInput)">
<summary>
更新用户信息
</summary>
@@ -6859,7 +6864,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.Service.SysUserService.UpdateAvatar(Ewide.Core.Service.UpdateUserInput)">
<member name="M:Ewide.Core.Service.SysUserService.UpdateAvatar(Ewide.Core.Service.UserInput)">
<summary>
修改用户头像(未实现)
</summary>

3
Api/Ewide.Core/SeedDataXml/SysUser.xml
View File

@@ -7,6 +7,7 @@
<IsDeleted>false</IsDeleted>
<Account>superAdmin</Account>
<Password>e10adc3949ba59abbe56e057f20f883e</Password>
<SecurityLevel>1</SecurityLevel>
<Name>superAdmin</Name>
<Birthday>1986-07-26T00:00:00</Birthday>
<Sex>1</Sex>
@@ -22,6 +23,7 @@
<IsDeleted>false</IsDeleted>
<Account>admin</Account>
<Password>e10adc3949ba59abbe56e057f20f883e</Password>
<SecurityLevel>1</SecurityLevel>
<Name>admin</Name>
<Birthday>1986-07-26T00:00:00</Birthday>
<Sex>2</Sex>
@@ -37,6 +39,7 @@
<IsDeleted>false</IsDeleted>
<Account>zuohuaijun</Account>
<Password>e10adc3949ba59abbe56e057f20f883e</Password>
<SecurityLevel>1</SecurityLevel>
<Name>zuohuaijun</Name>
<Birthday>1986-07-26T00:00:00</Birthday>
<Sex>1</Sex>

33
Api/Ewide.Core/Service/Auth/AuthService.cs
View File

@@ -115,6 +115,15 @@ namespace Ewide.Core.Service
var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
var loginOutput = user.Adapt<LoginOutput>();
// 隐藏手机号/邮箱中间几位
loginOutput.Phone = String.IsNullOrEmpty(loginOutput.Phone) ? loginOutput.Phone
: loginOutput.Phone.Substring(0, 3) + "****" + loginOutput.Phone.Substring(7, 4);
loginOutput.Email = String.IsNullOrEmpty(loginOutput.Email) ? loginOutput.Email
: String.Join("@", loginOutput.Email.Split('@').Select((p, i) =>
{
return i == 0 ? (p.Length > 3 ? p.Substring(0, 3).PadRight(p.Length, '*') : "".PadRight(3, '*')) : p;
}));
loginOutput.LastLoginTime = user.LastLoginTime = DateTime.Now;
var ip = httpContext.Request.Headers["X-Real-IP"].FirstOrDefault();
loginOutput.LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip;
@@ -153,18 +162,18 @@ namespace Ewide.Core.Service
}
// 增加登录日志
await new SysLogVis
{
Name = "登录",
Success = true,
Message = "登录成功",
Ip = loginOutput.LastLoginIp,
Browser = loginOutput.LastLoginBrowser,
Os = loginOutput.LastLoginOs,
VisType = 1,
VisTime = loginOutput.LastLoginTime,
Account = loginOutput.Account
}.InsertAsync();
//await new SysLogVis
//{
// Name = "登录",
// Success = true,
// Message = "登录成功",
// Ip = loginOutput.LastLoginIp,
// Browser = loginOutput.LastLoginBrowser,
// Os = loginOutput.LastLoginOs,
// VisType = 1,
// VisTime = loginOutput.LastLoginTime,
// Account = loginOutput.Account
//}.InsertAsync();
return loginOutput;
}

5
Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs
View File

@@ -20,6 +20,11 @@ namespace Ewide.Core.Service
/// </summary>
public string Account { get; set; }
/// <summary>
/// 密码安全级别
/// </summary>
public int SecurityLevel { get; set; }
/// <summary>
/// 昵称
/// </summary>

8
Api/Ewide.Core/Service/User/Dto/UserInput.cs
View File

@@ -46,11 +46,13 @@ namespace Ewide.Core.Service
/// <summary>
/// 邮箱
/// </summary>
[RegularExpression(@"^\w{3,}(\.\w+)*@[A-z0-9]+(\.[A-z]{2,5}){1,2}$", ErrorMessage = "邮箱格式不正确")]
public virtual string Email { get; set; }
/// <summary>
/// 手机
/// </summary>
[RegularExpression(@"^((13[0-9])|(14[5,7])|(15[^4,\\D])|(17[0,1,3,6-8])|(18[0-9])|(19[8,9])|(166))[0-9]{8}$", ErrorMessage = "手机号格式不正确")]
public virtual string Phone { get; set; }
/// <summary>
@@ -120,12 +122,6 @@ namespace Ewide.Core.Service
public class ChangePasswordUserInput
{
/// <summary>
/// 用户Id
/// </summary>
[Required(ErrorMessage = "用户Id不能为空")]
public string Id { get; set; }
/// <summary>
/// 密码
/// </summary>

4
Api/Ewide.Core/Service/User/ISysUserService.cs
View File

@@ -22,9 +22,9 @@ namespace Ewide.Core.Service
Task<dynamic> QueryUserPageList([FromQuery] UserInput input);
Task ResetUserPwd(QueryUserInput input);
Task SaveAuthUserToUser(AuthUserInput authUser, UserInput sysUser);
Task UpdateAvatar(UpdateUserInput input);
Task UpdateAvatar(UserInput input);
Task UpdateUser(UpdateUserInput input);
Task UpdateUserInfo(UpdateUserInput input);
Task UpdateUserInfo(UserInput input);
Task UpdateUserPwd(ChangePasswordUserInput input);
}
}

12
Api/Ewide.Core/Service/User/SysUserService.cs
View File

@@ -230,16 +230,18 @@ namespace Ewide.Core.Service
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/sysUser/updateInfo")]
public async Task UpdateUserInfo(UpdateUserInput input)
public async Task UpdateUserInfo(UserInput input)
{
var user = input.Adapt<SysUser>();
user.Id = _userManager.UserId;
await user.UpdateExcludeAsync(new string[] {
nameof(SysUser.Account),
nameof(SysUser.SecurityLevel),
nameof(SysUser.Name),
nameof(SysUser.Password),
nameof(SysUser.AdminType),
nameof(SysUser.Status),
// 邮箱和手机号作为可能登录的方式,不能在此处直接进行修改
// 邮箱和手机号作为安全验证的方式,不能在此处直接进行修改
nameof(SysUser.Phone),
nameof(SysUser.Email)
}, true);
@@ -253,7 +255,7 @@ namespace Ewide.Core.Service
[HttpPost("/sysUser/updatePwd")]
public async Task UpdateUserPwd(ChangePasswordUserInput input)
{
var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == input.Id);
var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == _userManager.UserId);
if (MD5Encryption.Encrypt(input.Password) != user.Password)
throw Oops.Oh(ErrorCode.D1004);
if (MD5Encryption.Encrypt(input.NewPassword).Equals(user.Password))
@@ -301,9 +303,9 @@ namespace Ewide.Core.Service
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/sysUser/updateAvatar")]
public async Task UpdateAvatar(UpdateUserInput input)
public async Task UpdateAvatar(UserInput input)
{
var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == input.Id);
var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Id == _userManager.UserId);
// 调用文件上传
//sysFileInfoService.assertFile(input.Avatar);
user.Avatar = input.Avatar;

4
Api/Ewide.Web.Core/core.settings.json
View File

@@ -6,7 +6,9 @@
"sysFileInfo:upload",
"sysFileInfo:download",
"sysFileInfo:preview",
"sysUser:updateInfo"
"sysUser:updateInfo",
"sysUser:updatePwd",
"sysUser:updateAvatar"
]
}
}