Compare commits

..

8 Commits

Author SHA1 Message Date
hang 629fbfb037 修改邮件
continuous-integration/drone/push Build is passing Details
2025-01-17 15:23:46 +08:00
hang 2255ee1b03 维护数据不要权限
continuous-integration/drone/push Build is passing Details
2025-01-17 14:10:19 +08:00
hang 5d269b699c Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8
continuous-integration/drone/push Build is passing Details
2025-01-17 13:58:42 +08:00
hang c62086f8e8 撤回修改
continuous-integration/drone/push Build is passing Details
2025-01-03 13:20:22 +08:00
hang 8656ed09bb 修改PM 申审批
continuous-integration/drone/push Build is passing Details
2025-01-03 10:52:34 +08:00
hang 496396fa6b 删除返回的机构名称
continuous-integration/drone/push Build is passing Details
2024-12-18 13:36:52 +08:00
hang 3b28e13fd8 修改时间展示
continuous-integration/drone/push Build is passing Details
2024-12-18 11:33:21 +08:00
hang b12877e39b 修改时间
continuous-integration/drone/push Build is passing Details
2024-12-18 11:16:05 +08:00
4 changed files with 11 additions and 3 deletions

View File

@ -1,4 +1,5 @@
using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.MassTransit.Consumer;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure;
using Microsoft.Extensions.Options;
@ -20,7 +21,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService
{
private readonly SystemEmailSendConfig _systemEmailConfig = _SystemEmailSendConfig.CurrentValue;
public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder;
@ -130,6 +131,9 @@ namespace IRaCIS.Core.Application.Service
var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
//处理替换公司名
htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr);
sendEmailConfig.TopicDescription = topicStr;
sendEmailConfig.HtmlBodyStr = htmlBodyStr;

View File

@ -8,6 +8,7 @@ using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.MassTransit.Consumer;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Common;

View File

@ -159,6 +159,7 @@ namespace IRaCIS.Core.Application.Service
/// 用户多账号,初次维护数据
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
{
@ -211,6 +212,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary>
/// <param name="_trialIdentityUserRepository"></param>
/// <returns></returns>
[AllowAnonymous]
public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
{
_userInfo.IsNotNeedInspection = true;
@ -262,6 +264,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="_trialIdentityUserRepository"></param>
/// <param name="_trialUserRoleReposiotry"></param>
/// <returns></returns>
[AllowAnonymous]
[UnitOfWork]
public async Task<IResponseOutput> ExternalTrialUser(
[FromServices] IRepository<TrialSiteUserSurvey> _trialSiteUserSurveyRepository,