Browse Source

优化邮箱校验

懒得勤快 2 years ago
parent
commit
97357c53a8
1 changed files with 5 additions and 5 deletions
  1. 5 5
      Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs

+ 5 - 5
Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs

@@ -80,15 +80,15 @@ namespace Masuit.Tools.Core.Validator
                 return false;
             }
 
-            if (!string.IsNullOrEmpty(BlockList) && BlockList.Split(new[] { '!', ';' }, StringSplitOptions.RemoveEmptyEntries).Any(item => Regex.IsMatch(email, item)))
+            if (!string.IsNullOrEmpty(WhiteList) && WhiteList.Split('!').Any(item => Regex.IsMatch(email, item)))
             {
-                ErrorMessage = _customMessage ?? "您输入的邮箱无效,请使用真实有效的邮箱地址!";
-                return false;
+                return true;
             }
 
-            if (!string.IsNullOrEmpty(WhiteList) && WhiteList.Split('!').Any(item => Regex.IsMatch(email, item)))
+            if (!string.IsNullOrEmpty(BlockList) && BlockList.Split(new[] { '!', ';' }, StringSplitOptions.RemoveEmptyEntries).Any(item => Regex.IsMatch(email, item)))
             {
-                return true;
+                ErrorMessage = _customMessage ?? "您输入的邮箱无效,请使用真实有效的邮箱地址!";
+                return false;
             }
 
             var isMatch = email.MatchEmail().isMatch;