移除旧代码

Masuit.Tools.Abstractions.xml

@@ -4,6 +4,22 @@
         <name>Masuit.Tools.Abstractions</name>
     </assembly>
     <members>
+        <member name="T:Masuit.Tools.Core.Config.ConfigHelper">
+            <summary>
+            .net core的配置导入
+            </summary>
+        </member>
+        <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>
             中文字符工具类
@@ -844,20 +860,7 @@
             </summary>
             <param name="_"></param>
             <param name="month">月份</param>
-            <param name="firstDay">第一天</param>
-            <param name="lastDay">最后一天</param>
-        </member>
-        <member name="M:Masuit.Tools.DateTimeExt.TimeHelper.GetFormatDate(System.DateTime,System.Char)">
-            <summary>
-            将时间格式化成 年月日 的形式,如果时间为null，返回当前系统时间
-            </summary>
-            <param name="dt">年月日分隔符</param>
-            <param name="separator">分隔符</param>
-            <returns>xxxx年xx月xx日</returns>
-        </member>
-        <member name="M:Masuit.Tools.DateTimeExt.TimeHelper.GetFormatTime(System.DateTime,System.Char)">
-            <summary>
-            将时间格式化成 时分秒 的形式,如果时间为null，返回当前系统时间
+            <p        将时间格式化成 时分秒 的形式,如果时间为null，返回当前系统时间
             </summary>
             <param name="dt">当前日期时间对象</param>
             <param name="separator">分隔符</param>
@@ -1034,6 +1037,21 @@
             <param name="value">值</param>
             <returns></returns>
         </member>
+        <member name="M:Masuit.Tools.IDictionaryExtensions.AddOrUpdate``2(System.Collections.Generic.IDictionary{``0,``1},System.Collections.Generic.IDictionary{``0,``1})">
+            <summary>
+            添加或更新键值对
+            </summary>
+            <typeparam name="TKey"></typeparam>
+            <typeparam summary>
+            添加或更新键值对
+            </summary>
+            <typeparam name="TKey"></typeparam>
+            <typeparam name="TValue"></typeparam>
+            <param name="this"></param>
+            <param name="key">键</param>
+            <param name="value">值</param>
+            <returns></returns>
+        </member>
         <member name="M:Masuit.Tools.IDictionaryExtensions.AddOrUpdate``2(System.Collections.Generic.IDictionary{``0,``1},System.Collections.Generic.IDictionary{``0,``1})">
             <summary>
             添加或更新键值对
@@ -1187,18 +1205,7 @@
             遍历IEnumerable
             </summary>
             <param name="objs"></param>
-            <param name="action">回调方法</param>
-            <typeparam name="T"></typeparam>
-        </member>
-        <member name="M:Masuit.Tools.IEnumerableExtensions.ForEachAsync``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            遍历IEnumerable
-            </summary>
-            <param name="objs"></param>
-            <param name="action">回调方法</param>
-            <typeparam name="T"></typeparam>
-        </member>
-        <member name="M:Masuit.Tools.IEnumerableExtensions.EnumerableBaseTo``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Func{System.Collections.Generic.IEnumerable{``1},``2},System.Func{``2})">
+            <param 2},System.Func{``2})">
             <summary>
             【内部方法】集合接口转具体实现
             </summary>
@@ -1276,6 +1283,22 @@
             <param name="this"></param>
             <param name="where"></param>
         </member>
+        <member name="M:Masuit.Tools.IEnumerab`0},``0[])">
+            <summary>
+            添加不重复的元素
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="this"></param>
+            <param name="values"></param>
+        </member>
+        <member name="M:Masuit.Tools.IEnumerableExtensions.RemoveWhere``1(System.Collections.Generic.ICollection{``0},System.Func{``0,System.Boolean})">
+            <summary>
+            移除符合条件的元素
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="this"></param>
+            <param name="where"></param>
+        </member>
         <member name="M:Masuit.Tools.IEnumerableExtensions.InsertAfter``1(System.Collections.Generic.IList{``0},System.Func{``0,System.Boolean},``0)">
             <summary>
             在元素之后添加元素
@@ -1407,11 +1430,11 @@
             <param name="value"></param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.ToJsonExt``1(``0,Newtonsoft.Json.JsonSerializerSettings)">
+        <member name="M:Masuit.Tools.ObjectExtensions.ToJsonString(System.Object,Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
             转换成json字符串
             </summary>
-            <param name="source"></param>
+            <param name="obj"></param>
             <returns></returns>
         </member>
         <member name="M:Masuit.Tools.ObjectExtensions.ReferenceEquals(System.Object,System.Object)">
