lazy y chen 2 роки тому
батько
коміт
d24305445f

+ 9 - 0
Masuit.Tools.Abstractions/Extensions/BaseType/ObjectExtensions.cs

@@ -212,6 +212,15 @@ namespace Masuit.Tools
 			var dictionary = new Dictionary<string, object>();
 			if (value != null)
 			{
+				if (value is IDictionary dic)
+				{
+					foreach (DictionaryEntry e in dic)
+					{
+						dictionary.Add(e.Key.ToString(), e.Value);
+					}
+					return dictionary;
+				}
+
 				foreach (var property in value.GetType().GetProperties())
 				{
 					var obj = property.GetValue(value, null);

+ 2 - 2
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;net7</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.6.2.3</Version>
+        <Version>2.6.2.4</Version>
         <Authors>懒得勤快</Authors>
         <Description>Masuit.Tools基础公共库,包含一些常用的操作类,大都是静态类,加密解密,反射操作,Excel简单导出,权重随机筛选算法,分布式短id,表达式树,linq扩展,文件压缩,多线程下载和FTP客户端,硬件信息,字符串扩展方法,日期时间扩展操作,中国农历,大文件拷贝,图像裁剪,验证码,断点续传,集合扩展等常用封装。</Description>
         <Copyright>懒得勤快,长空X</Copyright>
@@ -51,7 +51,7 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-        <PackageReference Include="System.Management" Version="7.0.1" />
+        <PackageReference Include="System.Management" Version="7.0.2" />
         <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
         <PackageReference Include="SharpCompress" Version="0.33.0" />
     </ItemGroup>

+ 85 - 72
Masuit.Tools.Abstractions/Strings/Template.cs

@@ -4,84 +4,97 @@ using System.Text.RegularExpressions;
 
 namespace Masuit.Tools.Strings
 {
-    /// <summary>
-    /// 模版引擎
-    /// </summary>
-    public class Template
-    {
-        private string Content { get; set; }
+	/// <summary>
+	/// 模版引擎
+	/// </summary>
+	public class Template
+	{
+		private string Content { get; set; }
 
-        /// <summary>
-        /// 模版引擎
-        /// </summary>
-        /// <param name="content"></param>
-        public Template(string content)
-        {
-            Content = content;
-        }
+		/// <summary>
+		/// 模版引擎
+		/// </summary>
+		/// <param name="content"></param>
+		public Template(string content)
+		{
+			Content = content;
+		}
 
-        /// <summary>
-        /// 创建模板
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public static Template Create(string content)
-        {
-            return new Template(content);
-        }
+		/// <summary>
+		/// 创建模板
+		/// </summary>
+		/// <param name="content"></param>
+		/// <returns></returns>
+		public static Template Create(string content)
+		{
+			return new Template(content);
+		}
 
-        /// <summary>
-        /// 设置变量
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public Template Set(string key, string value)
-        {
-            Content = Content.Replace("{{" + key + "}}", value);
-            return this;
-        }
+		/// <summary>
+		/// 设置变量
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="value"></param>
+		/// <returns></returns>
+		public Template Set(string key, string value)
+		{
+			Content = Content.Replace("{{" + key + "}}", value);
+			return this;
+		}
 
-        /// <summary>
-        /// 设置变量
-        /// </summary>
-        public Template Set(object obj)
-        {
-            var dic = obj.ToDictionary();
-            Set(dic);
-            return this;
-        }
+		/// <summary>
+		/// 设置变量
+		/// </summary>
+		public Template Set(object obj)
+		{
+			var dic = obj.ToDictionary();
+			Set(dic);
+			return this;
+		}
 
-        /// <summary>
-        /// 设置变量
-        /// </summary>
-        public Template Set(Dictionary<string, string> dic)
-        {
-            foreach (var x in dic)
-            {
-                Content = Content.Replace("{{" + x.Key + "}}", x.Value);
-            }
+		/// <summary>
+		/// 设置变量
+		/// </summary>
+		public Template Set(Dictionary<string, string> dic)
+		{
+			foreach (var x in dic)
+			{
+				Content = Content.Replace("{{" + x.Key + "}}", x.Value);
+			}
 
-            return this;
-        }
+			return this;
+		}
 
-        /// <summary>
-        /// 渲染模板
-        /// </summary>
-        /// <param name="check">是否检查未使用的模板变量</param>
-        /// <returns></returns>
-        public string Render(bool check = false)
-        {
-            if (check)
-            {
-                var mc = Regex.Matches(Content, @"\{\{.+?\}\}");
-                foreach (Match m in mc)
-                {
-                    throw new ArgumentException($"模版变量{m.Value}未被使用");
-                }
-            }
+		/// <summary>
+		/// 设置变量
+		/// </summary>
+		public Template Set(Dictionary<string, object> dic)
+		{
+			foreach (var x in dic)
+			{
+				Content = Content.Replace("{{" + x.Key + "}}", x.Value.ToString());
+			}
 
-            return Content;
-        }
-    }
+			return this;
+		}
+
+		/// <summary>
+		/// 渲染模板
+		/// </summary>
+		/// <param name="check">是否检查未使用的模板变量</param>
+		/// <returns></returns>
+		public string Render(bool check = false)
+		{
+			if (check)
+			{
+				var mc = Regex.Matches(Content, @"\{\{.+?\}\}");
+				foreach (Match m in mc)
+				{
+					throw new ArgumentException($"模版变量{m.Value}未被使用");
+				}
+			}
+
+			return Content;
+		}
+	}
 }

+ 3 - 3
Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj

@@ -18,7 +18,7 @@
         <Product>Masuit.Tools.AspNetCore</Product>
         <PackageId>Masuit.Tools.AspNetCore</PackageId>
         <LangVersion>latest</LangVersion>
-        <Version>1.2.2.3</Version>
+        <Version>1.2.2.4</Version>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <FileVersion>1.1.9</FileVersion>
@@ -59,9 +59,9 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[5.0.17]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.16]" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.18]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net7'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" />
     </ItemGroup>
 </Project>

+ 3 - 3
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -6,7 +6,7 @@
 官网教程:https://ldqk.org/55
 github:https://github.com/ldqk/Masuit.Tools
         </Description>
-        <Version>2.6.2.3</Version>
+        <Version>2.6.2.4</Version>
         <Copyright>Copyright © 懒得勤快</Copyright>
         <PackageProjectUrl>https://github.com/ldqk/Masuit.Tools</PackageProjectUrl>
         <PackageTags>Masuit.Tools,工具库,Utility,Crypt,Extensions</PackageTags>
@@ -48,10 +48,10 @@ github:https://github.com/ldqk/Masuit.Tools
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.17]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.16]" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.18]" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net7'">
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
     </ItemGroup>
     <ItemGroup>
       <Compile Remove="..\Masuit.Tools.Abstractions\Mapping\**" />

