From a81e0e7f9caaf8f67971cc8b6ce5187a6bcad548 Mon Sep 17 00:00:00 2001
From: Joes <dygood@outlook.com>
Date: Wed, 24 Jul 2024 09:09:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sample/WebApi.Test.Unit/AppWebModule.cs       |  1 +
 .../ServiceModules/ControllersModule.cs       |  6 +-
 .../ServiceModules/CorsModule.cs              |  2 +-
 .../ServiceModules/DistributedLockModule.cs   |  2 +-
 .../ServiceModules/MemoryCacheModule.cs       |  2 +-
 .../ServiceModules/MongoFSModule.cs           |  2 +-
 .../ServiceModules/MongoModule.cs             |  2 +-
 .../ServiceModules/OpenTelemetryModule.cs     |  2 +-
 .../ServiceModules/OutPutCachingModule.cs     |  2 +-
 .../ServiceModules/RabbitModule.cs            |  2 +-
 .../ResponseCompressionModule.cs              |  6 +-
 .../ServiceModules/SwaggerModule.cs           |  2 +-
 .../WebApi.Test.Unit/WebApi.Test.Unit.csproj  |  2 +-
 src/Directory.Packages.props                  | 71 +++++++++----------
 14 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/sample/WebApi.Test.Unit/AppWebModule.cs b/sample/WebApi.Test.Unit/AppWebModule.cs
index 693ea714..87189196 100644
--- a/sample/WebApi.Test.Unit/AppWebModule.cs
+++ b/sample/WebApi.Test.Unit/AppWebModule.cs
@@ -2,6 +2,7 @@
 using EasilyNET.AutoDependencyInjection.Contexts;
 using EasilyNET.AutoDependencyInjection.Modules;
 using EasilyNET.WebCore.Handlers;
+using WebApi.Test.Unit.ServiceModules;
 
 // ReSharper disable ClassNeverInstantiated.Global
 
diff --git a/sample/WebApi.Test.Unit/ServiceModules/ControllersModule.cs b/sample/WebApi.Test.Unit/ServiceModules/ControllersModule.cs
index 7dae0741..8099b8ac 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/ControllersModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/ControllersModule.cs
@@ -1,16 +1,16 @@
+using System.Net;
+using System.Text.Json.Serialization;
 using EasilyNET.AutoDependencyInjection.Contexts;
 using EasilyNET.AutoDependencyInjection.Modules;
 using EasilyNET.WebCore.JsonConverters;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using System.Net;
-using System.Text.Json.Serialization;
 using WebApi.Test.Unit.Common;
 
 // ReSharper disable UnusedType.Local
 // ReSharper disable ClassNeverInstantiated.Global
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// 注册一些控制器的基本内容
diff --git a/sample/WebApi.Test.Unit/ServiceModules/CorsModule.cs b/sample/WebApi.Test.Unit/ServiceModules/CorsModule.cs
index 5d53bad1..f71efcba 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/CorsModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/CorsModule.cs
@@ -1,7 +1,7 @@
 using EasilyNET.AutoDependencyInjection.Contexts;
 using EasilyNET.AutoDependencyInjection.Modules;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// 配置跨域服务及中间件
diff --git a/sample/WebApi.Test.Unit/ServiceModules/DistributedLockModule.cs b/sample/WebApi.Test.Unit/ServiceModules/DistributedLockModule.cs
index 8ad07ff2..31427949 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/DistributedLockModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/DistributedLockModule.cs
@@ -1,7 +1,7 @@
 using EasilyNET.AutoDependencyInjection.Contexts;
 using EasilyNET.AutoDependencyInjection.Modules;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// 分布式锁
diff --git a/sample/WebApi.Test.Unit/ServiceModules/MemoryCacheModule.cs b/sample/WebApi.Test.Unit/ServiceModules/MemoryCacheModule.cs
index f70149c0..7c89916b 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/MemoryCacheModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/MemoryCacheModule.cs
@@ -2,7 +2,7 @@
 using EasilyNET.AutoDependencyInjection.Modules;
 using WebApi.Test.Unit.Common;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <inheritdoc />
 internal sealed class MemoryCacheModule : AppModule
diff --git a/sample/WebApi.Test.Unit/ServiceModules/MongoFSModule.cs b/sample/WebApi.Test.Unit/ServiceModules/MongoFSModule.cs
index d2526844..90eb1d02 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/MongoFSModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/MongoFSModule.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// GridFS
diff --git a/sample/WebApi.Test.Unit/ServiceModules/MongoModule.cs b/sample/WebApi.Test.Unit/ServiceModules/MongoModule.cs
index d3226687..42d0e28f 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/MongoModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/MongoModule.cs
@@ -4,7 +4,7 @@
 using EasilyNET.MongoSerializer.AspNetCore;
 using MongoDB.Driver.Linq;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// MongoDB驱动模块
