From 784644e032223962ffa7a32aa5a981241f072ab5 Mon Sep 17 00:00:00 2001 From: zhanganzhong <3143422472@qq.com> Date: Wed, 7 Sep 2022 18:29:51 +0800 Subject: [PATCH] feat: update nuget package --- Blog.Core.Api/.config/dotnet-tools.json | 12 +++++++ Blog.Core.Api/Blog.Core.Api.csproj | 10 +++--- Blog.Core.Api/Blog.Core.xml | 12 ------- Blog.Core.Api/Controllers/ValuesController.cs | 22 ------------ Blog.Core.Api/Program.cs | 15 ++++---- Blog.Core.Clean.bat | 31 ++++++++++++++++ Blog.Core.Common/Blog.Core.Common.csproj | 26 ++++++++------ Blog.Core.EventBus/Blog.Core.EventBus.csproj | 14 ++++---- .../Blog.Core.Extensions.csproj | 36 +++++++++---------- .../IpPolicyRateLimitSetup.cs | 2 +- Blog.Core.Gateway/Blog.Core.Gateway.csproj | 14 ++++---- Blog.Core.Model/Blog.Core.Model.csproj | 8 ++--- .../Blog.Core.Repository.csproj | 8 ++--- .../Blog.Core.Serilog.Es.csproj | 12 +++---- Blog.Core.Tasks/Blog.Core.Tasks.csproj | 2 +- Blog.Core.Tests/Blog.Core.Tests.csproj | 8 ++--- .../Ocelot.Provider.Nacos.csproj | 3 +- 17 files changed, 125 insertions(+), 110 deletions(-) create mode 100644 Blog.Core.Api/.config/dotnet-tools.json create mode 100644 Blog.Core.Clean.bat diff --git a/Blog.Core.Api/.config/dotnet-tools.json b/Blog.Core.Api/.config/dotnet-tools.json new file mode 100644 index 0000000..98091c9 --- /dev/null +++ b/Blog.Core.Api/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "6.0.8", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/Blog.Core.Api/Blog.Core.Api.csproj b/Blog.Core.Api/Blog.Core.Api.csproj index fd26913..fd45bf7 100644 --- a/Blog.Core.Api/Blog.Core.Api.csproj +++ b/Blog.Core.Api/Blog.Core.Api.csproj @@ -49,11 +49,11 @@ - - - - - + + + + + diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml index f5df626..7ef55c7 100644 --- a/Blog.Core.Api/Blog.Core.xml +++ b/Blog.Core.Api/Blog.Core.xml @@ -826,18 +826,6 @@ - - - 测试http请求 RestSharp Get - - - - - - 测试http请求 RestSharp Post - - - 测试多库连接 diff --git a/Blog.Core.Api/Controllers/ValuesController.cs b/Blog.Core.Api/Controllers/ValuesController.cs index 344335c..f1e12ee 100644 --- a/Blog.Core.Api/Controllers/ValuesController.cs +++ b/Blog.Core.Api/Controllers/ValuesController.cs @@ -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 }); } - /// - /// 测试http请求 RestSharp Get - /// - /// - [HttpGet("RestsharpGet")] - [AllowAnonymous] - public MessageModel RestsharpGet() - { - return HttpHelper.GetApi>("http://apk.neters.club/", "api/Blog/DetailNuxtNoPer", "id=1"); - } - /// - /// 测试http请求 RestSharp Post - /// - /// - [HttpGet("RestsharpPost")] - [AllowAnonymous] - public TestRestSharpPostDto RestsharpPost() - { - return HttpHelper.PostApi("http://apk.neters.club/api/Values/TestPostPara?name=老张", new { age = 18 }); - } - /// /// 测试多库连接 /// diff --git a/Blog.Core.Api/Program.cs b/Blog.Core.Api/Program.cs index 285025c..41ec3ef 100644 --- a/Blog.Core.Api/Program.cs +++ b/Blog.Core.Api/Program.cs @@ -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(); diff --git a/Blog.Core.Clean.bat b/Blog.Core.Clean.bat new file mode 100644 index 0000000..c9683c6 --- /dev/null +++ b/Blog.Core.Clean.bat @@ -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 \ No newline at end of file diff --git a/Blog.Core.Common/Blog.Core.Common.csproj b/Blog.Core.Common/Blog.Core.Common.csproj index efcee37..43f65ab 100644 --- a/Blog.Core.Common/Blog.Core.Common.csproj +++ b/Blog.Core.Common/Blog.Core.Common.csproj @@ -4,6 +4,12 @@ net6.0 + + + + + + @@ -11,20 +17,20 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/Blog.Core.EventBus/Blog.Core.EventBus.csproj b/Blog.Core.EventBus/Blog.Core.EventBus.csproj index a8a478a..070c0a4 100644 --- a/Blog.Core.EventBus/Blog.Core.EventBus.csproj +++ b/Blog.Core.EventBus/Blog.Core.EventBus.csproj @@ -6,16 +6,16 @@ - - - + + + - + - - - + + + diff --git a/Blog.Core.Extensions/Blog.Core.Extensions.csproj b/Blog.Core.Extensions/Blog.Core.Extensions.csproj index e42afed..abb3736 100644 --- a/Blog.Core.Extensions/Blog.Core.Extensions.csproj +++ b/Blog.Core.Extensions/Blog.Core.Extensions.csproj @@ -5,30 +5,30 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + diff --git a/Blog.Core.Extensions/ServiceExtensions/IpPolicyRateLimitSetup.cs b/Blog.Core.Extensions/ServiceExtensions/IpPolicyRateLimitSetup.cs index 7db5f0d..61dabc3 100644 --- a/Blog.Core.Extensions/ServiceExtensions/IpPolicyRateLimitSetup.cs +++ b/Blog.Core.Extensions/ServiceExtensions/IpPolicyRateLimitSetup.cs @@ -22,7 +22,7 @@ namespace Blog.Core.Extensions // inject counter and rules stores services.AddSingleton(); services.AddSingleton(); - + services.AddSingleton(); // inject counter and rules distributed cache stores //services.AddSingleton(); //services.AddSingleton(); diff --git a/Blog.Core.Gateway/Blog.Core.Gateway.csproj b/Blog.Core.Gateway/Blog.Core.Gateway.csproj index 584a0b2..4739852 100644 --- a/Blog.Core.Gateway/Blog.Core.Gateway.csproj +++ b/Blog.Core.Gateway/Blog.Core.Gateway.csproj @@ -15,13 +15,13 @@ - - - - - - - + + + + + + + diff --git a/Blog.Core.Model/Blog.Core.Model.csproj b/Blog.Core.Model/Blog.Core.Model.csproj index 72dd702..de7e646 100644 --- a/Blog.Core.Model/Blog.Core.Model.csproj +++ b/Blog.Core.Model/Blog.Core.Model.csproj @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/Blog.Core.Repository/Blog.Core.Repository.csproj b/Blog.Core.Repository/Blog.Core.Repository.csproj index a3eee61..7575c0c 100644 --- a/Blog.Core.Repository/Blog.Core.Repository.csproj +++ b/Blog.Core.Repository/Blog.Core.Repository.csproj @@ -6,9 +6,9 @@ - - - + + + @@ -21,7 +21,7 @@ - + diff --git a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj index 99fef26..5cf8202 100644 --- a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj +++ b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/Blog.Core.Tasks/Blog.Core.Tasks.csproj b/Blog.Core.Tasks/Blog.Core.Tasks.csproj index fd613b0..5e17355 100644 --- a/Blog.Core.Tasks/Blog.Core.Tasks.csproj +++ b/Blog.Core.Tasks/Blog.Core.Tasks.csproj @@ -5,7 +5,7 @@ - + diff --git a/Blog.Core.Tests/Blog.Core.Tests.csproj b/Blog.Core.Tests/Blog.Core.Tests.csproj index c5e1022..2ceef16 100644 --- a/Blog.Core.Tests/Blog.Core.Tests.csproj +++ b/Blog.Core.Tests/Blog.Core.Tests.csproj @@ -19,10 +19,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj index a8568d9..c713416 100644 --- a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj +++ b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj @@ -1,8 +1,7 @@  - net5.0 - softlgl + net6.0 softlgl softlgl https://github.com/softlgl/Ocelot.Provider.Nacos