+ 3 - 3
Masuit.Tools.Excel/Masuit.Tools.Excel.csproj

@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>1.2.5.9</Version>
+        <Version>1.2.6</Version>
         <Authors>懒得勤快</Authors>
         <Description>Masuit.Tools.Excel导出库,支持一些简单数据的导出,支持图片列</Description>
         <Copyright>懒得勤快</Copyright>
@@ -16,7 +16,7 @@
         <RepositoryType>Github</RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-        <FileVersion>1.2.4.1</FileVersion>
+        <FileVersion>1.2.4.2</FileVersion>
         <Company>masuit.org</Company>
         <AssemblyVersion>1.2.3</AssemblyVersion>
         <PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
@@ -38,7 +38,7 @@
       </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="EPPlus" Version="6.2.4" />
+        <PackageReference Include="EPPlus" Version="6.2.6" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
     <ItemGroup>

+ 1 - 1
Masuit.Tools/Masuit.Tools.csproj

@@ -199,7 +199,7 @@
       <Version>1.0.0-beta15</Version>
     </PackageReference>
     <PackageReference Include="StackExchange.Redis">
-      <Version>2.6.111</Version>
+      <Version>2.6.116</Version>
     </PackageReference>
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>

+ 1 - 1
Test/Masuit.Tools.Core.Test/Masuit.Tools.Core.Test.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.7" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="xunit" Version="2.4.2" />