XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

统一邮件发送到同一个文件

Browse Source
This commit is contained in:
hang
2022-05-29 23:43:38 +08:00
parent d8098a948a
commit a1e06f6536
4 changed files with 145 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
+12 -84
View File
@@ -13,9 +13,8 @@ using MimeKit;
using MailKit.Security;
using Microsoft.AspNetCore.Authorization;
using Panda.DynamicWebApi.Attributes;
using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Services;
namespace IRaCIS.Core.Application.Service
{
@@ -30,17 +29,19 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<TrialUser> _trialUserRepository;
private readonly IRepository<TrialSiteUserSurvey> _trialSiteSurveyUserRepository;
private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
private readonly ITokenService _tokenService;
private readonly IMailVerificationService _mailVerificationService;
public TrialExternalUserService(IRepository<TrialExternalUser> trialExternalUseRepository, IRepository<User> userRepository, IRepository<TrialUser> trialUserRepository,
IRepository<TrialSiteUserSurvey> trialSiteSurveyUserRepository, IRepository<TrialSiteUser> trialSiteUserRepository, ITokenService tokenService)
IRepository<TrialSiteUserSurvey> trialSiteSurveyUserRepository, IRepository<TrialSiteUser> trialSiteUserRepository,
IMailVerificationService mailVerificationService)
{
_trialExternalUseRepository = trialExternalUseRepository;
_userRepository = userRepository;
_trialUserRepository = trialUserRepository;
_trialSiteSurveyUserRepository = trialSiteSurveyUserRepository;
_trialSiteUserRepository = trialSiteUserRepository;
_tokenService = tokenService;
_mailVerificationService = mailVerificationService;
}
@@ -162,36 +163,8 @@ namespace IRaCIS.Core.Application.Service
else
{
return ResponseOutput.NotOk("人员信息不支持编辑，请删除后重新添加。");
//if (await _trialExternalUseRepository.AnyAsync(t =>
// t.Email == addOrEditTrialExternalUser.Email &&
// t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.Id != addOrEditTrialExternalUser.Id && t.TrialId == addOrEditTrialExternalUser.TrialId))
//{
// return ResponseOutput.NotOk("该邮箱和用户类型，已存在该账户");
//}
////if (addOrEditTrialExternalUser.IsSystemUser)
////{
//// return ResponseOutput.NotOk("系统账户不允许编辑");
////}
//var needUpdateEntity =
// await _trialExternalUseRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTrialExternalUser.Id);
////更改之前 先验证是否在系统账户中存在
//_mapper.Map(addOrEditTrialExternalUser, needUpdateEntity);
//await _trialExternalUseRepository.SaveChangesAsync();
//return ResponseOutput.Ok(needUpdateEntity.Id.ToString());
}
}
@@ -217,62 +190,17 @@ namespace IRaCIS.Core.Application.Service
[Authorize(Policy = IRaCISPolicy.PM_APM)]
public async Task<IResponseOutput> SendExternalUserJoinEmail(TrialExternalUserSendEmail sendEmail)
{
var trialInfo = (await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == sendEmail.TrialId)).IfNullThrowException();
var trialId = sendEmail.TrialId;
foreach (var userInfo in sendEmail.SendUsers)
{
var messageToSend = new MimeMessage();
//发件地址
messageToSend.From.Add(new MailboxAddress("GRR", "iracis_grr@163.com"));
//收件地址
messageToSend.To.Add(new MailboxAddress(String.Empty, userInfo.Email));
//主题
messageToSend.Subject = $"[来自展影IRC] [{ trialInfo.ResearchProgramNo}]邀请信";
var userId = userInfo.SystemUserId;
var builder = new BodyBuilder();
var sysUserInfo = (await _userRepository.Where(t => t.Id == userInfo.SystemUserId).Include(t=>t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
var token = _tokenService.GetToken(IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo)));
var pathToFile = _hostEnvironment.WebRootPath
+ Path.DirectorySeparatorChar.ToString()
+ "EmailTemplate"
+ Path.DirectorySeparatorChar.ToString()
+ (sysUserInfo.IsFirstAdd? "TrialUserFirstJoin.html": "TrialUserExistJoin.html");
using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
{
var templateInfo= SourceReader.ReadToEnd();
var routeUrl = sendEmail.RouteUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;
builder.HtmlBody = string.Format(templateInfo,
sysUserInfo.FullName,
trialInfo.ExperimentName,
trialInfo.ResearchProgramNo,
trialInfo.TrialCode,
sysUserInfo.UserName,
sysUserInfo.UserTypeRole.UserTypeShortName,
sysUserInfo.IsFirstAdd? routeUrl:sendEmail.BaseUrl
);
}
messageToSend.Body = builder.ToMessageBody();
await SendEmailHelper.SendEmailAsync(messageToSend, null);
var trialId = sendEmail.TrialId;
var userId = sysUserInfo.Id;
await _mailVerificationService.ExternalUserJoinEmail(trialId, userId, sendEmail.BaseUrl, sendEmail.RouteUrl);
//判断TrialUser中是否存在 不存在就插入 注意退出了，也不能再加进来
if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId,true))
if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId, true))
{
await _repository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId });