From 4aea7a0224bd40bb6b2f08a290ca6eadc19fced0 Mon Sep 17 00:00:00 2001
From: root <8907060@qq.com>
Date: Mon, 25 Sep 2023 10:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=83=A8=E5=88=86=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/version.props                           |  2 +-
 .../Http/HttpContentType.cs                   |  0
 src/Util.AspNetCore/Http/HttpRequest.cs       |  8 ++--
 .../Http/IHttpClient.cs                       |  2 +-
 .../Http/IHttpRequest.cs                      |  2 +-
 .../AspNetCoreServiceRegistrar.cs             |  9 ----
 src/Util.AspNetCore/Usings.cs                 |  1 +
 src/Util.Core/ObjectMapping/IObjectMapper.cs  | 42 +++++++++----------
 .../IUnitOfWorkActionManager.cs               |  0
 src/Util.Data.Core/01-Util.Data.Core.csproj   |  2 +-
 .../FileSize.cs                               |  0
 .../FileSizeUnit.cs                           |  0
 .../FileStorageInfo.cs                        |  0
 src/Util.FileStorage/Usings.cs                |  1 +
 14 files changed, 32 insertions(+), 37 deletions(-)
 rename src/{Util.Core => Util.AspNetCore}/Http/HttpContentType.cs (100%)
 rename src/{Util.Core => Util.AspNetCore}/Http/IHttpClient.cs (95%)
 rename src/{Util.Core => Util.AspNetCore}/Http/IHttpRequest.cs (96%)
 rename src/{Util.Core/Data => Util.Data.Abstractions}/IUnitOfWorkActionManager.cs (100%)
 rename src/{Util.Core/FileStorage => Util.FileStorage}/FileSize.cs (100%)
 rename src/{Util.Core/FileStorage => Util.FileStorage}/FileSizeUnit.cs (100%)
 rename src/{Util.Core/FileStorage => Util.FileStorage}/FileStorageInfo.cs (100%)

diff --git a/build/version.props b/build/version.props
index 35ed94c2..b862a1f5 100644
--- a/build/version.props
+++ b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>7</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>31</VersionPatch>
+		<VersionPatch>33</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>
diff --git a/src/Util.Core/Http/HttpContentType.cs b/src/Util.AspNetCore/Http/HttpContentType.cs
similarity index 100%
rename from src/Util.Core/Http/HttpContentType.cs
rename to src/Util.AspNetCore/Http/HttpContentType.cs
diff --git a/src/Util.AspNetCore/Http/HttpRequest.cs b/src/Util.AspNetCore/Http/HttpRequest.cs
index 42691287..91cacb57 100644
--- a/src/Util.AspNetCore/Http/HttpRequest.cs
+++ b/src/Util.AspNetCore/Http/HttpRequest.cs
@@ -65,6 +65,7 @@ public class HttpRequest<TResult> : IHttpRequest<TResult> where TResult : class
         Cookies = new Dictionary<string, string>();
         HttpContentType = Util.Http.HttpContentType.Json.Description();
         CharacterEncoding = System.Text.Encoding.UTF8;
+        IsUseCookies = true;
     }
 
     #endregion
@@ -118,7 +119,7 @@ public class HttpRequest<TResult> : IHttpRequest<TResult> where TResult : class
     /// <summary>
     /// 是否自动携带cookie
     /// </summary>
-    protected bool? IsUseCookies { get; private set; }
+    protected bool IsUseCookies { get; private set; }
     /// <summary>
     /// 发送前操作
     /// </summary>
@@ -326,7 +327,7 @@ public class HttpRequest<TResult> : IHttpRequest<TResult> where TResult : class
     #region UseCookies(设置是否自动携带cookie)
 
     /// <inheritdoc />