diff --git a/sample/WebApi.Test.Unit/ServiceModules/OpenTelemetryModule.cs b/sample/WebApi.Test.Unit/ServiceModules/OpenTelemetryModule.cs
index 04891eb6..97a1d916 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/OpenTelemetryModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/OpenTelemetryModule.cs
@@ -5,7 +5,7 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// OpenTelemetry相关内容
diff --git a/sample/WebApi.Test.Unit/ServiceModules/OutPutCachingModule.cs b/sample/WebApi.Test.Unit/ServiceModules/OutPutCachingModule.cs
index 2dddfda0..6c566d6c 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/OutPutCachingModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/OutPutCachingModule.cs
@@ -2,7 +2,7 @@
 using EasilyNET.AutoDependencyInjection.Modules;
 using WebApi.Test.Unit.Common;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// 缓存
diff --git a/sample/WebApi.Test.Unit/ServiceModules/RabbitModule.cs b/sample/WebApi.Test.Unit/ServiceModules/RabbitModule.cs
index 3254acab..5c416a2d 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/RabbitModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/RabbitModule.cs
@@ -2,7 +2,7 @@
 using EasilyNET.AutoDependencyInjection.Modules;
 using EasilyNET.RabbitBus.AspNetCore.Enums;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// Rabbit服务注册
diff --git a/sample/WebApi.Test.Unit/ServiceModules/ResponseCompressionModule.cs b/sample/WebApi.Test.Unit/ServiceModules/ResponseCompressionModule.cs
index 63d4f995..20d0c52b 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/ResponseCompressionModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/ResponseCompressionModule.cs
@@ -1,9 +1,9 @@
-using EasilyNET.AutoDependencyInjection.Contexts;
+using System.IO.Compression;
+using EasilyNET.AutoDependencyInjection.Contexts;
 using EasilyNET.AutoDependencyInjection.Modules;
 using Microsoft.AspNetCore.ResponseCompression;
-using System.IO.Compression;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// 响应压缩
diff --git a/sample/WebApi.Test.Unit/ServiceModules/SwaggerModule.cs b/sample/WebApi.Test.Unit/ServiceModules/SwaggerModule.cs
index a08bb955..d67a2006 100644
--- a/sample/WebApi.Test.Unit/ServiceModules/SwaggerModule.cs
+++ b/sample/WebApi.Test.Unit/ServiceModules/SwaggerModule.cs
@@ -2,7 +2,7 @@
 using EasilyNET.AutoDependencyInjection.Modules;
 using Microsoft.OpenApi.Models;
 
-namespace WebApi.Test.Unit;
+namespace WebApi.Test.Unit.ServiceModules;
 
 /// <summary>
 /// Swagger文档的配置
diff --git a/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj b/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
index 406ec2a0..941de508 100644
--- a/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
+++ b/sample/WebApi.Test.Unit/WebApi.Test.Unit.csproj
@@ -38,7 +38,7 @@
         <PackageReference Include="Serilog.Sinks.EventLog" Version="4.0.1-dev-00087" />
         <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageReference Include="Serilog.Sinks.Map" Version="2.0.0" />
-        <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0-dev-00317" />
+        <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0-dev-00322" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     </ItemGroup>
     
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index a7674bc0..282e8656 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,40 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Project>
-	<PropertyGroup>
-		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-	</ItemGroup>
-	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<NoWarn>$(NoWarn);IDE0130;</NoWarn>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
-		<PackageVersion Include="MessagePack" Version="3.0.111-alpha" />
-		<PackageVersion Include="MongoDB.Bson" Version="2.27.0" />
-		<PackageVersion Include="MongoDB.Driver" Version="2.27.0" />
-		<PackageVersion Include="MongoDB.Driver.Core" Version="2.27.0" />
-		<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.27.0" />
-		<PackageVersion Include="RabbitMQ.Client" Version="7.0.0-rc.5" />
-		<PackageVersion Include="Serilog" Version="4.0.1-dev-02205" />
-		<PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.10" />
-		<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
-		<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
-		<!--microsoft asp.net core -->
-		<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.6.24327.7" />
-		<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />
-		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24327.7" />
-		<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.6.24327.7" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24327.7" />
-		<PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.0.0-preview.6.24353.1" />
-	</ItemGroup>
+  <PropertyGroup>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);IDE0130;</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
+    <PackageVersion Include="MessagePack" Version="3.0.111-alpha" />
+    <PackageVersion Include="MongoDB.Bson" Version="2.28.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
+    <PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
+    <PackageVersion Include="MongoDB.Driver.GridFS" Version="2.28.0" />
+    <PackageVersion Include="RabbitMQ.Client" Version="7.0.0-rc.6" />
+    <PackageVersion Include="Serilog" Version="4.0.1-dev-02205" />
+    <PackageVersion Include="Spectre.Console.Json" Version="0.49.2-preview.0.11" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
+    <!--microsoft asp.net core -->
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.6.24327.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.6.24327.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.6.24327.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.6.24327.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24327.7" />
+    <PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.0.0-preview.6.24353.1" />
+  </ItemGroup>
 </Project>
\ No newline at end of file