@@ -1422,45 +1445,6 @@
             <param name="o">需要比较的对象</param>
             <returns>是否同一对象</returns>
         </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.MapTo``1(System.Object)">
-            <summary>
-            映射到目标类型(浅克隆)
-            </summary>
-            <param name="source">源</param>
-            <typeparam name="TDestination">目标类型</typeparam>
-            <returns>目标类型</returns>
-        </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.Map``1(System.Object)">
-            <summary>
-            映射到目标类型(深克隆)
-            </summary>
-            <param name="source">源</param>
-            <typeparam name="TDestination">目标类型</typeparam>
-            <returns>目标类型</returns>
-        </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.MapToAsync``1(System.Object)">
-            <summary>
-            映射到目标类型(浅克隆)
-            </summary>
-            <param name="source">源</param>
-            <typeparam name="TDestination">目标类型</typeparam>
-            <returns>目标类型</returns>
-        </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.MapAsync``1(System.Object)">
-            <summary>
-            映射到目标类型(深克隆)
-            </summary>
-            <param name="source">源</param>
-            <typeparam name="TDestination">目标类型</typeparam>
-            <returns>目标类型</returns>
-        </member>
-        <member name="M:Masuit.Tools.ObjectExtensions.ToJsonString(System.Object)">
-            <summary>
-            转换成json字符串
-            </summary>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
         <member name="M:Masuit.Tools.RandomExtensions.StrictNext(System.Random,System.Int32)">
             <summary>
             生成真正的随机数
@@ -1530,7 +1514,7 @@
             <param name="chars">可用字符数数量，0-9,a-z,A-Z</param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.Tools.StringExtensions.ToBinary(System.String,System.Int32)">
+        <member name="M:Masuit.Tools.StringExtensions.FromBinary(System.String,System.Int32)">
             <summary>
             任意进制转十进制
             </summary>
@@ -1538,7 +1522,7 @@
             <param name="bin">进制</param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.Tools.StringExtensions.ToBinaryBig(System.String,System.Int32)">
+        <member name="M:Masuit.Tools.StringExtensions.FromBinaryBig(System.String,System.Int32)">
             <summary>
             任意进制转大数十进制
             </summary>
@@ -1697,22 +1681,6 @@
             <param name="s"></param>
             <returns></returns>
         </member>
-        <member name="M:Masuit.Tools.StringExtensions.FromBinary(System.String,System.Int32)">
-            <summary>
-            任意进制转十进制
-            </summary>
-            <param name="str"></param>
-            <param name="bin">进制</param>
-            <returns></returns>
-        </member>
-        <member name="M:Masuit.Tools.StringExtensions.FromBinaryBig(System.String,System.Int32)">
-            <summary>
-            任意进制转大数十进制
-            </summary>
-            <param name="str"></param>
-            <param name="bin">进制</param>
-            <returns></returns>
-        </member>
         <member name="M:Masuit.Tools.ValueTypeConvertExtensions.ToInt32(System.String,System.Int32)">
             <summary>
             字符串转int
@@ -1859,22 +1827,22 @@
             <summary>
             传入INI文件路径构造对象
             </summary>
-            <param name="INIPath">INI文件路径</param>
+            <param name="iniPath">INI文件路径</param>
         </member>
         <member name="M:Masuit.Tools.Files.INIFile.IniWriteValue(System.String,System.String,System.String)">
             <summary>
             写INI文件
             </summary>
-            <param name="Section">分组节点</param>
-            <param name="Key">关键字</param>
-            <param name="Value">值</param>
+            <param name="section">分组节点</param>
+            <param name="key">关键字</param>
+            <param name="value">值</param>
         </member>
         <member name="M:Masuit.Tools.Files.INIFile.IniReadValue(System.String,System.String)">
             <summary>
             读取INI文件
             </summary>
-            <param name="Section">分组节点</param>
-            <param name="Key">关键字</param>
+            <param name="section">分组节点</param>
+            <param name="key">关键字</param>
             <returns>值</returns>
         </member>
         <member name="M:Masuit.Tools.Files.INIFile.IniReadValues(System.String,System.String)">
@@ -1894,7 +1862,7 @@
             <summary>
             删除ini文件下指定段落下的所有键
             </summary>
-            <param name="Section">分组节点</param>
+            <param name="section">分组节点</param>
         </member>
         <member name="T:Masuit.Tools.Files.WinrarHelper">
             <summary>
