IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -72,7 +72,6 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -78,7 +78,6 @@
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -85,7 +85,6 @@
     "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -92,7 +92,6 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -128,7 +128,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(email, _systemEmailConfig.EmailRegexStr))
+            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
                 //---Please input a legal email
                 return ResponseOutput.NotOk(_localizer["User_LegalEmail"]);
@@ -325,7 +325,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(email, _systemEmailConfig.EmailRegexStr))
+            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
 
                 //---请输入一个正确的邮箱。

IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs

@@ -5,7 +5,6 @@ using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.Application.Service
@@ -25,7 +24,7 @@ namespace IRaCIS.Core.Application.Service
        IRepository<TrialExperience> _trialExperienceRepository,
 
           IRepository<Dictionary> _dictionaryRepository,
-         IOptionsMonitor<SystemEmailSendConfig> _systemEmailConfig,
+
          IRepository<TrialExperienceCriteria> _trialExperienceCriteriaRepository,
         IMailVerificationService _mailVerificationService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEnrollService
     {
@@ -386,7 +385,7 @@ namespace IRaCIS.Core.Application.Service
                 .Select(t => new { t.EMail, t.FirstName, t.LastName }).ToListAsync();
 
 
-            var errorList = emaiList.Where(t => !Regex.IsMatch(t.EMail, _systemEmailConfig.CurrentValue.EmailRegexStr))
+            var errorList = emaiList.Where(t => !Regex.IsMatch(t.EMail, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
                 .ToList();
 
             if (errorList.Count() > 0)