调整

Coldairarrow · Jul 4, 2021 · 4d6606e · 4d6606e
1 parent 98c1f50
commit 4d6606e
Show file tree

Hide file tree

Showing 73 changed files with 128 additions and 226 deletions.
diff --git a/Colder.Components.sln b/Colder.Components.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31410.414
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31410.357
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.Logging.Abstractions", "src\Colder.Logging.Abstractions\Colder.Logging.Abstractions.csproj", "{B514FF79-D143-4ADE-A1EE-1DF929188AA7}"
 EndProject
@@ -15,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.Logging", "demos\Demo.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.MessageBus.Abstractions", "src\Colder.MessageBus.Abstractions\Colder.MessageBus.Abstractions.csproj", "{D992648F-AF77-46AA-A1D3-24DF7D7F2EC3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.MessageBus.RabbitMQ", "src\Colder.MessageBus.MassTransit\Colder.MessageBus.RabbitMQ.csproj", "{72A99E3C-9134-4103-8D3E-F28FB63B7B0E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil", "src\Colder.CommonUtil\Colder.CommonUtil.csproj", "{55581DAA-76D8-4279-A7FB-61F98A2EA66B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{39C8131E-709C-4240-BF1C-48D88B53E4DE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.MessageBus.MQTT", "src\Colder.MessageBus.MQTT\Colder.MessageBus.MQTT.csproj", "{D26E3E08-5F9D-408B-A7AA-A5D3BB6FBFDB}"
@@ -74,26 +70,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.Dependency", "src\Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.Json", "src\Colder.Json\Colder.Json.csproj", "{9BE5E09B-9AC2-46FD-8D98-A2ADA8511DBE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil.Office", "src\Colder.CommonUtil.Office\Colder.CommonUtil.Office.csproj", "{335C810D-4D1E-422A-85BD-B61385276BA1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil.Zip", "src\Colder.CommonUtil.Zip\Colder.CommonUtil.Zip.csproj", "{9D9CDA87-094E-48B6-AE5E-15D712813CE8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil.Quartz", "src\Colder.CommonUtil.Quartz\Colder.CommonUtil.Quartz.csproj", "{FCAAC836-8083-4C82-B449-94A07A65A5AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil.QRCode", "src\Colder.CommonUtil.QRCode\Colder.CommonUtil.QRCode.csproj", "{F9AEA348-B621-49AC-831A-A6FE18E6C685}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domo.Console", "demos\Domo.Console\Domo.Console.csproj", "{A5A11F0C-4EE0-4F08-BC1C-7CB631B3F062}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.OpenService.Abstractions", "src\Colder.OpenService.Abstractions\Colder.OpenService.Abstractions.csproj", "{3F33D0A7-FFF6-44E6-B7B3-57D2B8A78BE4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.CommonUtil.Primitives", "src\Colder.CommonUtil.Primitives\Colder.CommonUtil.Primitives.csproj", "{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.OpenService.Hosting", "src\Colder.OpenService.Hosting\Colder.OpenService.Hosting.csproj", "{0D725BEA-B026-4FF5-B1F6-74E4E487F27B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.OpenService.Client", "src\Colder.OpenService.Client\Colder.OpenService.Client.csproj", "{F136F6FE-DC82-4427-B161-E5AE768C21AC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.OpenService", "demos\Demo.OpenService\Demo.OpenService.csproj", "{C99EE739-0642-4F28-859A-A93D4FB66439}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.Common", "src\Colder.Common\Colder.Common.csproj", "{7C803214-4388-4C4B-8215-132474150AD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.Common.Util", "src\Colder.Common.Util\Colder.Common.Util.csproj", "{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colder.MessageBus.RabbitMQ", "src\Colder.MessageBus.RabbitMQ\Colder.MessageBus.RabbitMQ.csproj", "{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -120,14 +112,6 @@ Global
 		{D992648F-AF77-46AA-A1D3-24DF7D7F2EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D992648F-AF77-46AA-A1D3-24DF7D7F2EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D992648F-AF77-46AA-A1D3-24DF7D7F2EC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72A99E3C-9134-4103-8D3E-F28FB63B7B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72A99E3C-9134-4103-8D3E-F28FB63B7B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72A99E3C-9134-4103-8D3E-F28FB63B7B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72A99E3C-9134-4103-8D3E-F28FB63B7B0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55581DAA-76D8-4279-A7FB-61F98A2EA66B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55581DAA-76D8-4279-A7FB-61F98A2EA66B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55581DAA-76D8-4279-A7FB-61F98A2EA66B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55581DAA-76D8-4279-A7FB-61F98A2EA66B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D26E3E08-5F9D-408B-A7AA-A5D3BB6FBFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D26E3E08-5F9D-408B-A7AA-A5D3BB6FBFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D26E3E08-5F9D-408B-A7AA-A5D3BB6FBFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -204,22 +188,6 @@ Global
 		{9BE5E09B-9AC2-46FD-8D98-A2ADA8511DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BE5E09B-9AC2-46FD-8D98-A2ADA8511DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BE5E09B-9AC2-46FD-8D98-A2ADA8511DBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{335C810D-4D1E-422A-85BD-B61385276BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{335C810D-4D1E-422A-85BD-B61385276BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{335C810D-4D1E-422A-85BD-B61385276BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{335C810D-4D1E-422A-85BD-B61385276BA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D9CDA87-094E-48B6-AE5E-15D712813CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D9CDA87-094E-48B6-AE5E-15D712813CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D9CDA87-094E-48B6-AE5E-15D712813CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D9CDA87-094E-48B6-AE5E-15D712813CE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCAAC836-8083-4C82-B449-94A07A65A5AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCAAC836-8083-4C82-B449-94A07A65A5AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCAAC836-8083-4C82-B449-94A07A65A5AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCAAC836-8083-4C82-B449-94A07A65A5AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9AEA348-B621-49AC-831A-A6FE18E6C685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9AEA348-B621-49AC-831A-A6FE18E6C685}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9AEA348-B621-49AC-831A-A6FE18E6C685}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9AEA348-B621-49AC-831A-A6FE18E6C685}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5A11F0C-4EE0-4F08-BC1C-7CB631B3F062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5A11F0C-4EE0-4F08-BC1C-7CB631B3F062}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5A11F0C-4EE0-4F08-BC1C-7CB631B3F062}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -228,10 +196,6 @@ Global
 		{3F33D0A7-FFF6-44E6-B7B3-57D2B8A78BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F33D0A7-FFF6-44E6-B7B3-57D2B8A78BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F33D0A7-FFF6-44E6-B7B3-57D2B8A78BE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D725BEA-B026-4FF5-B1F6-74E4E487F27B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D725BEA-B026-4FF5-B1F6-74E4E487F27B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D725BEA-B026-4FF5-B1F6-74E4E487F27B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -244,6 +208,18 @@ Global
 		{C99EE739-0642-4F28-859A-A93D4FB66439}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C99EE739-0642-4F28-859A-A93D4FB66439}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C99EE739-0642-4F28-859A-A93D4FB66439}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C803214-4388-4C4B-8215-132474150AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C803214-4388-4C4B-8215-132474150AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C803214-4388-4C4B-8215-132474150AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C803214-4388-4C4B-8215-132474150AD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -254,8 +230,6 @@ Global
 		{FEC13662-54D5-4EAF-B6E5-4E14BA4475BD} = {ACCF873E-B185-4FEA-8502-D5F708E42168}
 		{4D9F6CC2-C44E-4DE4-9826-7A245CBCD8C9} = {ACCF873E-B185-4FEA-8502-D5F708E42168}
 		{D992648F-AF77-46AA-A1D3-24DF7D7F2EC3} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{72A99E3C-9134-4103-8D3E-F28FB63B7B0E} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{55581DAA-76D8-4279-A7FB-61F98A2EA66B} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{D26E3E08-5F9D-408B-A7AA-A5D3BB6FBFDB} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{D0809548-5A85-4D29-9E54-0FA54621E008} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{21A3F8AB-3588-45BC-893B-DB56AC20A33B} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
@@ -275,16 +249,14 @@ Global
 		{EAF82710-A521-4D7F-8114-39D1CC0A623A} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{F6C92C1B-A235-4CCE-B79E-7FDD57CF48A7} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{9BE5E09B-9AC2-46FD-8D98-A2ADA8511DBE} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{335C810D-4D1E-422A-85BD-B61385276BA1} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{9D9CDA87-094E-48B6-AE5E-15D712813CE8} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{FCAAC836-8083-4C82-B449-94A07A65A5AD} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{F9AEA348-B621-49AC-831A-A6FE18E6C685} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{A5A11F0C-4EE0-4F08-BC1C-7CB631B3F062} = {ACCF873E-B185-4FEA-8502-D5F708E42168}
 		{3F33D0A7-FFF6-44E6-B7B3-57D2B8A78BE4} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
-		{8EB8275D-23D3-4FEC-86EE-1853CE66E5E0} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{0D725BEA-B026-4FF5-B1F6-74E4E487F27B} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{F136F6FE-DC82-4427-B161-E5AE768C21AC} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 		{C99EE739-0642-4F28-859A-A93D4FB66439} = {ACCF873E-B185-4FEA-8502-D5F708E42168}
+		{7C803214-4388-4C4B-8215-132474150AD5} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
+		{AEA151C8-A5AF-43E1-ADD2-40275A6DC4BC} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
+		{675923F6-86D7-463C-A5FD-BCA3F1BD1DA5} = {F9A5FCE5-9F2F-4F22-A618-5D11DB9E7237}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {817CE001-2A40-4054-B349-ECDB5986C92E}

diff --git a/demos/Demo.MessageBus/Demo.MessageBus.csproj b/demos/Demo.MessageBus/Demo.MessageBus.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Colder.Logging.Serilog\Colder.Logging.Serilog.csproj" />
-    <ProjectReference Include="..\..\src\Colder.MessageBus.MassTransit\Colder.MessageBus.RabbitMQ.csproj" />
     <ProjectReference Include="..\..\src\Colder.MessageBus.MQTT\Colder.MessageBus.MQTT.csproj" />
     <ProjectReference Include="..\Demo.Common\Demo.Common.csproj" />
   </ItemGroup>

diff --git a/demos/Demo.OpenService/Controllers/ClientController.cs b/demos/Demo.OpenService/Controllers/ClientController.cs
@@ -1,4 +1,4 @@
-using Colder.CommonUtil.Primitives;
+using Colder.Common;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Threading.Tasks;

diff --git a/demos/Demo.OpenService/Controllers/HelloService.cs b/demos/Demo.OpenService/Controllers/HelloService.cs
@@ -1,4 +1,4 @@
-using Colder.CommonUtil.Primitives;
+using Colder.Common;
 using Colder.OpenService.Hosting;
 using System.Threading.Tasks;
 

diff --git a/demos/Demo.OpenService/IHelloOpenService.cs b/demos/Demo.OpenService/IHelloOpenService.cs
@@ -1,4 +1,4 @@
-using Colder.CommonUtil.Primitives;
+using Colder.Common;
 using Colder.OpenService.Abstractions;
 using System.Threading.Tasks;
 

diff --git a/demos/Demo.Orleans/Demo.Orleans.csproj b/demos/Demo.Orleans/Demo.Orleans.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/demos/Domo.Console/Domo.Console.csproj b/demos/Domo.Console/Domo.Console.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Colder.CommonUtil\Colder.CommonUtil.csproj" />
+    <ProjectReference Include="..\..\src\Colder.Common\Colder.Common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/demos/Domo.Console/Program.cs b/demos/Domo.Console/Program.cs
@@ -1,4 +1,4 @@
-using Colder.CommonUtil;
+using Colder.Common;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -10,7 +10,7 @@ class Program
         static void Main(string[] args)
         {
             Image image = Image.FromFile("1.jpg");
-            var newImg = ImgHelper.AddText(image, (0, 0), (50, 50), "测试", Color.White);
+            var newImg = ImgHelper.AddText(image, new Rectangle(0, 0, 50, 50), "测试", Color.White);
             newImg.Save("2.jpg", ImageFormat.Jpeg);
 
             Console.WriteLine("Hello World!");

diff --git a/src/Colder.Cache/CacheExtentions.cs b/src/Colder.Cache/CacheExtentions.cs
@@ -1,4 +1,4 @@
-using Colder.CommonUtil;
+using Colder.Common;
 using Colder.Json;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Configuration;

diff --git a/src/Colder.Cache/Colder.Cache.csproj b/src/Colder.Cache/Colder.Cache.csproj
@@ -15,15 +15,11 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
+    <PackageReference Include="StackExchange.Redis" Version="2.2.62" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Colder.Json\Colder.Json.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Colder.CommonUtil\Extentions\TypeExtentions.cs" />
-  </ItemGroup>
-
 </Project>
diff --git a/...il.Office/Colder.CommonUtil.Office.csproj → ...der.Common.Util/Colder.Common.Util.csproj b/...il.Office/Colder.CommonUtil.Office.csproj → ...der.Common.Util/Colder.Common.Util.csproj
@@ -2,13 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>通用工具 Office</Description>
+    <Description>通用工具</Description>
     <!--打包-->
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NPOI" Version="2.5.3" />
+    <PackageReference Include="QRCoder" Version="1.4.1" />
+    <PackageReference Include="Quartz" Version="3.3.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Colder.Common\Colder.Common.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Colder.CommonUtil.Zip/FileZipHelper.cs → ...lder.Common.Util/Helpers/FileZipHelper.cs b/src/Colder.CommonUtil.Zip/FileZipHelper.cs → ...lder.Common.Util/Helpers/FileZipHelper.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 文件压缩帮助类
@@ -54,4 +54,31 @@ public static byte[] ZipFile(List<FileEntry> files)
             }
         }
     }
+
+    /// <summary>
+    /// 文件信息
+    /// </summary>
+    public struct FileEntry
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="fileBytes"></param>
+        public FileEntry(string fileName, byte[] fileBytes)
+        {
+            FileName = fileName;
+            FileBytes = fileBytes;
+        }
+
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件字节
+        /// </summary>
+        public byte[] FileBytes { get; set; }
+    }
 }
diff --git a/src/Colder.CommonUtil.Quartz/JobHelper.cs → src/Colder.Common.Util/Helpers/JobHelper.cs b/src/Colder.CommonUtil.Quartz/JobHelper.cs → src/Colder.Common.Util/Helpers/JobHelper.cs
@@ -5,7 +5,7 @@
 using System.Collections.Specialized;
 using System.Threading.Tasks;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 任务帮助类

diff --git a/src/Colder.CommonUtil.Office/NPOIHelper.cs → src/Colder.Common.Util/Helpers/NPOIHelper.cs b/src/Colder.CommonUtil.Office/NPOIHelper.cs → src/Colder.Common.Util/Helpers/NPOIHelper.cs
@@ -5,7 +5,7 @@
 using System.Data;
 using System.IO;
 
-namespace Colder.CommonUtil.Office
+namespace Colder.Common
 {
     /// <summary>
     /// NPOI帮助类

diff --git a/src/Colder.CommonUtil.QRCode/QRCodeHelper.cs → ...older.Common.Util/Helpers/QRCodeHelper.cs b/src/Colder.CommonUtil.QRCode/QRCodeHelper.cs → ...older.Common.Util/Helpers/QRCodeHelper.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Drawing;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 二维码生成帮助类

diff --git a/...older.CommonUtil/Colder.CommonUtil.csproj → src/Colder.Common/Colder.Common.csproj b/...older.CommonUtil/Colder.CommonUtil.csproj → src/Colder.Common/Colder.Common.csproj
@@ -1,9 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>通用工具</Description>
-    <!--打包-->
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -15,4 +13,4 @@
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/...r.CommonUtil/Extentions/ByteExtentions.cs → ...older.Common/Extentions/ByteExtentions.cs b/...r.CommonUtil/Extentions/ByteExtentions.cs → ...older.Common/Extentions/ByteExtentions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 拓展类

diff --git a/...monUtil/Extentions/DataTableExtentions.cs → ....Common/Extentions/DataTableExtentions.cs b/...monUtil/Extentions/DataTableExtentions.cs → ....Common/Extentions/DataTableExtentions.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Text;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// DataTable拓展

diff --git a/...mmonUtil/Extentions/DateTimeExtentions.cs → ...r.Common/Extentions/DateTimeExtentions.cs b/...mmonUtil/Extentions/DateTimeExtentions.cs → ...r.Common/Extentions/DateTimeExtentions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 

diff --git a/...monUtil/Extentions/DeepCloneExtensions.cs → ....Common/Extentions/DeepCloneExtensions.cs b/...monUtil/Extentions/DeepCloneExtensions.cs → ....Common/Extentions/DeepCloneExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 深复制拓展

diff --git a/...r.CommonUtil/Extentions/EnumExtentions.cs → ...older.Common/Extentions/EnumExtentions.cs b/...r.CommonUtil/Extentions/EnumExtentions.cs → ...older.Common/Extentions/EnumExtentions.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     /// 拓展类

diff --git a/...onUtil/Extentions/ExpressionExtentions.cs → ...Common/Extentions/ExpressionExtentions.cs b/...onUtil/Extentions/ExpressionExtentions.cs → ...Common/Extentions/ExpressionExtentions.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace Colder.CommonUtil
+namespace Colder.Common
 {
     /// <summary>
     ///