@@ -2804,20 +2772,7 @@
         </member>
         <member name="M:Masuit.Tools.Mapping.Core.MapperConfigurationBase.CheckAndConfigureMapping(System.Tuple{System.Linq.Expressions.Expression,System.Linq.Expressions.Expression,System.Boolean,System.String}@)">
             <summary>
-            检查并配置mapper
-            </summary>
-            <param name="configExpression">配置表达式树</param>
-            <exception cref="T:Masuit.Tools.Mapping.Exceptions.NotSameTypePropertyException">
-            </exception>
-            <exception cref="T:Masuit.Tools.Mapping.Exceptions.ReadOnlyPropertyException"></exception>
-        </member>
-        <member name="M:Masuit.Tools.Mapping.Core.MapperConfigurationBase.CheckAndRemoveMemberDest(System.String)">
-            <summary>
-            检查并移除目标成员
-            </summary>
-            <param name="properyName">属性名</param>
-        </member>
-        <member name="M:Masuit.Tools.Mapping.Core.MapperConfigurationBase.GetMemberInitExpression">
+            检查并MapperConfigurationBase.GetMemberInitExpression">
             <summary>
             获取成员初始化表达式。
             </summary>
@@ -3929,7 +3884,7 @@
         </member>
         <member name="M:Masuit.Tools.AspNetCore.Mime.MimeMapper.GetExtensionFromMime(System.String)">
             <summary>
-            返回特定文件扩展名的Content-Type，如果未找到任何对应关系，则返回默认值
+            返回特定Content-Type的文件扩展名，如果未找到任何对应关系，则返回空值
             </summary>
             <param name="mime"></param>
             <returns></returns>

Masuit.Tools.Abstractions/Extensions/BaseType/ObjectExtensions.cs

