Compare commits

..

No commits in common. "c25c855b466aa4bfd2670cfa73e82e7b50ae092c" and "461976f6d30c5ee38c538789073ae7b3a85a2b6e" have entirely different histories.

2 changed files with 23 additions and 36 deletions

View File

@ -63,30 +63,17 @@
"OpenLoginMFA": false "OpenLoginMFA": false
}, },
//"SystemEmailSendConfig": {
// "Port": 465,
// "Host": "smtp.qiye.aliyun.com",
// "FromEmail": "test@extimaging.com",
// "FromName": "Test_IRC",
// "AuthorizationCode": "SHzyyl2021",
// "SiteUrl": "http://irc.test.extimaging.com/login",
// "CompanyName": "Extensive Imaging",
// "CompanyNameCN": "上海展影医疗科技有限公司",
// "CompanyShortName": "Extensive Imaging",
// "CompanyShortNameCN": "展影医疗"
//}
"SystemEmailSendConfig": { "SystemEmailSendConfig": {
"Port": 587, "Port": 465,
"Host": "smtp-mail.outlook.com", "Host": "smtp.qiye.aliyun.com",
"FromEmail": "donotreply@elevateimaging.ai", "FromEmail": "test@extimaging.com",
"FromName": "LiLi", "FromName": "Test_IRC",
"AuthorizationCode": "Q#669869497420ul", "AuthorizationCode": "SHzyyl2021",
"CompanyName": "Elevate Imaging Inc.", "SiteUrl": "http://irc.test.extimaging.com/login",
"CompanyName": "Extensive Imaging",
"CompanyNameCN": "上海展影医疗科技有限公司", "CompanyNameCN": "上海展影医疗科技有限公司",
"CompanyShortName": "Elevate Imaging", "CompanyShortName": "Extensive Imaging",
"CompanyShortNameCN": "展影医疗", "CompanyShortNameCN": "展影医疗"
"SiteUrl": "https://lili.test.elevateimaging.ai/login"
} }
} }

View File

@ -305,15 +305,15 @@ namespace IRaCIS.Application.Services
} }
//try try
//{ {
await _mailVerificationService.AdminResetPwdSendEmailAsync(userId, pwd); await _mailVerificationService.AdminResetPwdSendEmailAsync(userId, pwd);
//} }
//catch (Exception) catch (Exception)
//{ {
// //---请检查邮箱地址或者联系维护人员, 邮件发送失败, 未能创建账户成功 //---请检查邮箱地址或者联系维护人员, 邮件发送失败, 未能创建账户成功
// throw new BusinessValidationFailedException(_localizer["User_CreateFailed"]); throw new BusinessValidationFailedException(_localizer["User_CreateFailed"]);
//} }
await _userRepository.UpdatePartialNowNoQueryAsync(userId, u => new User() await _userRepository.UpdatePartialNowNoQueryAsync(userId, u => new User()
@ -644,7 +644,7 @@ namespace IRaCIS.Application.Services
public async Task<UserBasicInfo> GetUserBasicInfo(Guid userId, string pwd) public async Task<UserBasicInfo> GetUserBasicInfo(Guid userId, string pwd)
{ {
var info = await _userRepository.Where(u => u.Id == userId && u.Password == pwd).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync(); var info = await _userRepository.Where(u => u.Id == userId && u.Password==pwd).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync();
return info; return info;
} }
@ -656,13 +656,13 @@ namespace IRaCIS.Application.Services
/// <param name="mfaType"></param> /// <param name="mfaType"></param>
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
public async Task<IResponseOutput> SendMFAEmail(Guid userId, int mfaType) public async Task<IResponseOutput> SendMFAEmail(Guid userId, int mfaType )
{ {
var userInfo = await _userRepository.Where(u => u.Id == userId).Select(t => new { t.FullName, t.EMail }).FirstOrDefaultAsync(); var userInfo = await _userRepository.Where(u => u.Id == userId).Select(t => new { t.FullName, t.EMail }).FirstOrDefaultAsync();
int verificationCode = new Random().Next(100000, 1000000); int verificationCode = new Random().Next(100000, 1000000);
await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType); await _mailVerificationService.SenMFAVerifyEmail(userId, userInfo.FullName, userInfo.EMail, verificationCode, (UserMFAType)mfaType );
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }
@ -696,7 +696,7 @@ namespace IRaCIS.Application.Services
//---验证码已经过期。 //---验证码已经过期。
throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_ExpiredVerificationCode"]); throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_ExpiredVerificationCode"]);
} }
else //验证码正确 并且 没有超时 else //验证码正确 并且 没有超时
{ {
@ -813,7 +813,7 @@ namespace IRaCIS.Application.Services
await _userRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.Id, x => new User() await _userRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.Id, x => new User()
{ {
LastLoginIP = _userInfo.IP, LastLoginIP = _userInfo.IP,
LastLoginTime = DateTime.Now LastLoginTime= DateTime.Now
}); });