-    public IHttpRequest<TResult> UseCookies( bool isUseCookies = true ) {
+    public IHttpRequest<TResult> UseCookies( bool isUseCookies ) {
         IsUseCookies = isUseCookies;
         return this;
     }
@@ -701,7 +702,8 @@ public class HttpRequest<TResult> : IHttpRequest<TResult> where TResult : class
     /// 初始化是否携带Cookie
     /// </summary>
     protected virtual void InitUseCookies( HttpClientHandler handler ) {
-        handler.UseCookies = IsUseCookies.SafeValue();
+        if ( handler.UseCookies != IsUseCookies )
+            handler.UseCookies = IsUseCookies;
     }
 
     #endregion
diff --git a/src/Util.Core/Http/IHttpClient.cs b/src/Util.AspNetCore/Http/IHttpClient.cs
similarity index 95%
rename from src/Util.Core/Http/IHttpClient.cs
rename to src/Util.AspNetCore/Http/IHttpClient.cs
index 491930f6..904c8383 100644
--- a/src/Util.Core/Http/IHttpClient.cs
+++ b/src/Util.AspNetCore/Http/IHttpClient.cs
@@ -3,7 +3,7 @@
 /// <summary>
 /// Http客户端
 /// </summary>
-public interface IHttpClient {
+public interface IHttpClient : ISingletonDependency {
     /// <summary>
     /// 发送Get请求
     /// </summary>
diff --git a/src/Util.Core/Http/IHttpRequest.cs b/src/Util.AspNetCore/Http/IHttpRequest.cs
similarity index 96%
rename from src/Util.Core/Http/IHttpRequest.cs
rename to src/Util.AspNetCore/Http/IHttpRequest.cs
index 8adfc8ef..a5b7355f 100644
--- a/src/Util.Core/Http/IHttpRequest.cs
+++ b/src/Util.AspNetCore/Http/IHttpRequest.cs
@@ -93,7 +93,7 @@ public interface IHttpRequest<TResult> : IHttpRequest where TResult : class {
     /// 设置是否自动携带cookie
     /// </summary>
     /// <param name="isUseCookies">是否自动携带cookie</param>
-    IHttpRequest<TResult> UseCookies( bool isUseCookies = true );
+    IHttpRequest<TResult> UseCookies( bool isUseCookies );
     /// <summary>
     /// 设置Cookie
     /// </summary>
diff --git a/src/Util.AspNetCore/Infrastructure/AspNetCoreServiceRegistrar.cs b/src/Util.AspNetCore/Infrastructure/AspNetCoreServiceRegistrar.cs
index d30dc914..e1b3a929 100644
--- a/src/Util.AspNetCore/Infrastructure/AspNetCoreServiceRegistrar.cs
+++ b/src/Util.AspNetCore/Infrastructure/AspNetCoreServiceRegistrar.cs
@@ -1,5 +1,4 @@
 using Util.Helpers;
-using Util.Http;
 using Util.SystemTextJson;
 
 namespace Util.Infrastructure; 
@@ -32,7 +31,6 @@ public class AspNetCoreServiceRegistrar : IServiceRegistrar {
             RegisterHttpContextAccessor( services );
             services.AddHttpClient();
             RegisterServiceLocator();
-            RegisterHttpClient( services );
             ConfigJsonOptions( services );
         } );
         return null;
@@ -54,13 +52,6 @@ public class AspNetCoreServiceRegistrar : IServiceRegistrar {
         Ioc.SetServiceProviderAction( () => Web.ServiceProvider );
     }
 
-    /// <summary>
-    /// 注册Http客户端
-    /// </summary>
-    private void RegisterHttpClient( IServiceCollection services ) {
-        services.TryAddSingleton<IHttpClient, HttpClientService>();
-    }
-
     /// <summary>
     /// 配置Json
     /// </summary>
diff --git a/src/Util.AspNetCore/Usings.cs b/src/Util.AspNetCore/Usings.cs
index 34a9bb72..4689811a 100644
--- a/src/Util.AspNetCore/Usings.cs
+++ b/src/Util.AspNetCore/Usings.cs
@@ -13,6 +13,7 @@ global using System.Net.Sockets;
 global using System.Net;
 global using System.Web;
 global using System.Net.Http;
+global using System.ComponentModel;
 global using System.Security.Cryptography.X509Certificates;
 global using Microsoft.AspNetCore.Hosting;
 global using Microsoft.AspNetCore.Http;
diff --git a/src/Util.Core/ObjectMapping/IObjectMapper.cs b/src/Util.Core/ObjectMapping/IObjectMapper.cs
index 8d9511a3..40df0c49 100644
--- a/src/Util.Core/ObjectMapping/IObjectMapper.cs
+++ b/src/Util.Core/ObjectMapping/IObjectMapper.cs
@@ -1,22 +1,22 @@
-namespace Util.ObjectMapping; 
-
-/// <summary>
-/// 对象映射器
-/// </summary>
-public interface IObjectMapper {
-    /// <summary>
-    /// 将源对象映射到目标对象
-    /// </summary>
-    /// <typeparam name="TSource">源类型</typeparam>
-    /// <typeparam name="TDestination">目标类型</typeparam>
-    /// <param name="source">源对象</param>
-    TDestination Map<TSource, TDestination>( TSource source );
-    /// <summary>
-    /// 将源对象映射到目标对象
-    /// </summary>
-    /// <typeparam name="TSource">源类型</typeparam>
-    /// <typeparam name="TDestination">目标类型</typeparam>
-    /// <param name="source">源对象</param>
-    /// <param name="destination">目标对象</param>
-    TDestination Map<TSource, TDestination>( TSource source, TDestination destination );
+namespace Util.ObjectMapping; 
+
+/// <summary>
+/// 对象映射器
+/// </summary>
+public interface IObjectMapper {
+    /// <summary>
+    /// 将源对象映射到目标对象
+    /// </summary>
+    /// <typeparam name="TSource">源类型</typeparam>
+    /// <typeparam name="TDestination">目标类型</typeparam>
+    /// <param name="source">源对象</param>
+    TDestination Map<TSource, TDestination>( TSource source );
+    /// <summary>
+    /// 将源对象映射到目标对象
+    /// </summary>
+    /// <typeparam name="TSource">源类型</typeparam>
+    /// <typeparam name="TDestination">目标类型</typeparam>
+    /// <param name="source">源对象</param>
+    /// <param name="destination">目标对象</param>
+    TDestination Map<TSource, TDestination>( TSource source, TDestination destination );
 }
\ No newline at end of file
diff --git a/src/Util.Core/Data/IUnitOfWorkActionManager.cs b/src/Util.Data.Abstractions/IUnitOfWorkActionManager.cs
similarity index 100%
rename from src/Util.Core/Data/IUnitOfWorkActionManager.cs
rename to src/Util.Data.Abstractions/IUnitOfWorkActionManager.cs
diff --git a/src/Util.Data.Core/01-Util.Data.Core.csproj b/src/Util.Data.Core/01-Util.Data.Core.csproj
index 981f843d..059581bd 100644
--- a/src/Util.Data.Core/01-Util.Data.Core.csproj
+++ b/src/Util.Data.Core/01-Util.Data.Core.csproj
@@ -27,7 +27,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
+		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Util.Core/FileStorage/FileSize.cs b/src/Util.FileStorage/FileSize.cs
similarity index 100%
rename from src/Util.Core/FileStorage/FileSize.cs
rename to src/Util.FileStorage/FileSize.cs
diff --git a/src/Util.Core/FileStorage/FileSizeUnit.cs b/src/Util.FileStorage/FileSizeUnit.cs
similarity index 100%
rename from src/Util.Core/FileStorage/FileSizeUnit.cs
rename to src/Util.FileStorage/FileSizeUnit.cs
diff --git a/src/Util.Core/FileStorage/FileStorageInfo.cs b/src/Util.FileStorage/FileStorageInfo.cs
similarity index 100%
rename from src/Util.Core/FileStorage/FileStorageInfo.cs
rename to src/Util.FileStorage/FileStorageInfo.cs
diff --git a/src/Util.FileStorage/Usings.cs b/src/Util.FileStorage/Usings.cs
index 51e7d135..25753a1c 100644
--- a/src/Util.FileStorage/Usings.cs
+++ b/src/Util.FileStorage/Usings.cs
@@ -3,3 +3,4 @@ global using System.Threading.Tasks;
 global using System.Collections.Generic;
 global using System.Threading;
 global using System.IO;
+global using System.ComponentModel;
\ No newline at end of file