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 @@ 7 1 - 31 + 33 $(VersionMajor).$(VersionMinor).$(VersionPatch) 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 : IHttpRequest where TResult : class Cookies = new Dictionary(); HttpContentType = Util.Http.HttpContentType.Json.Description(); CharacterEncoding = System.Text.Encoding.UTF8; + IsUseCookies = true; } #endregion @@ -118,7 +119,7 @@ public class HttpRequest : IHttpRequest where TResult : class /// /// 是否自动携带cookie /// - protected bool? IsUseCookies { get; private set; } + protected bool IsUseCookies { get; private set; } /// /// 发送前操作 /// @@ -326,7 +327,7 @@ public class HttpRequest : IHttpRequest where TResult : class #region UseCookies(设置是否自动携带cookie) /// - public IHttpRequest UseCookies( bool isUseCookies = true ) { + public IHttpRequest UseCookies( bool isUseCookies ) { IsUseCookies = isUseCookies; return this; } @@ -701,7 +702,8 @@ public class HttpRequest : IHttpRequest where TResult : class /// 初始化是否携带Cookie /// 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 @@ /// /// Http客户端 /// -public interface IHttpClient { +public interface IHttpClient : ISingletonDependency { /// /// 发送Get请求 /// 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 : IHttpRequest where TResult : class { /// 设置是否自动携带cookie /// /// 是否自动携带cookie - IHttpRequest UseCookies( bool isUseCookies = true ); + IHttpRequest UseCookies( bool isUseCookies ); /// /// 设置Cookie /// 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 ); } - /// - /// 注册Http客户端 - /// - private void RegisterHttpClient( IServiceCollection services ) { - services.TryAddSingleton(); - } - /// /// 配置Json /// 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; - -/// -/// 对象映射器 -/// -public interface IObjectMapper { - /// - /// 将源对象映射到目标对象 - /// - /// 源类型 - /// 目标类型 - /// 源对象 - TDestination Map( TSource source ); - /// - /// 将源对象映射到目标对象 - /// - /// 源类型 - /// 目标类型 - /// 源对象 - /// 目标对象 - TDestination Map( TSource source, TDestination destination ); +namespace Util.ObjectMapping; + +/// +/// 对象映射器 +/// +public interface IObjectMapper { + /// + /// 将源对象映射到目标对象 + /// + /// 源类型 + /// 目标类型 + /// 源对象 + TDestination Map( TSource source ); + /// + /// 将源对象映射到目标对象 + /// + /// 源类型 + /// 目标类型 + /// 源对象 + /// 目标对象 + TDestination Map( 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 @@ - + 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