From f2836a8928072301ed93d62d4e83f194a146b8e1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 21 Jul 2025 14:23:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Prod_IRC.json | 1 + IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 1 + IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 1 + IRaCIS.Core.API/appsettings.Uat_IRC.json | 1 + IRaCIS.Core.Application/Service/Management/UserService.cs | 4 ++-- IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs | 5 +++-- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json index 183eb939d..0d5a7536a 100644 --- a/IRaCIS.Core.API/appsettings.Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json @@ -72,6 +72,7 @@ "CompanyShortNameCN": "展影医疗", "IsEnv_US": false, "IsOpenErrorNoticeEmail": false, + "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", "ErrorNoticeEmailList": [ "872297557@qq.com" ] }, "SystemPacsConfig": { diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index 720882d5a..26935cc91 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -78,6 +78,7 @@ "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" ] }, diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index c3f65d989..e303cc381 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -85,6 +85,7 @@ "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" ] }, diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index 8fc145c41..c617a54d4 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -92,6 +92,7 @@ "CompanyShortNameCN": "展影医疗", "IsEnv_US": false, "IsOpenErrorNoticeEmail": false, + "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", "ErrorNoticeEmailList": [ "872297557@qq.com" ] }, diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 4358964e9..4e66d39a1 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -128,7 +128,7 @@ namespace IRaCIS.Core.Application.Service { //检查手机或者邮箱是否有效 - if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")) + if (!Regex.IsMatch(email, _systemEmailConfig.EmailRegexStr)) { //---Please input a legal email return ResponseOutput.NotOk(_localizer["User_LegalEmail"]); @@ -325,7 +325,7 @@ namespace IRaCIS.Core.Application.Service { //检查手机或者邮箱是否有效 - if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")) + if (!Regex.IsMatch(email, _systemEmailConfig.EmailRegexStr)) { //---请输入一个正确的邮箱。 diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs index a84d4da04..3aa3874f9 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs @@ -5,6 +5,7 @@ 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 @@ -24,7 +25,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialExperienceRepository, IRepository _dictionaryRepository, - + IOptionsMonitor _systemEmailConfig, IRepository _trialExperienceCriteriaRepository, IMailVerificationService _mailVerificationService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEnrollService { @@ -385,7 +386,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, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")) + var errorList = emaiList.Where(t => !Regex.IsMatch(t.EMail, _systemEmailConfig.CurrentValue.EmailRegexStr)) .ToList(); if (errorList.Count() > 0)