Browse Source

合并代码

hjkl950217 5 years ago
parent
commit
2e02eabaf3
3 changed files with 19 additions and 3 deletions
  1. 16 0
      Masuit.Tools.Core/Config/ConfigurationExt.cs
  2. 1 1
      Masuit.Tools.Core/Net/WebExtension.cs
  3. 2 2
      README.md

+ 16 - 0
Masuit.Tools.Core/Config/ConfigurationExt.cs

@@ -0,0 +1,16 @@
+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;
+        }
+    }
+}

+ 1 - 1
Masuit.Tools.Core/Net/WebExtension.cs

@@ -54,7 +54,7 @@ namespace Masuit.Tools.Core.Net
             string ak = ConfigHelper.GetConfigOrDefault("BaiduAK");
             if (string.IsNullOrEmpty(ak))
             {
-                throw new Exception("未配置BaiduAK,请先在您的应用程序appsettings.json中下添加BaiduAK配置节(注意大小写)");
+                throw new Exception("未配置BaiduAK,请先在您的应用程序appsettings.json中下添加BaiduAK配置节(注意大小写);或手动在程序入口处调用IConfiguration的AddToMasuitTools方法");
             }
 
             using var client = new HttpClient() { BaseAddress = new Uri("http://api.map.baidu.com") };

+ 2 - 2
README.md

@@ -27,7 +27,7 @@ PM> Install-Package Masuit.Tools.Core
 ## 特色功能示例代码
 ### 1.检验字符串是否是Email、手机号、URL、IP地址、身份证号
 ```csharp
-bool isEmail="[email protected]".MatchEmail();
+bool isEmail="[email protected]".MatchEmail(); // 可在appsetting.json中添加EmailDomainWhiteList配置邮箱域名白名单,逗号分隔
 bool isInetAddress = "114.114.114.114".MatchInetAddress();
 bool isUrl = "http://masuit.com".MatchUrl();
 bool isPhoneNumber = "15205201520".MatchPhoneNumber();
@@ -333,7 +333,7 @@ string s = "123".Crc64();// 生成crc64摘要
 ```csharp
 public class MyClass
 {
-    [IsEmail]
+    [IsEmail] //可在appsetting.json中添加EmailDomainWhiteList配置邮箱域名白名单,逗号分隔
     public string Email { get; set; }
 
     [IsPhone]