添加用户 重新发送邮件
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
f513829c94
commit
62fafeb7d2
|
@ -12914,6 +12914,13 @@
|
||||||
<param name="inQuery"></param>
|
<param name="inQuery"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.TrialUserSendJoinEmail(IRaCIS.Application.Contracts.TrialUserSendJoinEmailCommand,IRaCIS.Core.Application.Service.IMailVerificationService)">
|
||||||
|
<summary>
|
||||||
|
项目人员 邮件过期 重新发送邀请邮件
|
||||||
|
</summary>
|
||||||
|
<param name="incommand"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.GetTrialUserScreeningList(IRaCIS.Application.Contracts.TrialUserQuery)">
|
<member name="M:IRaCIS.Core.Application.Service.TrialMaintenanceService.GetTrialUserScreeningList(IRaCIS.Application.Contracts.TrialUserQuery)">
|
||||||
<summary> Setting页面 项目参与人员勾选列表 </summary>
|
<summary> Setting页面 项目参与人员勾选列表 </summary>
|
||||||
</member>
|
</member>
|
||||||
|
|
|
@ -230,6 +230,15 @@ namespace IRaCIS.Application.Contracts
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class NewUserSendEmailCommand
|
||||||
|
{
|
||||||
|
public Guid IdentityUserId { get; set; }
|
||||||
|
public string BaseUrl { get; set; } = string.Empty;
|
||||||
|
public string RouteUrl { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public class IdentityUserTypeDTO : UserAddUserType
|
public class IdentityUserTypeDTO : UserAddUserType
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
|
@ -312,6 +321,8 @@ namespace IRaCIS.Application.Contracts
|
||||||
{
|
{
|
||||||
//public bool CanEditUserType { get; set; }
|
//public bool CanEditUserType { get; set; }
|
||||||
|
|
||||||
|
public bool IsFirstAdd { get; set; }
|
||||||
|
|
||||||
public DateTime? LastLoginTime { get; set; }
|
public DateTime? LastLoginTime { get; set; }
|
||||||
|
|
||||||
public DateTime CreateTime { get; set; }
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
|
@ -582,6 +582,14 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<IResponseOutput> AddNewUserSendEmail(NewUserSendEmailCommand incommand)
|
||||||
|
{
|
||||||
|
await _mailVerificationService.AddUserSendEmailAsync(incommand.IdentityUserId, incommand.BaseUrl, incommand.RouteUrl);
|
||||||
|
|
||||||
|
return ResponseOutput.Ok();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 更新用户
|
/// 更新用户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -531,6 +531,18 @@ namespace IRaCIS.Application.Contracts
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TrialUserSendJoinEmailCommand
|
||||||
|
{
|
||||||
|
[NotDefault]
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
|
[NotDefault]
|
||||||
|
public Guid IdentityUserId { get; set; }
|
||||||
|
|
||||||
|
public string BaseUrl { get; set; } = string.Empty;
|
||||||
|
public string RouteUrl { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
}
|
||||||
public class UpdateTrialUserRoleCommand
|
public class UpdateTrialUserRoleCommand
|
||||||
{
|
{
|
||||||
public List<Guid> IdList { get; set; }
|
public List<Guid> IdList { get; set; }
|
||||||
|
|
|
@ -3,6 +3,7 @@ using IRaCIS.Application.Contracts;
|
||||||
using IRaCIS.Application.Interfaces;
|
using IRaCIS.Application.Interfaces;
|
||||||
using IRaCIS.Core.Application.Contracts.DTO;
|
using IRaCIS.Core.Application.Contracts.DTO;
|
||||||
using IRaCIS.Core.Application.Filter;
|
using IRaCIS.Core.Application.Filter;
|
||||||
|
using IRaCIS.Core.Domain.Models;
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
using MassTransit.Serialization;
|
using MassTransit.Serialization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
@ -118,6 +119,25 @@ namespace IRaCIS.Core.Application.Service
|
||||||
return ResponseOutput.Ok();
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目人员 邮件过期 重新发送邀请邮件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="incommand"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<IResponseOutput> TrialUserSendJoinEmail(TrialUserSendJoinEmailCommand incommand, [FromServices] IMailVerificationService _mailVerificationService)
|
||||||
|
{
|
||||||
|
|
||||||
|
var userTypeList = _trialIdentityUserRepository.Where(t => t.TrialId == incommand.TrialId && t.IdentityUserId == incommand.IdentityUserId).SelectMany(t => t.TrialUserRoleList).Select(t => t.UserRole.UserTypeRole.UserTypeName).ToList();
|
||||||
|
|
||||||
|
var usertyps = string.Join(',', userTypeList);
|
||||||
|
|
||||||
|
await _mailVerificationService.ExternalUserJoinEmail(incommand.TrialId, incommand.IdentityUserId, usertyps, incommand.BaseUrl, incommand.RouteUrl);
|
||||||
|
|
||||||
|
return ResponseOutput.Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary> Setting页面 项目参与人员勾选列表 </summary>
|
/// <summary> Setting页面 项目参与人员勾选列表 </summary>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
|
|
Loading…
Reference in New Issue