@@ -1,17 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Numerics;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using DnsClient;
-using Masuit.Tools.Strings;
-using Newtonsoft.Json;
 
 namespace Masuit.Tools
 {
@@ -165,9 +155,9 @@ namespace Masuit.Tools
         /// <summary>
         /// 转换成json字符串
         /// </summary>
-        /// <param name="source"></param>
+        /// <param name="obj"></param>
         /// <returns></returns>
-        public static string ToJsonExt<T>(this T obj, JsonSerializerSettings? setting = null)
+        public static string ToJsonString(this object obj, JsonSerializerSettings setting = null)
         {
             if (obj == null) return string.Empty;
 
@@ -175,10 +165,8 @@ namespace Masuit.Tools
             {
                 return JsonConvert.SerializeObject(obj);
             }
-            else
-            {
-                return JsonConvert.SerializeObject(obj, setting);
-            }
+
+            return JsonConvert.SerializeObject(obj, setting);
         }
 
         /// <summary>

Masuit.Tools.Abstractions/Extensions/BaseType/ObjectExtensions.old.cs

@@ -1,83 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Threading.Tasks;
-
-namespace Masuit.Tools
-{
-    public static partial class ObjectExtensions
-    {
-        #region Map
-
-        /// <summary>
-        /// 映射到目标类型(浅克隆)
-        /// </summary>
-        /// <param name="source">源</param>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <returns>目标类型</returns>
-        [Obsolete("请使用Clone")]
-        public static TDestination MapTo<TDestination>(this object source)
-            where TDestination : new()
-        {
-            return source.Clone<TDestination>();
-        }
-
-        /// <summary>
-        /// 映射到目标类型(深克隆)
-        /// </summary>
-        /// <param name="source">源</param>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <returns>目标类型</returns>
-        [Obsolete("请使用DeepClone")]
-        public static TDestination Map<TDestination>(this object source)
-            where TDestination : new()
-        {
-            return source.DeepClone<TDestination>();
-        }
-
-        /// <summary>
-        /// 映射到目标类型(浅克隆)
-        /// </summary>
-        /// <param name="source">源</param>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <returns>目标类型</returns>
-        [Obsolete("请使用CloneAsync")]
-        public static Task<TDestination> MapToAsync<TDestination>(this object source)
-            where TDestination : new()
-        {
-            return Task.Run(() =>
-            {
-                return source.Clone<TDestination>();
-            });
-        }
-
-        /// <summary>
-        /// 映射到目标类型(深克隆)
-        /// </summary>
-        /// <param name="source">源</param>
-        /// <typeparam name="TDestination">目标类型</typeparam>
-        /// <returns>目标类型</returns>
-        [Obsolete("请使用DeepCloneAsync")]
-        public static Task<TDestination> MapAsync<TDestination>(this object source) where TDestination : new()
-        {
-            return source.DeepCloneAsync<TDestination>();
-        }
-
-        #endregion Map
-
-        private static readonly JsonSerializerSettings defaultJsonSettings = new JsonSerializerSettings()
-        {
-            ReferenceLoopHandling = ReferenceLoopHandling.Ignore
-        };
-
-        /// <summary>
-        /// 转换成json字符串
-        /// </summary>
-        /// <param name="source"></param>
-        /// <returns></returns>
-        [Obsolete("请改用ToJsonExt")]
-        public static string ToJsonString(this object source)
-        {
-            return source.ToJsonExt(ObjectExtensions.defaultJsonSettings);
-        }
-    }
-}

Masuit.Tools.Abstractions/Extensions/BaseType/StringExtensions.cs

@@ -1,4 +1,6 @@
-using System;
+using DnsClient;
+using Masuit.Tools.Strings;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -7,8 +9,6 @@ using System.Net.Sockets;
 using System.Numerics;
 using System.Text;
 using System.Text.RegularExpressions;
-using DnsClient;
-using Masuit.Tools.Strings;
 
 namespace Masuit.Tools
 {
@@ -65,7 +65,7 @@ namespace Masuit.Tools
         /// <param name="str"></param>
         /// <param name="bin">进制</param>
         /// <returns></returns>
-        public static long ToBinary(this string str, int bin)
+        public static long FromBinary(this string str, int bin)
         {
             var nf = new NumberFormater(bin);
             return nf.FromString(str);
@@ -77,7 +77,7 @@ namespace Masuit.Tools
         /// <param name="str"></param>
         /// <param name="bin">进制</param>
         /// <returns></returns>
-        public static BigInteger ToBinaryBig(this string str, int bin)
+        public static BigInteger FromBinaryBig(this string str, int bin)
         {
             var nf = new NumberFormater(bin);
             return nf.FromStringBig(str);
@@ -270,7 +270,7 @@ namespace Masuit.Tools
                 string[] wi = ("7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2").Split(',');
                 char[] ai = s.Remove(17).ToCharArray();
                 int sum = 0;
-                for (int i = 0 ; i < 17 ; i++)
+                for (int i = 0; i < 17; i++)
                 {
                     sum += wi[i].ToInt32() * ai[i].ToString().ToInt32();
                 }

Masuit.Tools.Abstractions/Extensions/BaseType/StringExtensions.old.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Numerics;
-
-namespace Masuit.Tools
-{
-    public static partial class StringExtensions
-    {
-        /// <summary>
-        /// 任意进制转十进制
-        /// </summary>
-        /// <param name="str"></param>
-        /// <param name="bin">进制</param>
-        /// <returns></returns>
-
-        public static long FromBinary(this string str, int bin)
-        {
-            return str.ToBinary(bin);
-        }
-
-        /// <summary>
-        /// 任意进制转大数十进制
-        /// </summary>
-        /// <param name="str"></param>
-        /// <param name="bin">进制</param>
-        /// <returns></returns>
-        [Obsolete("ToBinaryBig")]
-        public static BigInteger FromBinaryBig(this string str, int bin)
-        {
-            return str.ToBinaryBig(bin);
-        }
-    }
-}

Masuit.Tools.Abstractions/Files/INIFile.cs

@@ -17,10 +17,10 @@ namespace Masuit.Tools.Files
         /// <summary>
         /// 传入INI文件路径构造对象
         /// </summary>
-        /// <param name="INIPath">INI文件路径</param>
-        public INIFile(string INIPath)
+        /// <param name="iniPath">INI文件路径</param>
+        public INIFile(string iniPath)
         {
-            path = INIPath;
+            path = iniPath;
         }
 
         [DllImport("kernel32")]
@@ -35,24 +35,24 @@ namespace Masuit.Tools.Files
         /// <summary>
         /// 写INI文件
         /// </summary>
-        /// <param name="Section">分组节点</param>
-        /// <param name="Key">关键字</param>
-        /// <param name="Value">值</param>
-        public void IniWriteValue(string Section, string Key, string Value)
+        /// <param name="section">分组节点</param>
+        /// <param name="key">关键字</param>
+        /// <param name="value">值</param>
+        public void IniWriteValue(string section, string key, string value)
         {
-            WritePrivateProfileString(Section, Key, Value, this.path);
+            WritePrivateProfileString(section, key, value, path);
         }
 
         /// <summary>
         /// 读取INI文件
         /// </summary>
-        /// <param name="Section">分组节点</param>
-        /// <param name="Key">关键字</param>
+        /// <param name="section">分组节点</param>
+        /// <param name="key">关键字</param>
         /// <returns>值</returns>
-        public string IniReadValue(string Section, string Key)
+        public string IniReadValue(string section, string key)
         {
             StringBuilder temp = new StringBuilder(255);
-            int i = GetPrivateProfileString(Section, Key, "", temp, 255, path);
+            int i = GetPrivateProfileString(section, key, "", temp, 255, path);
             return temp.ToString();
         }
 
@@ -80,10 +80,10 @@ namespace Masuit.Tools.Files
         /// <summary>
         /// 删除ini文件下指定段落下的所有键
         /// </summary>
-        /// <param name="Section">分组节点</param>
-        public void ClearSection(string Section)
+        /// <param name="section">分组节点</param>
+        public void ClearSection(string section)
         {
-            IniWriteValue(Section, null, null);
+            IniWriteValue(section, null, null);
         }
     }
 }

NetCoreTest/Program.cs

@@ -1,7 +1,9 @@
-using Masuit.Tools.Security;
+using Masuit.Tools;
+using Masuit.Tools.Security;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace NetCoreTest
@@ -10,6 +12,8 @@ namespace NetCoreTest
     {
         public static void Main(string[] args)
         {
+            var list = new List<string>();
+            list.AddRangeIfNotContains("1", "11"); // 将被添加元素中的长度大于1的元素添加到list
             var rsaKey = RsaCrypt.GenerateRsaKeys(RsaKeyType.PKCS8, 2048);
             Console.WriteLine(rsaKey.PrivateKey);
             Console.WriteLine(rsaKey.PublicKey);

README.md

@@ -363,6 +363,7 @@ public class MyClass
 ```csharp
 List<string> srcs = "html".MatchImgSrcs().ToList();// 获取html字符串里所有的img标签的src属性
 var imgTags = "html".MatchImgTags();//获取html字符串里的所有的img标签
+var str="html".RemoveHtmlTag(); // 去除html标签
 ...
 ```
 ### 22.DateTime扩展
@@ -948,6 +949,9 @@ var list = new List<string>()
 {
     "1","3","3","3"
 };
+list.AddRangeIf(s => s.Length > 1, "1", "11"); // 将被添加元素中的长度大于1的元素添加到list
+list.AddRangeIfNotContains("1", "11"); // 将被添加元素中不包含的元素添加到list
+list.RemoveWhere(s => s.Length<1); // 将集合中长度小于1的元素移除
 list.InsertAfter(0, "2"); // 在第一个元素之后插入
 list.InsertAfter(s => s == "1", "2"); // 在元素"1"后插入
 var dic = list.ToDictionarySafety(s => s); // 安全的转换成字典类型，当键重复时只添加一个键
@@ -972,6 +976,30 @@ var mimeMapper = new MimeMapper();
 var mime = mimeMapper.GetExtensionFromMime("image/jpeg"); // .jpg
 var ext = mimeMapper.GetMimeFromExtension(".jpg"); // image/jpeg
 ```
+### 41.日期时间扩展
+```csharp
+DateTime.Now.GetTotalSeconds(); // 获取该时间相对于1970-01-01 00:00:00的秒数
+DateTime.Now.GetTotalMilliseconds(); // 获取该时间相对于1970-01-01 00:00:00的毫秒数
+DateTime.Now.GetTotalMicroseconds(); // 获取该时间相对于1970-01-01 00:00:00的微秒数
+DateTime.Now.GetTotalNanoseconds(); // 获取该时间相对于1970-01-01 00:00:00的纳秒数
+...
+```
+### 42.流转换
+```csharp
+stream.SaveAsMemoryStream(); // 任意流转换成内存流
+stream.ToArray(); // 任意流转换成二进制数组
+```
+### 43.数值转换
+```csharp
+1.2345678901.Digits8(); // 将小数截断为8位
+1.23.To<int>(); // 小数转int
+1.23.To<T>(); // 小数转T基本类型
+```
+### 44.简繁转换
+```csharp
+var str="个体".ToTraditional(); // 转繁体
+var str="個體".ToSimplified(); // 转简体
+```
 
 # Asp.Net MVC和Asp.Net Core的支持断点续传和多线程下载的ResumeFileResult
 

Test/Masuit.Tools.Abstractions.Test/Security/RsaCryptTest.cs

@@ -23,7 +23,7 @@ namespace Masuit.Tools.Abstractions.Test.Security
                 SdTime = DateTime.Parse("2020-08-14"),
                 Name = "asdf"
             }
-            .ToJsonExt()
+            .ToJsonString()
             .RSAEncrypt()
             .RSADecrypt();