feat: update nuget package

This commit is contained in:
zhanganzhong 2022-09-07 18:29:51 +08:00
parent 23d0054493
commit 784644e032
17 changed files with 125 additions and 110 deletions

View File

@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "6.0.8",
"commands": [
"dotnet-ef"
]
}
}
}

View File

@ -49,11 +49,11 @@
<ItemGroup>
<PackageReference Include="log4mongo-netcore" Version="3.2.0" />
<PackageReference Include="MicroKnights.Log4NetAdoNetAppender" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="SkyAPM.Agent.AspNetCore" Version="1.3.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="10.4.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="10.4.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
<PackageReference Include="SkyAPM.Agent.AspNetCore" Version="2.0.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.2.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.2.1" />
</ItemGroup>
<ItemGroup>

View File

@ -826,18 +826,6 @@
<param name="name"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.ValuesController.RestsharpGet">
<summary>
测试http请求 RestSharp Get
</summary>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.ValuesController.RestsharpPost">
<summary>
测试http请求 RestSharp Post
</summary>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.ValuesController.TestMutiDBAPI">
<summary>
测试多库连接

View File

@ -2,7 +2,6 @@
using Blog.Core.Common;
using Blog.Core.Common.HttpContextUser;
using Blog.Core.Common.HttpPolly;
using Blog.Core.Common.HttpRestSharp;
using Blog.Core.Common.WebApiClients.HttpApis;
using Blog.Core.EventBus;
using Blog.Core.EventBus.EventHandling;
@ -306,27 +305,6 @@ namespace Blog.Core.Controllers
return Ok(new { success = true, name = name });
}
/// <summary>
/// 测试http请求 RestSharp Get
/// </summary>
/// <returns></returns>
[HttpGet("RestsharpGet")]
[AllowAnonymous]
public MessageModel<BlogViewModels> RestsharpGet()
{
return HttpHelper.GetApi<MessageModel<BlogViewModels>>("http://apk.neters.club/", "api/Blog/DetailNuxtNoPer", "id=1");
}
/// <summary>
/// 测试http请求 RestSharp Post
/// </summary>
/// <returns></returns>
[HttpGet("RestsharpPost")]
[AllowAnonymous]
public TestRestSharpPostDto RestsharpPost()
{
return HttpHelper.PostApi<TestRestSharpPostDto>("http://apk.neters.club/api/Values/TestPostPara?name=老张", new { age = 18 });
}
/// <summary>
/// 测试多库连接
/// </summary>

View File

@ -112,13 +112,14 @@ builder.Services.AddControllers(o =>
options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local;
options.SerializerSettings.Converters.Add(new StringEnumConverter());
})
.AddFluentValidation(config =>
{
//程序集方式添加验证
config.RegisterValidatorsFromAssemblyContaining(typeof(UserRegisterVoValidator));
//是否与MvcValidation共存
config.DisableDataAnnotationsValidation = true;
});
//.AddFluentValidation(config =>
//{
// //程序集方式添加验证
// config.RegisterValidatorsFromAssemblyContaining(typeof(UserRegisterVoValidator));
// //是否与MvcValidation共存
// config.DisableDataAnnotationsValidation = true;
//})
;
builder.Services.AddEndpointsApiExplorer();

31
Blog.Core.Clean.bat Normal file
View File

@ -0,0 +1,31 @@
del .\Blog.Core.Api\bin\*.* /s /q
del .\Blog.Core.Api\obj\*.* /s /q
del .\Blog.Core.Api\wwwroot\ui\*.* /s /q
del .\Blog.Core.Api\WMBlog.db /s /q
del .\Blog.Core.Common\bin\*.* /s /q
del .\Blog.Core.Common\obj\*.* /s /q
del .\Blog.Core.EventBus\bin\*.* /s /q
del .\Blog.Core.EventBus\obj\*.* /s /q
del .\Blog.Core.Extensions\bin\*.* /s /q
del .\Blog.Core.FrameWork\bin\*.* /s /q
del .\Blog.Core.Gateway\bin\*.* /s /q
del .\Blog.Core.IServices\bin\*.* /s /q
del .\Blog.Core.Model\bin\*.* /s /q
del .\Blog.Core.Repository\bin\*.* /s /q
del .\Blog.Core.Serilog.Es\bin\*.* /s /q
del .\Blog.Core.Services\bin\*.* /s /q
del .\Blog.Core.Tasks\bin\*.* /s /q
del .\Blog.Core.Tests\bin\*.* /s /q
del .\Ocelot.Provider.Nacos\bin\*.* /s /q
del .\Blog.Core.Extensions\obj\*.* /s /q
del .\Blog.Core.FrameWork\obj\*.* /s /q
del .\Blog.Core.Gateway\obj\*.* /s /q
del .\Blog.Core.IServices\obj\*.* /s /q
del .\Blog.Core.Model\obj\*.* /s /q
del .\Blog.Core.Repository\obj\*.* /s /q
del .\Blog.Core.Serilog.Es\obj\*.* /s /q
del .\Blog.Core.Services\obj\*.* /s /q
del .\Blog.Core.Tasks\obj\*.* /s /q
del .\Blog.Core.Tests\obj\*.* /s /q
del .\Ocelot.Provider.Nacos\obj\*.* /s /q

