*

ldqk · Sep 17, 2021 · 863e6bd · 863e6bd
1 parent 0aeb53a
commit 863e6bd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj b/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
@@ -4,7 +4,7 @@
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet />
-    <Version>2.4.4.3</Version>
+    <Version>2.4.4.4</Version>
     <Authors>懒得勤快</Authors>
     <Description>Masuit.Tools基础公共库，包含一些常用的操作类，大都是静态类，加密解密，反射操作，Excel简单导出，权重随机筛选算法，分布式短id，表达式树，linq扩展，文件压缩，多线程下载和FTP客户端，硬件信息，字符串扩展方法，日期时间扩展操作，中国农历，大文件拷贝，图像裁剪，验证码，断点续传，集合扩展等常用封装。</Description>
     <Copyright>懒得勤快，长空X</Copyright>
@@ -17,9 +17,9 @@
     <RepositoryType>Github</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <FileVersion>2.4.4.3</FileVersion>
+    <FileVersion>2.4.4.4</FileVersion>
     <Company>masuit.com</Company>
-    <AssemblyVersion>2.4.4.3</AssemblyVersion>
+    <AssemblyVersion>2.4.4.4</AssemblyVersion>
     <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs b/Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs
@@ -1,5 +1,6 @@
 using DnsClient;
 using Masuit.Tools.Config;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Net;
@@ -61,7 +62,7 @@ public override bool IsValid(object value)
                 return false;
             }
 
-            if (!string.IsNullOrEmpty(BlockList) && BlockList.Split('!', ';').Any(item => Regex.IsMatch(email, item)))
+            if (!string.IsNullOrEmpty(BlockList) && BlockList.Split(new[] { '!', ';' }, StringSplitOptions.RemoveEmptyEntries).Any(item => Regex.IsMatch(email, item)))
             {
                 ErrorMessage = "您输入的邮箱无效，请使用真实有效的邮箱地址！";
                 return false;

diff --git a/Masuit.Tools.Core/Masuit.Tools.Core.csproj b/Masuit.Tools.Core/Masuit.Tools.Core.csproj
@@ -18,10 +18,10 @@ github：https://github.com/ldqk/Masuit.Tools
         <UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Version>2.4.4.3</Version>
-        <FileVersion>2.4.4.3</FileVersion>
+        <Version>2.4.4.4</Version>
+        <FileVersion>2.4.4.4</FileVersion>
         <Company>masuit.com</Company>
-        <AssemblyVersion>2.4.4.3</AssemblyVersion>
+        <AssemblyVersion>2.4.4.4</AssemblyVersion>
         <Authors>懒得勤快X</Authors>
         <RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

diff --git a/Masuit.Tools.Net45/Properties/AssemblyInfo.cs b/Masuit.Tools.Net45/Properties/AssemblyInfo.cs
diff --git a/Masuit.Tools.Net45/package.nuspec b/Masuit.Tools.Net45/package.nuspec
@@ -4,7 +4,7 @@
     <!--*-->
     <id>Masuit.Tools.Net45</id>
     <!--*-->
-    <version>2.4.4.3</version>
+    <version>2.4.4.4</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>懒得勤快</authors>

diff --git a/Masuit.Tools/Properties/AssemblyInfo.cs b/Masuit.Tools/Properties/AssemblyInfo.cs
diff --git a/Masuit.Tools/package.nuspec b/Masuit.Tools/package.nuspec
@@ -4,7 +4,7 @@
     <!--*-->
     <id>Masuit.Tools.Net</id>
     <!--*-->
-    <version>2.4.4.3</version>
+    <version>2.4.4.4</version>
     <title>Masuit.Tools</title>
     <!--*-->
     <authors>懒得勤快</authors>