修正

Masuit.Tools.Abstractions/Config/CoreConfig.cs

@@ -1,5 +1,4 @@
 #if NET461
-
 using System.Configuration;
 
 namespace Masuit.Tools.Core.Config
@@ -15,8 +14,8 @@ namespace Masuit.Tools.Core.Config
 
 #else
 
-using System;
 using Microsoft.Extensions.Configuration;
+using System;
 
 namespace Masuit.Tools.Core.Config
 {
@@ -28,22 +27,21 @@ namespace Masuit.Tools.Core.Config
         /// <summary>
         /// 配置对象
         /// </summary>
-        public static IConfiguration Configuration = new ConfigurationBuilder()
-            .SetBasePath(AppContext.BaseDirectory)
-            .AddJsonFile("appsettings.json", true, true)
-            .Build();
+        public static IConfiguration Configuration { get; private set; } = new ConfigurationBuilder().SetBasePath(AppContext.BaseDirectory).AddJsonFile("appsettings.json", true, true).Build();
 
         public static string GetConfigOrDefault(string key, string defaultValue = "")
         {
-            string config = ConfigHelper.Configuration[key];
-            if (config.IsNullOrEmpty())
-            {
-                return defaultValue;
-            }
-            else
-            {
-                return config;
-            }
+            string config = Configuration[key];
+            return config.IsNullOrEmpty() ? defaultValue : config;
+        }
+
+        /// <summary>
+        /// 将配置添加到Masuit.Tools，若未调用，将自动加载默认的appsettings.json
+        /// </summary>
+        /// <param name="config"></param>
+        public static void AddToMasuitTools(this IConfiguration config)
+        {
+            Configuration = config;
         }
     }
 }

Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.xml

@@ -9,11 +9,17 @@
             .net core的配置导入
             </summary>
         </member>
-        <member name="F:Masuit.Tools.Core.Config.ConfigHelper.Configuration">
+        <member name="P:Masuit.Tools.Core.Config.ConfigHelper.Configuration">
             <summary>
             配置对象
             </summary>
         </member>
+        <member name="M:Masuit.Tools.Core.Config.ConfigHelper.AddToMasuitTools(Microsoft.Extensions.Configuration.IConfiguration)">
+            <summary>
+            将配置添加到Masuit.Tools，若未调用，将自动加载默认的appsettings.json
+            </summary>
+            <param name="config"></param>
+        </member>
         <member name="T:Masuit.Tools.Core.ChineseString">
             <summary>
             中文字符工具类
@@ -68,6 +74,29 @@
             <param name="value"></param>
             <returns></returns>
         </member>
+        <member name="T:Masuit.Tools.Core.Validator.IsEmailAttribute">
+            <summary>
+            邮箱校验
+            </summary>
+        </member>
+        <member name="P:Masuit.Tools.Core.Validator.IsEmailAttribute.DomainWhiteList">
+            <summary>
+            域白名单
+            </summary>
+        </member>
+        <member name="M:Masuit.Tools.Core.Validator.IsEmailAttribute.#ctor(System.Boolean)">
+            <summary>
+            可在配置文件AppSetting节中添加EmailDomainWhiteList配置邮箱域名白名单，逗号分隔
+            </summary>
+            <param name="valid">是否检查邮箱的有效性</param>
+        </member>
+        <member name="M:Masuit.Tools.Core.Validator.IsEmailAttribute.IsValid(System.Object)">
+            <summary>
+            邮箱校验
+            </summary>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
         <member name="T:Masuit.Tools.Core.Validator.IsIPAddressAttribute">
             <summary>
             验证IPv4地址是否合法
@@ -5728,28 +5757,5 @@
             <param name="action"></param>
             <returns></returns>
         </member>
