From 72b48b483b01db9b7ba588077fc7e55b39a6ae3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Mon, 22 Jul 2024 16:37:44 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=98=8A=20=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E6=A0=87=E5=87=86=20`JSON`=20=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=8F=82=E6=95=B0=20`standard`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/Furion.Pure/JsonSerialization/JSON.cs | 7 ++++--- framework/Furion/JsonSerialization/JSON.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/framework/Furion.Pure/JsonSerialization/JSON.cs b/framework/Furion.Pure/JsonSerialization/JSON.cs index 019adb4b43..ce7bbb7f42 100644 --- a/framework/Furion.Pure/JsonSerialization/JSON.cs +++ b/framework/Furion.Pure/JsonSerialization/JSON.cs @@ -79,16 +79,17 @@ public static class JSON /// /// 检查 JSON 字符串是否有效 /// - /// + /// JSON 字符串 + /// 标准 JSON /// - public static bool IsValid(string jsonString) + public static bool IsValid(string jsonString, bool standard = false) { if (string.IsNullOrWhiteSpace(jsonString)) return false; try { using var document = JsonDocument.Parse(jsonString); - return true; + return !standard || document.RootElement.ValueKind == JsonValueKind.Object || document.RootElement.ValueKind == JsonValueKind.Array; } catch (JsonException) { diff --git a/framework/Furion/JsonSerialization/JSON.cs b/framework/Furion/JsonSerialization/JSON.cs index 019adb4b43..ce7bbb7f42 100644 --- a/framework/Furion/JsonSerialization/JSON.cs +++ b/framework/Furion/JsonSerialization/JSON.cs @@ -79,16 +79,17 @@ public static class JSON /// /// 检查 JSON 字符串是否有效 /// - /// + /// JSON 字符串 + /// 标准 JSON /// - public static bool IsValid(string jsonString) + public static bool IsValid(string jsonString, bool standard = false) { if (string.IsNullOrWhiteSpace(jsonString)) return false; try { using var document = JsonDocument.Parse(jsonString); - return true; + return !standard || document.RootElement.ValueKind == JsonValueKind.Object || document.RootElement.ValueKind == JsonValueKind.Array; } catch (JsonException) { -- Gitee From ff423270f00e5d97b3871223f4cefa1d8afbcdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Fri, 26 Jul 2024 15:08:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=98=8A=20=E4=BF=AE=E5=A4=8D=20`Razor?= =?UTF-8?q?=20Pages`=20=E9=A1=B9=E7=9B=AE=20`[UnitOfWork]`=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8D=95=E5=85=83=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Furion.Extras.DatabaseAccessor.MongoDB.csproj | 2 +- .../UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs | 8 ++++++-- .../UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs | 8 ++++++-- samples/Furion.Web.Core/Startup.cs | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj b/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj index cebdc4c0bf..efa0724374 100644 --- a/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj +++ b/framework/Furion.Extras.DatabaseAccessor.MongoDB/Furion.Extras.DatabaseAccessor.MongoDB.csproj @@ -25,7 +25,7 @@ - + \ No newline at end of file diff --git a/framework/Furion.Pure/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs b/framework/Furion.Pure/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs index aa6f7f347b..8971b15dc1 100644 --- a/framework/Furion.Pure/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs +++ b/framework/Furion.Pure/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs @@ -204,6 +204,8 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP // 打印工作单元开始消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Beginning (Ambient)"); + logger.LogWarning("[Database Transaction] Starting a new transaction."); + // 开始事务 BeginTransaction(context, method, out var _unitOfWork, out var unitOfWorkAttribute); @@ -218,6 +220,8 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP { transactionScope?.Complete(); + logger.LogWarning("[Database Transaction] Transaction committed successfully."); + // 打印事务提交消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Completed (Ambient)"); } @@ -226,12 +230,12 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP // 打印事务回滚消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Rollback (Ambient)", isError: true); - logger.LogError(resultContext.Exception, "Transaction Failed."); + logger.LogError(resultContext.Exception, "[Database Transaction] Transaction rolled back due to an error."); } } catch (Exception ex) { - logger.LogError(ex, "Transaction Failed."); + logger.LogError(ex, "[Database Transaction] Transaction rolled back due to an error."); // 打印事务回滚消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Rollback (Ambient)", isError: true); diff --git a/framework/Furion/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs b/framework/Furion/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs index aa6f7f347b..8971b15dc1 100644 --- a/framework/Furion/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs +++ b/framework/Furion/UnitOfWork/FilterAttributes/UnitOfWorkAttribute.cs @@ -204,6 +204,8 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP // 打印工作单元开始消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Beginning (Ambient)"); + logger.LogWarning("[Database Transaction] Starting a new transaction."); + // 开始事务 BeginTransaction(context, method, out var _unitOfWork, out var unitOfWorkAttribute); @@ -218,6 +220,8 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP { transactionScope?.Complete(); + logger.LogWarning("[Database Transaction] Transaction committed successfully."); + // 打印事务提交消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Completed (Ambient)"); } @@ -226,12 +230,12 @@ public sealed class UnitOfWorkAttribute : Attribute, IAsyncActionFilter, IAsyncP // 打印事务回滚消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Rollback (Ambient)", isError: true); - logger.LogError(resultContext.Exception, "Transaction Failed."); + logger.LogError(resultContext.Exception, "[Database Transaction] Transaction rolled back due to an error."); } } catch (Exception ex) { - logger.LogError(ex, "Transaction Failed."); + logger.LogError(ex, "[Database Transaction] Transaction rolled back due to an error."); // 打印事务回滚消息 if (UseAmbientTransaction) App.PrintToMiniProfiler(MiniProfilerCategory, "Rollback (Ambient)", isError: true); diff --git a/samples/Furion.Web.Core/Startup.cs b/samples/Furion.Web.Core/Startup.cs index c88737013b..734b46f520 100644 --- a/samples/Furion.Web.Core/Startup.cs +++ b/samples/Furion.Web.Core/Startup.cs @@ -146,6 +146,7 @@ public sealed class Startup : AppStartup { ContentTypeProvider = FS.GetFileExtensionContentTypeProvider() }); + app.UseScheduleUI(options => { }); -- Gitee From b21ceb1f91797fd1d3e0e9efa7dce7c6eea6880b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Fri, 26 Jul 2024 17:20:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=98=8A=20=E6=96=B0=E5=A2=9E=20`EFCore?= =?UTF-8?q?`=20=E5=88=86=E9=A1=B5=E6=8B=93=E5=B1=95=20`.ToPagedList`=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=20`TotalCount`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/PagedQueryableExtensions.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/framework/Furion/DatabaseAccessor/Extensions/PagedQueryableExtensions.cs b/framework/Furion/DatabaseAccessor/Extensions/PagedQueryableExtensions.cs index 475b2130e7..e755bcb8f9 100644 --- a/framework/Furion/DatabaseAccessor/Extensions/PagedQueryableExtensions.cs +++ b/framework/Furion/DatabaseAccessor/Extensions/PagedQueryableExtensions.cs @@ -40,12 +40,16 @@ public static class PagedQueryableExtensions /// /// 页码，必须大于0 /// + /// 总数计算方式 /// - public static PagedList ToPagedList(this IQueryable entities, int pageIndex = 1, int pageSize = 20) + public static PagedList ToPagedList(this IQueryable entities, int pageIndex = 1, int pageSize = 20, Func totalComputed = null) { if (pageIndex <= 0) throw new InvalidOperationException($"{nameof(pageIndex)} must be a positive integer greater than 0."); - var totalCount = entities.Count(); + var totalCount = totalComputed == null + ? entities.Count() + : totalComputed(); + var items = entities.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize); @@ -69,12 +73,16 @@ public static class PagedQueryableExtensions /// 页码，必须大于0 /// /// + /// 总数计算方式 /// - public static async Task> ToPagedListAsync(this IQueryable entities, int pageIndex = 1, int pageSize = 20, CancellationToken cancellationToken = default) + public static async Task> ToPagedListAsync(this IQueryable entities, int pageIndex = 1, int pageSize = 20, CancellationToken cancellationToken = default, Func totalComputed = null) { if (pageIndex <= 0) throw new InvalidOperationException($"{nameof(pageIndex)} must be a positive integer greater than 0."); - var totalCount = await entities.CountAsync(cancellationToken); + var totalCount = totalComputed == null + ? (await entities.CountAsync(cancellationToken)) + : totalComputed(); + var items = await entities.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToListAsync(cancellationToken); var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize); -- Gitee From 6aa137be33b28f93fa2cbcd698aaa86fd299c492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Sun, 28 Jul 2024 11:01:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=98=8A=20=E5=8F=91=E5=B8=83=20`v4.9.4?= =?UTF-8?q?.8`=20=E7=89=88=E6=9C=AC=EF=BC=8C=E6=94=B9=E8=BF=9B=20`EFCore`?= =?UTF-8?q?=20=E5=88=86=E9=A1=B5=E6=8B=93=E5=B1=95=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- framework/Directory.Build.props | 2 +- samples/Furion.Core/Furion.Core.csproj | 4 ++-- templates/FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- templates/FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- templates/FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- .../FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- .../FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.SqlSugar.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- .../FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- .../FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- tools/Furion.Tools/Directory.Build.props | 2 +- tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj | 2 +- tools/cli.ps1 | 2 +- 38 files changed, 64 insertions(+), 63 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 16113a5156..73989e1852 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -13,7 +13,8 @@ body: label: 版本号 description: 请选择项目使用的 Furion 版本？ options: - - 4.9.4.7 (最新) + - 4.9.4.8 (最新) + - 4.9.4.7 - 4.9.4.6 - 4.9.4.5 - 4.9.4.4 diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index 752e361194..c5dcfa49e2 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -1,7 +1,7 @@ net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.7 + 4.9.4.8 enable 百小僧 百签科技（广东）有限公司 diff --git a/samples/Furion.Core/Furion.Core.csproj b/samples/Furion.Core/Furion.Core.csproj index 5704de0dce..55a8e45dc5 100644 --- a/samples/Furion.Core/Furion.Core.csproj +++ b/samples/Furion.Core/Furion.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/FurionApiTemplate/Furion.Template.Api.nuspec index 9f5a348d9c..ceeedfae30 100644 --- a/templates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.Template.Api - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 9ecb85acf8..4e3fe0820e 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/FurionAppTemplate/Furion.Template.App.nuspec index 13e7fe1715..3ba1bd617e 100644 --- a/templates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.App - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 1217672136..267c11786d 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec index 96144129c6..2e30b47c80 100644 --- a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec +++ b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor.App - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index 0932ca4904..f9940d1b45 100644 --- a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index a03e22527e..4f3e93fb3d 100644 --- a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index fe14a07226..47147ae943 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index 3c6ebc37f8..68200790f7 100644 --- a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.BlazorWithWebApi - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 40666fe5de..4e6d6a66e2 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index fb0ce9c8b6..059c272374 100644 --- a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.Template.Mvc - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index fe14a07226..47147ae943 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 1d92c07e13..2fda7aa424 100644 --- a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Razor - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index fe14a07226..47147ae943 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index e0bc0ab004..2c57b9efbc 100644 --- a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.RazorWithWebApi - 4.9.4.7 + 4.9.4.8 基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index f31ebbc98a..280e63bb3e 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec index 71a36e24db..b50c0e26ce 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Api - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 58f17d3224..716582e954 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec index 3105651e41..ea73bd0939 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.App - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index ac847e4138..bd88220f4f 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec index 706f8f03b3..61d1aa3fac 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor.App - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index 8c590a2111..fea31223a0 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 87e703786c..6d6621fa4b 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 5a29494bb1..78259ff5ea 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index b5824bca15..bac38a0896 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.BlazorWithWebApi - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index e159c25598..2c80ef4eb2 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index a5b19f3050..2de9d20e7e 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Mvc - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 5a29494bb1..78259ff5ea 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec index eb0d2a5a75..e0925ee3ec 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Razor - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 5a29494bb1..78259ff5ea 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index 697d1e4ae1..c03aa66dda 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.RazorWithWebApi - 4.9.4.7 + 4.9.4.8 基于 Furion 和 SqlSugar 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 4e926a5792..fc6fed65f7 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index cf9d835799..03088fc68e 100644 --- a/tools/Furion.Tools/Directory.Build.props +++ b/tools/Furion.Tools/Directory.Build.props @@ -1,7 +1,7 @@  net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.7 + 4.9.4.8 enable 百小僧 百签科技（广东）有限公司 diff --git a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj index 5d4812fb13..29c2e667a6 100644 --- a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj +++ b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/tools/cli.ps1 b/tools/cli.ps1 index a44ffa1808..dcf910f265 100644 --- a/tools/cli.ps1 +++ b/tools/cli.ps1 @@ -24,7 +24,7 @@ Param( #[string]$UseDatabaseNames ) -$FurTools = "Furion Tools v4.9.4.7"; +$FurTools = "Furion Tools v4.9.4.8"; # 输出信息 $copyright = @" -- Gitee From d97467c597124c081b07a316d8c17eebc533fceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Mon, 29 Jul 2024 17:26:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=98=8A=20=E6=B7=BB=E5=8A=A0=20`WebApp?= =?UTF-8?q?lication..UseDefaultServiceProvider()`=20=E6=8B=93=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppApplicationBuilderExtensions.cs | 28 +++++++++++++++---- .../Furion.Pure/App/Filters/StartupFilter.cs | 2 +- .../GenericHostLifetimeEventsHostedService.cs | 2 +- .../AppApplicationBuilderExtensions.cs | 28 +++++++++++++++---- framework/Furion/App/Filters/StartupFilter.cs | 2 +- .../GenericHostLifetimeEventsHostedService.cs | 2 +- 6 files changed, 50 insertions(+), 14 deletions(-) diff --git a/framework/Furion.Pure/App/Extensions/AppApplicationBuilderExtensions.cs b/framework/Furion.Pure/App/Extensions/AppApplicationBuilderExtensions.cs index 21d8298c11..ec1524be5b 100644 --- a/framework/Furion.Pure/App/Extensions/AppApplicationBuilderExtensions.cs +++ b/framework/Furion.Pure/App/Extensions/AppApplicationBuilderExtensions.cs @@ -34,6 +34,24 @@ namespace Microsoft.AspNetCore.Builder; [SuppressSniffer] public static class AppApplicationBuilderExtensions { +#if !NET5_0 + /// + /// 设置默认服务存储器 + /// + /// + /// + /// 解决在主机启动前解析服务问题 + /// 使用：var app = builder.Build().UseDefaultServiceProvider(); + /// + /// + public static WebApplication UseDefaultServiceProvider(this WebApplication app) + { + InternalApp.RootServices ??= app.Services; + + return app; + } +#endif + /// /// 注入基础中间件（带Swagger） /// @@ -41,7 +59,7 @@ public static class AppApplicationBuilderExtensions /// 空字符串将为首页 /// /// 解决 Swagger 被代理问题 - /// + /// public static IApplicationBuilder UseInject(this IApplicationBuilder app, string routePrefix = default, Action configure = null, bool withProxy = false) { // 载入中间件配置选项 @@ -59,7 +77,7 @@ public static class AppApplicationBuilderExtensions /// /// /// 解决 Swagger 被代理问题 - /// + /// public static IApplicationBuilder UseInject(this IApplicationBuilder app, Action configure, bool withProxy = false) { return app.UseInject(default, configure: configure, withProxy: withProxy); @@ -79,7 +97,7 @@ public static class AppApplicationBuilderExtensions /// 解决 .NET6 WebApplication 模式下二级虚拟目录错误问题 /// /// - /// + /// public static IApplicationBuilder MapRouteControllers(this IApplicationBuilder app) { app.UseRouting(); @@ -96,7 +114,7 @@ public static class AppApplicationBuilderExtensions /// /// 须在 app.UseRouting() 之前注册 /// - /// + /// public static IApplicationBuilder EnableBuffering(this IApplicationBuilder app) { return app.Use(next => context => @@ -111,7 +129,7 @@ public static class AppApplicationBuilderExtensions /// /// 应用构建器 /// 应用配置 - /// 应用构建器 + /// internal static IApplicationBuilder UseApp(this IApplicationBuilder app, Action configure = null) { // 调用自定义服务 diff --git a/framework/Furion.Pure/App/Filters/StartupFilter.cs b/framework/Furion.Pure/App/Filters/StartupFilter.cs index 478db95ae6..a29900b282 100644 --- a/framework/Furion.Pure/App/Filters/StartupFilter.cs +++ b/framework/Furion.Pure/App/Filters/StartupFilter.cs @@ -49,7 +49,7 @@ public class StartupFilter : IStartupFilter return app => { // 存储根服务 - InternalApp.RootServices = app.ApplicationServices; + InternalApp.RootServices ??= app.ApplicationServices; // 环境名 var envName = App.HostEnvironment?.EnvironmentName ?? "Unknown"; diff --git a/framework/Furion.Pure/App/Startups/GenericHostLifetimeEventsHostedService.cs b/framework/Furion.Pure/App/Startups/GenericHostLifetimeEventsHostedService.cs index 78a020bcf7..e6451d869e 100644 --- a/framework/Furion.Pure/App/Startups/GenericHostLifetimeEventsHostedService.cs +++ b/framework/Furion.Pure/App/Startups/GenericHostLifetimeEventsHostedService.cs @@ -39,7 +39,7 @@ internal class GenericHostLifetimeEventsHostedService : IHostedService public GenericHostLifetimeEventsHostedService(IHost host) { // 存储根服务 - InternalApp.RootServices = host.Services; + InternalApp.RootServices ??= host.Services; } /// diff --git a/framework/Furion/App/Extensions/AppApplicationBuilderExtensions.cs b/framework/Furion/App/Extensions/AppApplicationBuilderExtensions.cs index 21d8298c11..ec1524be5b 100644 --- a/framework/Furion/App/Extensions/AppApplicationBuilderExtensions.cs +++ b/framework/Furion/App/Extensions/AppApplicationBuilderExtensions.cs @@ -34,6 +34,24 @@ namespace Microsoft.AspNetCore.Builder; [SuppressSniffer] public static class AppApplicationBuilderExtensions { +#if !NET5_0 + /// + /// 设置默认服务存储器 + /// + /// + /// + /// 解决在主机启动前解析服务问题 + /// 使用：var app = builder.Build().UseDefaultServiceProvider(); + /// + /// + public static WebApplication UseDefaultServiceProvider(this WebApplication app) + { + InternalApp.RootServices ??= app.Services; + + return app; + } +#endif + /// /// 注入基础中间件（带Swagger） /// @@ -41,7 +59,7 @@ public static class AppApplicationBuilderExtensions /// 空字符串将为首页 /// /// 解决 Swagger 被代理问题 - /// + /// public static IApplicationBuilder UseInject(this IApplicationBuilder app, string routePrefix = default, Action configure = null, bool withProxy = false) { // 载入中间件配置选项 @@ -59,7 +77,7 @@ public static class AppApplicationBuilderExtensions /// /// /// 解决 Swagger 被代理问题 - /// + /// public static IApplicationBuilder UseInject(this IApplicationBuilder app, Action configure, bool withProxy = false) { return app.UseInject(default, configure: configure, withProxy: withProxy); @@ -79,7 +97,7 @@ public static class AppApplicationBuilderExtensions /// 解决 .NET6 WebApplication 模式下二级虚拟目录错误问题 /// /// - /// + /// public static IApplicationBuilder MapRouteControllers(this IApplicationBuilder app) { app.UseRouting(); @@ -96,7 +114,7 @@ public static class AppApplicationBuilderExtensions /// /// 须在 app.UseRouting() 之前注册 /// - /// + /// public static IApplicationBuilder EnableBuffering(this IApplicationBuilder app) { return app.Use(next => context => @@ -111,7 +129,7 @@ public static class AppApplicationBuilderExtensions /// /// 应用构建器 /// 应用配置 - /// 应用构建器 + /// internal static IApplicationBuilder UseApp(this IApplicationBuilder app, Action configure = null) { // 调用自定义服务 diff --git a/framework/Furion/App/Filters/StartupFilter.cs b/framework/Furion/App/Filters/StartupFilter.cs index 478db95ae6..a29900b282 100644 --- a/framework/Furion/App/Filters/StartupFilter.cs +++ b/framework/Furion/App/Filters/StartupFilter.cs @@ -49,7 +49,7 @@ public class StartupFilter : IStartupFilter return app => { // 存储根服务 - InternalApp.RootServices = app.ApplicationServices; + InternalApp.RootServices ??= app.ApplicationServices; // 环境名 var envName = App.HostEnvironment?.EnvironmentName ?? "Unknown"; diff --git a/framework/Furion/App/Startups/GenericHostLifetimeEventsHostedService.cs b/framework/Furion/App/Startups/GenericHostLifetimeEventsHostedService.cs index 78a020bcf7..e6451d869e 100644 --- a/framework/Furion/App/Startups/GenericHostLifetimeEventsHostedService.cs +++ b/framework/Furion/App/Startups/GenericHostLifetimeEventsHostedService.cs @@ -39,7 +39,7 @@ internal class GenericHostLifetimeEventsHostedService : IHostedService public GenericHostLifetimeEventsHostedService(IHost host) { // 存储根服务 - InternalApp.RootServices = host.Services; + InternalApp.RootServices ??= host.Services; } /// -- Gitee From ff2be0b04cd04762eea676ad569d6ee6c3066855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Mon, 29 Jul 2024 17:55:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=98=8A=20=E5=8F=91=E5=B8=83=20`v4.9.4?= =?UTF-8?q?.9`=20=E7=89=88=E6=9C=AC=EF=BC=8C=E6=94=B9=E8=BF=9B=E5=8E=9F?= =?UTF-8?q?=E7=94=9F=20`ASP.NET=206+`=20=E9=9B=86=E6=88=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- framework/Directory.Build.props | 2 +- samples/Furion.Core/Furion.Core.csproj | 4 ++-- templates/FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- templates/FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- templates/FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- .../FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- .../FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.SqlSugar.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- .../FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- .../FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- tools/Furion.Tools/Directory.Build.props | 2 +- tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj | 2 +- tools/cli.ps1 | 2 +- 38 files changed, 64 insertions(+), 63 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 73989e1852..6057471ca5 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -13,7 +13,8 @@ body: label: 版本号 description: 请选择项目使用的 Furion 版本？ options: - - 4.9.4.8 (最新) + - 4.9.4.9 (最新) + - 4.9.4.8 - 4.9.4.7 - 4.9.4.6 - 4.9.4.5 diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index c5dcfa49e2..1f8d940d1e 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -1,7 +1,7 @@ net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.8 + 4.9.4.9 enable 百小僧 百签科技（广东）有限公司 diff --git a/samples/Furion.Core/Furion.Core.csproj b/samples/Furion.Core/Furion.Core.csproj index 55a8e45dc5..7e0d076f14 100644 --- a/samples/Furion.Core/Furion.Core.csproj +++ b/samples/Furion.Core/Furion.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/FurionApiTemplate/Furion.Template.Api.nuspec index ceeedfae30..af1d9f06b1 100644 --- a/templates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.Template.Api - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 4e3fe0820e..c00f3c71ca 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/FurionAppTemplate/Furion.Template.App.nuspec index 3ba1bd617e..e438bdef91 100644 --- a/templates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.App - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 267c11786d..9d29c11a17 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec index 2e30b47c80..718023edb3 100644 --- a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec +++ b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor.App - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index f9940d1b45..23b69e2e3a 100644 --- a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 4f3e93fb3d..84f89f4b79 100644 --- a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 47147ae943..db206cdd07 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index 68200790f7..c300a12c86 100644 --- a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.BlazorWithWebApi - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 4e6d6a66e2..7fe28fb186 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 059c272374..941e8f80e5 100644 --- a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.Template.Mvc - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 47147ae943..db206cdd07 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 2fda7aa424..227a5d8dcc 100644 --- a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Razor - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 47147ae943..db206cdd07 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index 2c57b9efbc..12b6b9db35 100644 --- a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.RazorWithWebApi - 4.9.4.8 + 4.9.4.9 基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 280e63bb3e..45c798829e 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec index b50c0e26ce..d316ae7537 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Api - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index 716582e954..de8806c38d 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec index ea73bd0939..3cb53b19d1 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.App - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index bd88220f4f..9e7624ffd9 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec index 61d1aa3fac..303c0f572d 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor.App - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index fea31223a0..f905d5636e 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 6d6621fa4b..49ce8b3f61 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index 78259ff5ea..f133f95507 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index bac38a0896..d374a6fd93 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.BlazorWithWebApi - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 2c80ef4eb2..a36b75247a 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 2de9d20e7e..2bfd629d14 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Mvc - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index 78259ff5ea..f133f95507 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec index e0925ee3ec..9c3f8ef284 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Razor - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index 78259ff5ea..f133f95507 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index c03aa66dda..512d0166e0 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.RazorWithWebApi - 4.9.4.8 + 4.9.4.9 基于 Furion 和 SqlSugar 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index fc6fed65f7..826e2e4baf 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index 03088fc68e..397587d03a 100644 --- a/tools/Furion.Tools/Directory.Build.props +++ b/tools/Furion.Tools/Directory.Build.props @@ -1,7 +1,7 @@  net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.8 + 4.9.4.9 enable 百小僧 百签科技（广东）有限公司 diff --git a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj index 29c2e667a6..6904c4613a 100644 --- a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj +++ b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/tools/cli.ps1 b/tools/cli.ps1 index dcf910f265..ef12511e80 100644 --- a/tools/cli.ps1 +++ b/tools/cli.ps1 @@ -24,7 +24,7 @@ Param( #[string]$UseDatabaseNames ) -$FurTools = "Furion Tools v4.9.4.8"; +$FurTools = "Furion Tools v4.9.4.9"; # 输出信息 $copyright = @" -- Gitee From 09ba7fb9310b0542386f19fac28c5a30747db2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Tue, 30 Jul 2024 15:20:49 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=98=8A=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AF=B7=E6=B1=82=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B8=A6=20`charset`=20=E7=9A=84=20`Content-?= =?UTF-8?q?Type`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RemoteRequest/Internal/HttpRequestPartMethods.cs | 10 ++++++++-- .../RemoteRequest/Internal/HttpRequestPartSetters.cs | 11 ++++++++++- .../RemoteRequest/Internal/HttpRequestPartMethods.cs | 10 ++++++++-- .../RemoteRequest/Internal/HttpRequestPartSetters.cs | 11 ++++++++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartMethods.cs b/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartMethods.cs index c1e44b7f8e..6afb689316 100644 --- a/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartMethods.cs +++ b/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartMethods.cs @@ -961,7 +961,10 @@ public sealed partial class HttpRequestPart httpContent = new ByteArrayContent(Files[0].Bytes); // 设置内容类型 - httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType); + httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType) + { + CharSet = ContentEncoding.BodyName + }; } break; @@ -976,7 +979,10 @@ public sealed partial class HttpRequestPart httpContent = new StringContent(SerializerObject(Body), ContentEncoding); // 设置内容类型 - httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType); + httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType) + { + CharSet = ContentEncoding.BodyName + }; } break; diff --git a/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartSetters.cs b/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartSetters.cs index 90ce1cbd8f..e17816a6e8 100644 --- a/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartSetters.cs +++ b/framework/Furion.Pure/RemoteRequest/Internal/HttpRequestPartSetters.cs @@ -192,7 +192,16 @@ public sealed partial class HttpRequestPart /// public HttpRequestPart SetContentType(string contentType) { - if (!string.IsNullOrWhiteSpace(contentType)) ContentType = contentType; + if (!string.IsNullOrWhiteSpace(contentType)) + { + // 处理 application/json;charset=utf-8，携带 charset 并非标准格式 + if (contentType.Contains("charset", StringComparison.OrdinalIgnoreCase)) + { + var parts = contentType.Split(';', StringSplitOptions.RemoveEmptyEntries); + if (parts.Length > 0) ContentType = parts[0]; + } + else ContentType = contentType; + } return this; } diff --git a/framework/Furion/RemoteRequest/Internal/HttpRequestPartMethods.cs b/framework/Furion/RemoteRequest/Internal/HttpRequestPartMethods.cs index c1e44b7f8e..6afb689316 100644 --- a/framework/Furion/RemoteRequest/Internal/HttpRequestPartMethods.cs +++ b/framework/Furion/RemoteRequest/Internal/HttpRequestPartMethods.cs @@ -961,7 +961,10 @@ public sealed partial class HttpRequestPart httpContent = new ByteArrayContent(Files[0].Bytes); // 设置内容类型 - httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType); + httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType) + { + CharSet = ContentEncoding.BodyName + }; } break; @@ -976,7 +979,10 @@ public sealed partial class HttpRequestPart httpContent = new StringContent(SerializerObject(Body), ContentEncoding); // 设置内容类型 - httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType); + httpContent.Headers.ContentType = new MediaTypeHeaderValue(ContentType) + { + CharSet = ContentEncoding.BodyName + }; } break; diff --git a/framework/Furion/RemoteRequest/Internal/HttpRequestPartSetters.cs b/framework/Furion/RemoteRequest/Internal/HttpRequestPartSetters.cs index 90ce1cbd8f..e17816a6e8 100644 --- a/framework/Furion/RemoteRequest/Internal/HttpRequestPartSetters.cs +++ b/framework/Furion/RemoteRequest/Internal/HttpRequestPartSetters.cs @@ -192,7 +192,16 @@ public sealed partial class HttpRequestPart /// public HttpRequestPart SetContentType(string contentType) { - if (!string.IsNullOrWhiteSpace(contentType)) ContentType = contentType; + if (!string.IsNullOrWhiteSpace(contentType)) + { + // 处理 application/json;charset=utf-8，携带 charset 并非标准格式 + if (contentType.Contains("charset", StringComparison.OrdinalIgnoreCase)) + { + var parts = contentType.Split(';', StringSplitOptions.RemoveEmptyEntries); + if (parts.Length > 0) ContentType = parts[0]; + } + else ContentType = contentType; + } return this; } -- Gitee From 9211d26cb0ab0e049372f62510c66d6097f7c94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=B0=8F=E5=83=A7?= Date: Tue, 30 Jul 2024 16:17:05 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=98=8A=20=E5=8F=91=E5=B8=83=20`v4.9.4?= =?UTF-8?q?.10`=20=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E8=AF=B7=E6=B1=82=E4=B8=8D=E6=94=AF=E6=8C=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=B8=A6=20`charset`=20=E7=9A=84=20`Content-Type`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- framework/Directory.Build.props | 2 +- samples/Furion.Core/Furion.Core.csproj | 4 ++-- templates/FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- templates/FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- templates/FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- .../FurionApiTemplate/Furion.Template.Api.nuspec | 2 +- .../src/FurionApi.Core/FurionApi.Core.csproj | 6 +++--- .../FurionAppTemplate/Furion.Template.App.nuspec | 2 +- .../src/FurionApp.Core/FurionApp.Core.csproj | 6 +++--- .../Furion.SqlSugar.Template.Blazor.App.nuspec | 2 +- .../src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj | 4 ++-- .../FurionBlazorTemplate/Furion.Template.Blazor.nuspec | 2 +- .../src/FurionBlazor.Core/FurionBlazor.Core.csproj | 4 ++-- .../Furion.Template.BlazorWithWebApi.nuspec | 2 +- .../src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj | 6 +++--- .../FurionMvcTemplate/Furion.Template.Mvc.nuspec | 2 +- .../src/FurionMvc.Core/FurionMvc.Core.csproj | 4 ++-- .../FurionRazorTemplate/Furion.Template.Razor.nuspec | 2 +- .../src/FurionRazor.Core/FurionRazor.Core.csproj | 4 ++-- .../Furion.Template.RazorWithWebApi.nuspec | 2 +- .../src/FurionRazorApi.Core/FurionRazorApi.Core.csproj | 6 +++--- tools/Furion.Tools/Directory.Build.props | 2 +- tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj | 2 +- tools/cli.ps1 | 2 +- 38 files changed, 64 insertions(+), 63 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 6057471ca5..457e05924a 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -13,7 +13,8 @@ body: label: 版本号 description: 请选择项目使用的 Furion 版本？ options: - - 4.9.4.9 (最新) + - 4.9.4.10 (最新) + - 4.9.4.9 - 4.9.4.8 - 4.9.4.7 - 4.9.4.6 diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props index 1f8d940d1e..5142f97602 100644 --- a/framework/Directory.Build.props +++ b/framework/Directory.Build.props @@ -1,7 +1,7 @@ net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.9 + 4.9.4.10 enable 百小僧 百签科技（广东）有限公司 diff --git a/samples/Furion.Core/Furion.Core.csproj b/samples/Furion.Core/Furion.Core.csproj index 7e0d076f14..335177bc84 100644 --- a/samples/Furion.Core/Furion.Core.csproj +++ b/samples/Furion.Core/Furion.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/FurionApiTemplate/Furion.Template.Api.nuspec index af1d9f06b1..173ead1461 100644 --- a/templates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.Template.Api - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index c00f3c71ca..7ad4a09174 100644 --- a/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/FurionAppTemplate/Furion.Template.App.nuspec index e438bdef91..85e303daf9 100644 --- a/templates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.App - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 9d29c11a17..1fa784e711 100644 --- a/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec index 718023edb3..0fcb7528a3 100644 --- a/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec +++ b/templates/FurionBlazorAppTemplate/Furion.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor.App - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index 23b69e2e3a..59a61ce441 100644 --- a/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 84f89f4b79..031c06fcb6 100644 --- a/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Blazor - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index db206cdd07..374dd016a4 100644 --- a/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index c300a12c86..e6b9ac203c 100644 --- a/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.BlazorWithWebApi - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index 7fe28fb186..92fff51b80 100644 --- a/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 941e8f80e5..acfaf356b1 100644 --- a/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.Template.Mvc - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index db206cdd07..374dd016a4 100644 --- a/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 227a5d8dcc..5245993e67 100644 --- a/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.Template.Razor - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index db206cdd07..374dd016a4 100644 --- a/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index 12b6b9db35..8dbf54c00b 100644 --- a/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.Template.RazorWithWebApi - 4.9.4.9 + 4.9.4.10 基于 Furion 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 45c798829e..a8004cfdda 100644 --- a/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec index d316ae7537..ecde60babd 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec +++ b/templates/SqlSugarTemplates/FurionApiTemplate/Furion.Template.Api.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Api - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj index de8806c38d..f556ea1ac7 100644 --- a/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionApiTemplate/src/FurionApi.Core/FurionApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec index 3cb53b19d1..7f262cf6d5 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec +++ b/templates/SqlSugarTemplates/FurionAppTemplate/Furion.Template.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.App - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Mvc/Api 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj index 9e7624ffd9..604600695e 100644 --- a/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionAppTemplate/src/FurionApp.Core/FurionApp.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec index 303c0f572d..1d7664f5f9 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/Furion.SqlSugar.Template.Blazor.App.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor.App - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Blazor App 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj index f905d5636e..cedc5c263f 100644 --- a/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorAppTemplate/src/FurionBlazorApp.Core/FurionBlazorApp.Core.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec index 49ce8b3f61..5337389918 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/Furion.Template.Blazor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Blazor - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Blazor 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj index f133f95507..1c02e21c96 100644 --- a/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorTemplate/src/FurionBlazor.Core/FurionBlazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec index d374a6fd93..0ffea11468 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/Furion.Template.BlazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.BlazorWithWebApi - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Blazor和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj index a36b75247a..1c3ad7e2a0 100644 --- a/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionBlazorWithWebApiTemplate/src/FurionBlazorApi.Core/FurionBlazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec index 2bfd629d14..6de680442f 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/Furion.Template.Mvc.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Mvc - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Mvc 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj index f133f95507..1c02e21c96 100644 --- a/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj +++ b/templates/SqlSugarTemplates/FurionMvcTemplate/src/FurionMvc.Core/FurionMvc.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec index 9c3f8ef284..5e716d906f 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/Furion.Template.Razor.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.Razor - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 Razor Pages 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj index f133f95507..1c02e21c96 100644 --- a/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorTemplate/src/FurionRazor.Core/FurionRazor.Core.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec index 512d0166e0..d059b47ae4 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/Furion.Template.RazorWithWebApi.nuspec @@ -2,7 +2,7 @@ Furion.SqlSugar.Template.RazorWithWebApi - 4.9.4.9 + 4.9.4.10 基于 Furion 和 SqlSugar 框架快速搭建 RazorPages和WebApi 多层架构模板。 百小僧 diff --git a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj index 826e2e4baf..cdc50cfa5c 100644 --- a/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj +++ b/templates/SqlSugarTemplates/FurionRazorWithWebApiTemplate/src/FurionRazorApi.Core/FurionRazorApi.Core.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/tools/Furion.Tools/Directory.Build.props b/tools/Furion.Tools/Directory.Build.props index 397587d03a..3762ecf3c1 100644 --- a/tools/Furion.Tools/Directory.Build.props +++ b/tools/Furion.Tools/Directory.Build.props @@ -1,7 +1,7 @@  net5.0;net6.0;net7.0;net8.0;net9.0 - 4.9.4.9 + 4.9.4.10 enable 百小僧 百签科技（广东）有限公司 diff --git a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj index 6904c4613a..d26f8a15cb 100644 --- a/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj +++ b/tools/Furion.Tools/Furion.Tools/Furion.Tools.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/tools/cli.ps1 b/tools/cli.ps1 index ef12511e80..c24214a58a 100644 --- a/tools/cli.ps1 +++ b/tools/cli.ps1 @@ -24,7 +24,7 @@ Param( #[string]$UseDatabaseNames ) -$FurTools = "Furion Tools v4.9.4.9"; +$FurTools = "Furion Tools v4.9.4.10"; # 输出信息 $copyright = @" -- Gitee