View File

@ -4,6 +4,12 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="HttpRestSharp\**" />
<EmbeddedResource Remove="HttpRestSharp\**" />
<None Remove="HttpRestSharp\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="LogHelper\ILoggerHelper.cs" />
<Compile Remove="LogHelper\LogHelper.cs" />
@ -11,20 +17,20 @@
<ItemGroup>
<PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
<PackageReference Include="InitQ" Version="1.0.0.7" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="InitQ" Version="1.0.0.12" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="PinYinConverterCore" Version="1.0.2" />
<PackageReference Include="RestSharp" Version="106.11.8-alpha.0.13" />
<PackageReference Include="RSAExtensions" Version="1.0.3" />
<PackageReference Include="RestSharp" Version="108.0.1" />
<PackageReference Include="RSAExtensions" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
<PackageReference Include="StackExchange.Redis" Version="2.1.58" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.48" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.22.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />
<PackageReference Include="WebApiClient.Extensions.DependencyInjection" Version="2.0.3" />
<PackageReference Include="WebApiClient.JIT" Version="1.1.4" />

View File

@ -6,16 +6,16 @@
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
<PackageReference Include="Confluent.Kafka" Version="1.7.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Confluent.Kafka" Version="1.9.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="protobuf-net" Version="3.1.17" />
<PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
</ItemGroup>

View File

@ -5,30 +5,30 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCoreRateLimit" Version="3.0.5" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
<PackageReference Include="Com.Ctrip.Framework.Apollo" Version="2.4.4" />
<PackageReference Include="Com.Ctrip.Framework.Apollo.Configuration" Version="2.4.1.1" />
<PackageReference Include="Consul" Version="1.6.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.14" />
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Com.Ctrip.Framework.Apollo" Version="2.8.0" />
<PackageReference Include="Com.Ctrip.Framework.Apollo.Configuration" Version="2.8.0" />
<PackageReference Include="Consul" Version="1.6.10.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0-preview.2.20167.3" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.2.20160.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.8" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
<PackageReference Include="nacos-sdk-csharp-unofficial" Version="0.8.5" />
<PackageReference Include="nacos-sdk-csharp-unofficial.AspNetCore" Version="0.8.5" />
<PackageReference Include="nacos-sdk-csharp-unofficial.Extensions.Configuration" Version="0.8.5" />
<PackageReference Include="nacos-sdk-csharp-unofficial.IniParser" Version="0.8.5" />
<PackageReference Include="nacos-sdk-csharp.AspNetCore" Version="1.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.6.3" />
<PackageReference Include="nacos-sdk-csharp.AspNetCore" Version="1.3.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
</ItemGroup>
<ItemGroup>

View File

@ -22,7 +22,7 @@ namespace Blog.Core.Extensions
// inject counter and rules stores
services.AddSingleton<IIpPolicyStore, MemoryCacheIpPolicyStore>();
services.AddSingleton<IRateLimitCounterStore, MemoryCacheRateLimitCounterStore>();
services.AddSingleton<IProcessingStrategy, AsyncKeyLockProcessingStrategy>();
// inject counter and rules distributed cache stores
//services.AddSingleton<IIpPolicyStore, DistributedCacheIpPolicyStore>();
//services.AddSingleton<IRateLimitCounterStore, DistributedCacheRateLimitCounterStore>();

View File

@ -15,13 +15,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.1" />
<PackageReference Include="Ocelot" Version="17.0.0" />
<PackageReference Include="Ocelot.Provider.Consul" Version="17.0.0" />
<PackageReference Include="Ocelot.Provider.Polly" Version="17.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.8" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.8" />
<PackageReference Include="Ocelot" Version="18.0.0" />
<PackageReference Include="Ocelot.Provider.Consul" Version="18.0.0" />
<PackageReference Include="Ocelot.Provider.Polly" Version="18.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>

View File

@ -15,10 +15,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.16" />
<PackageReference Include="sqlSugarCore" Version="5.0.3.4" />
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
<PackageReference Include="sqlSugarCore" Version="5.1.2.6" />
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
</ItemGroup>
</Project>

View File

@ -6,9 +6,9 @@
<ItemGroup>
<PackageReference Include="MongoDB.Bson" Version="2.10.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.10.0" />
<PackageReference Include="MongoDB.Driver" Version="2.10.0" />
<PackageReference Include="MongoDB.Bson" Version="2.17.1" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.17.1" />
<PackageReference Include="MongoDB.Driver" Version="2.17.1" />
</ItemGroup>
@ -21,7 +21,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
</ItemGroup>
<ItemGroup>

View File

@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="Serilog" Version="2.11.0" />
</ItemGroup>
</Project>

View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Quartz" Version="3.2.3" />
<PackageReference Include="Quartz" Version="3.4.0" />
</ItemGroup>
<ItemGroup>

View File

@ -19,10 +19,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Moq" Version="4.15.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Authors>softlgl</Authors>
<TargetFramework>net6.0</TargetFramework>
<Copyright>softlgl</Copyright>
<Owners>softlgl</Owners>
<PackageProjectUrl>https://github.com/softlgl/Ocelot.Provider.Nacos</PackageProjectUrl>