Compare commits

..

No commits in common. "629fbfb037358c572fa30d392b98a5d4a4280d88" and "7b7723426ba1374c2d889743ca2dca9cdc072278" have entirely different histories.

4 changed files with 3 additions and 11 deletions

View File

@ -2606,7 +2606,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
private bool IsSpmOrCPM() private bool IsSpmOrCPM()
{ {
return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM ; return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;
} }
/// <summary> /// <summary>

View File

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

View File

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

View File

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