-        <member name="T:Masuit.Tools.Validator.IsEmailAttribute">
-            <summary>
-            邮箱校验
-            </summary>
-        </member>
-        <member name="P:Masuit.Tools.Validator.IsEmailAttribute.DomainWhiteList">
-            <summary>
-            域白名单
-            </summary>
-        </member>
-        <member name="M:Masuit.Tools.Validator.IsEmailAttribute.#ctor(System.Boolean)">
-            <summary>
-            可在配置文件AppSetting节中添加EmailDomainWhiteList配置邮箱域名白名单，逗号分隔
-            </summary>
-            <param name="valid">是否检查邮箱的有效性</param>
-        </member>
-        <member name="M:Masuit.Tools.Validator.IsEmailAttribute.IsValid(System.Object)">
-            <summary>
-            邮箱校验
-            </summary>
-            <param name="value"></param>
-            <returns></returns>
-        </member>
     </members>
 </doc>

Masuit.Tools.Abstractions/Validator/IsEmailAttribute.cs

@@ -1,9 +1,8 @@
-using System.ComponentModel.DataAnnotations;
-using System.Configuration;
+using Masuit.Tools.Core.Config;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Masuit.Tools.Core.Config;
 
-namespace Masuit.Tools.Validator
+namespace Masuit.Tools.Core.Validator
 {
     /// <summary>
     /// 邮箱校验

Masuit.Tools.Core/Config/ConfigurationExt.cs

@@ -1,16 +0,0 @@
-using Microsoft.Extensions.Configuration;
-
-namespace Masuit.Tools.Core.Config
-{
-    public static class ConfigurationExt
-    {
-        /// <summary>
-        /// 将配置添加到Masuit.Tools，若未调用，将自动加载默认的appsettings.json
-        /// </summary>
-        /// <param name="config"></param>
-        public static void AddToMasuitTools(this IConfiguration config)
-        {
-            CoreConfig.Configuration = config;
-        }
-    }
-}

Masuit.Tools.Core/Net/WebExtension.cs

@@ -31,11 +31,13 @@ namespace Masuit.Tools.Core.Net
                 if (address.Status == 0)
                 {
                     string detail = $"{address.AddressResult.FormattedAddress} {address.AddressResult.AddressComponent.Direction}{address.AddressResult.AddressComponent.Distance ?? "0"}米";
-                    List<string> pois = address.AddressResult.Pois.Select(p => $"{p.AddressDetail}{p.Name} {p.Direction}{p.Distance ?? "0"}米").ToList();
+                    var pois = address.AddressResult.Pois.Select(p => $"{p.AddressDetail}{p.Name} {p.Direction}{p.Distance ?? "0"}米").ToList();
                     return new Tuple<string, List<string>>(detail, pois);
                 }
+
                 return new Tuple<string, List<string>>("IP地址不正确", new List<string>());
             }
+
             return new Tuple<string, List<string>>($"{ip}不是一个合法的IP地址", new List<string>());
         }
 

Masuit.Tools.sln

@@ -23,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Core.Test", "T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Abstractions.Test", "Test\Masuit.Tools.Abstractions.Test\Masuit.Tools.Abstractions.Test.csproj", "{61430D45-3808-49B5-BDF3-4536DA399DD4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masuit.Tools.Test", "Test\Masuit.Tools.Test\Masuit.Tools.Test.csproj", "{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,10 +65,6 @@ Global
 		{61430D45-3808-49B5-BDF3-4536DA399DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61430D45-3808-49B5-BDF3-4536DA399DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61430D45-3808-49B5-BDF3-4536DA399DD4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -80,7 +74,6 @@ Global
 		{1D51DC49-6626-41AF-B1B5-085C83307FF2} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC}
 		{B8BFA5B2-20BF-4D9C-A9F3-5E33EC6A0B20} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC}
 		{61430D45-3808-49B5-BDF3-4536DA399DD4} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC}
-		{92F3DA7E-669A-4A6D-AC8B-018CABCBEFB9} = {E0B8FBD1-A28A-4420-9DE2-6BD06035CBAC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B57FDA8F-95CF-478B-A0A8-7FF0F01CCFAB}