修改账户信息
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
230852b2a9
commit
686c7bac9b
|
@ -2249,11 +2249,10 @@
|
||||||
<param name="inQuery"></param>
|
<param name="inQuery"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.UserService.GetUser(System.Guid)">
|
<member name="M:IRaCIS.Core.Application.Service.UserService.GetUser">
|
||||||
<summary>
|
<summary>
|
||||||
根据用户Id获取用户详细信息[New]
|
根据用户Id获取用户详细信息[New]
|
||||||
</summary>
|
</summary>
|
||||||
<param name="userId"></param>
|
|
||||||
<returns></returns>xiuga
|
<returns></returns>xiuga
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.UserService.AddUser(IRaCIS.Application.Contracts.UserCommand)">
|
<member name="M:IRaCIS.Core.Application.Service.UserService.AddUser(IRaCIS.Application.Contracts.UserCommand)">
|
||||||
|
|
|
@ -509,16 +509,16 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 根据用户Id获取用户详细信息[New]
|
/// 根据用户Id获取用户详细信息[New]
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="userId"></param>
|
|
||||||
/// <returns></returns>xiuga
|
/// <returns></returns>xiuga
|
||||||
[HttpGet("{userId:guid}")]
|
|
||||||
public async Task<UserDetailDTO> GetUser(Guid userId)
|
public async Task<UserDetailDTO> GetUser()
|
||||||
{
|
{
|
||||||
var userQuery = _userRepository.Where(t => t.Id == userId).ProjectTo<UserDetailDTO>(_mapper.ConfigurationProvider);
|
var userQuery = _userRepository.Where(t => t.IdentityUserId == _userInfo.IdentityUserId).ProjectTo<UserDetailDTO>(_mapper.ConfigurationProvider);
|
||||||
|
|
||||||
var userRole = await userQuery.FirstOrDefaultAsync();
|
var userRole = await userQuery.FirstOrDefaultAsync();
|
||||||
|
|
||||||
userRole.AccountList = await _userRepository.Where(t => t.IdentityUserId == userRole.IdentityUserId).ProjectTo<UserAccountInfo>(_mapper.ConfigurationProvider).ToListAsync();
|
userRole.AccountList = await _userRepository.Where(t => t.IdentityUserId == _userInfo.IdentityUserId).ProjectTo<UserAccountInfo>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
return userRole;
|
return userRole;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -912,10 +912,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IResponseOutput> LoginOut(Guid userId)
|
public async Task<IResponseOutput> LoginOut(Guid identityUserId)
|
||||||
{
|
{
|
||||||
await _fusionCache.RemoveAsync(CacheKeys.UserToken(_userInfo.IdentityUserId));
|
await _fusionCache.RemoveAsync(CacheKeys.UserToken(identityUserId));
|
||||||
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = _userInfo.Id, OptType = UserOptType.LoginOut }, true);
|
|
||||||
|
//await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = _userInfo.Id, OptType = UserOptType.LoginOut }, true);
|
||||||
|
|
||||||
return ResponseOutput.Ok();
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue