Skip to content

Commit

Permalink
Merge branch 'hotfix/set-nickname' into feature/2.6.0-union
Browse files Browse the repository at this point in the history
  • Loading branch information
@felix-zhaolei
felix-zhaolei committed Dec 5, 2024
2 parents a4d2243 + 0be6cea commit 52b8019
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 76 deletions.
35 changes: 1 addition & 34 deletions src/CAServer.Application/CAAccount/NickNameAppService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,21 @@ public class NickNameAppService : CAServerAppService, INickNameAppService
private readonly IClusterClient _clusterClient;
private readonly IDistributedEventBus _distributedEventBus;
private readonly INESTRepository<CAHolderIndex, Guid> _holderRepository;
private readonly IImRequestProvider _imRequestProvider;
private readonly HostInfoOptions _hostInfoOptions;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly INicknameProvider _nicknameProvider;
private readonly IGuardianAppService _guardianAppService;
private readonly IUserProfilePictureProvider _userProfilePictureProvider;

public NickNameAppService(IDistributedEventBus distributedEventBus, IClusterClient clusterClient,
INESTRepository<CAHolderIndex, Guid> holderRepository, IImRequestProvider imRequestProvider,
INESTRepository<CAHolderIndex, Guid> holderRepository,
IOptionsSnapshot<HostInfoOptions> hostInfoOptions, IHttpContextAccessor httpContextAccessor,
INicknameProvider nicknameProvider, IGuardianAppService guardianAppService,
IUserProfilePictureProvider userProfilePictureProvider)
{
_clusterClient = clusterClient;
_distributedEventBus = distributedEventBus;
_holderRepository = holderRepository;
_imRequestProvider = imRequestProvider;
_hostInfoOptions = hostInfoOptions.Value;
_httpContextAccessor = httpContextAccessor;
_nicknameProvider = nicknameProvider;
Expand All @@ -69,38 +67,9 @@ public async Task<CAHolderResultDto> SetNicknameAsync(UpdateNickNameDto nickName
}

await _distributedEventBus.PublishAsync(ObjectMapper.Map<CAHolderGrainDto, UpdateCAHolderEto>(result.Data));

await UpdateImUserAsync(userId, nickNameDto.NickName);

return ObjectMapper.Map<CAHolderGrainDto, CAHolderResultDto>(result.Data);
}

private async Task UpdateImUserAsync(Guid userId, string nickName, string avatar = "")
{
if (_hostInfoOptions.Environment == Options.Environment.Development)
{
return;
}

var imUserUpdateDto = new ImUserUpdateDto
{
Name = nickName,
Avatar = avatar
};

try
{
await _imRequestProvider.PostAsync<object>(ImConstant.UpdateImUserUrl, imUserUpdateDto);
Logger.LogInformation("{userId} update im user : {name}", userId.ToString(), nickName);
}
catch (Exception e)
{
Logger.LogError(e, ImConstant.ImServerErrorPrefix + " update im user fail : {userId}, {name}, {imToken}",
userId.ToString(), nickName,
_httpContextAccessor?.HttpContext?.Request?.Headers[CommonConstant.ImAuthHeader]);
}
}

public async Task<CAHolderResultDto> GetCaHolderAsync()
{
var mustQuery = new List<Func<QueryContainerDescriptor<CAHolderIndex>, QueryContainer>>
Expand Down Expand Up @@ -142,8 +111,6 @@ public async Task<CAHolderResultDto> UpdateHolderInfoAsync(HolderInfoDto holderI
}

await _distributedEventBus.PublishAsync(ObjectMapper.Map<CAHolderGrainDto, UpdateCAHolderEto>(result.Data));
await UpdateImUserAsync(userId, holderInfo.NickName, holderInfo.Avatar);

return ObjectMapper.Map<CAHolderGrainDto, CAHolderResultDto>(result.Data);
}

Expand Down
46 changes: 4 additions & 42 deletions src/CAServer.Application/CAAccount/Provider/NicknameProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,17 @@ public class NicknameProvider : INicknameProvider, ISingletonDependency
{
private readonly IObjectMapper _objectMapper;
private readonly INESTRepository<CAHolderIndex, Guid> _caHolderRepository;
private readonly IImRequestProvider _imRequestProvider;
private readonly IClusterClient _clusterClient;
private readonly ILogger<GuardianAppService> _logger;
// private readonly HostInfoOptions _hostInfoOptions;


public NicknameProvider(IObjectMapper objectMapper, INESTRepository<CAHolderIndex, Guid> caHolderRepository,
IImRequestProvider imRequestProvider, IClusterClient clusterClient, ILogger<GuardianAppService> logger
/*, IOptionsSnapshot<HostInfoOptions> hostInfoOptions*/)
IClusterClient clusterClient, ILogger<GuardianAppService> logger
)
{
_objectMapper = objectMapper;
_caHolderRepository = caHolderRepository;
_imRequestProvider = imRequestProvider;
_clusterClient = clusterClient;
_logger = logger;
// _hostInfoOptions = hostInfoOptions.Value;
}

public async Task<bool> ModifyNicknameHandler(GuardianResultDto guardianResultDto, Guid userId, CAHolderGrainDto caHolder)
Expand Down Expand Up @@ -93,44 +89,10 @@ public async Task<bool> ModifyNicknameHandler(GuardianResultDto guardianResultDt
{
_logger.LogError(e, "UpdateUnsetGuardianIdentifierAsync update es caholder failed, userid={1}, nickname={0}", userId, changedNickname);
}
//update im user
try
{
await UpdateImUserAsync(userId, changedNickname, caHolder.Avatar);
}
catch (Exception e)
{
_logger.LogError(e, "UpdateUnsetGuardianIdentifierAsync update im user failed, userid={1}, nickname={0}", userId, changedNickname);
}

return true;
}

private async Task UpdateImUserAsync(Guid userId, string nickName, string avatar = "")
{
// if (_hostInfoOptions.Environment == Options.Environment.Development)
// {
// return;
// }

var imUserUpdateDto = new ImUserUpdateDto
{
Name = nickName,
Avatar = avatar
};

try
{
await _imRequestProvider.PostAsync<object>(ImConstant.UpdateImUserUrl, imUserUpdateDto);
_logger.LogInformation("{userId} update im user : {name}", userId.ToString(), nickName);
}
catch (Exception e)
{
_logger.LogError(e, ImConstant.ImServerErrorPrefix + " update im user fail : {userId}, {name}",
userId.ToString(), nickName);
}
}


private string GetFirstNameFormat(string nickname, string firstName, string address)
{
if (firstName.IsNullOrEmpty() && address.IsNullOrEmpty())
Expand Down

0 comments on commit 52b8019

Please sign in to comment.