From ca5bbb306485a2301436fbe805114c02de178a0a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 31 May 2024 17:42:12 +0800
Subject: [PATCH] =?UTF-8?q?irc=20=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/SiteSurvey/TrialSiteSurveyService.cs              | 4 ++--
 IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 27fffa1c3..d206fca7d 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Contracts
         public async Task<IResponseOutput> SendEmialVerifyCode(SendEmialVerifyCodeInDto userInfo)
         {
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(userInfo.Email, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            if (!Regex.IsMatch(userInfo.Email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
                 //---请输入正确的邮箱地址。
                 throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_InvalidEmail"]);
@@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Contracts
         public async Task<IResponseOutput> SendVerifyCode(SiteSurveySendVerifyCode userInfo)
         {
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(userInfo.Email, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            if (!Regex.IsMatch(userInfo.Email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
                 //---请输入正确的邮箱地址。
                 throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_InvalidEmail"]);
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
index 1fc3c3e04..a0e71f568 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
@@ -383,7 +383,7 @@ namespace IRaCIS.Application.Services
                 .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-Z0-9_-]+)+$"))
+            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)