From 1e70f2486a2ec90eb5e99f16f5c4eee8bb904aa3 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Wed, 28 Dec 2022 16:55:27 +0800 Subject: [PATCH] unformat the default date and time --- .../Queryable/DynamicQueryableAppService.cs | 14 ++++++++++++-- ...tionVueVbenAdminNavigationDefinitionProvider.cs | 3 ++- .../AuthServerHttpApiHostModule.Configure.cs | 2 +- .../AuthServerModule.Configure.cs | 2 +- .../BackendAdminHttpApiHostModule.Configure.cs | 2 +- ...izationManagementHttpApiHostModule.Configure.cs | 2 +- ...latformManagementHttpApiHostModule.Configure.cs | 2 +- .../RealtimeMessageHttpApiHostModule.Configure.cs | 2 +- .../TaskManagementHttpApiHostModule.Configure.cs | 2 +- ...ebhooksManagementHttpApiHostModule.Configure.cs | 2 +- ...orkflowManagementHttpApiHostModule.Configure.cs | 2 +- .../IdentityServerHttpApiHostModule.Configure.cs | 2 +- .../IdentityServerModule.Configure.cs | 2 +- .../InternalApiGatewayModule.Configure.cs | 2 +- 14 files changed, 26 insertions(+), 15 deletions(-) diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs index 186cd4194..3bd8bb894 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs @@ -24,9 +24,14 @@ public abstract class DynamicQueryableAppService : Applicat var entityType = typeof(TEntity); var dynamicParamters = new List(); + var igonreFields = options + .IgnoreFields + .Union(GetUserDefineIgnoreFields()) + .Distinct(); + var propertyInfos = entityType .GetProperties() - .Where(p => !options.IgnoreFields.Contains(p.Name)); + .Where(p => !igonreFields.Contains(p.Name)); foreach (var propertyInfo in propertyInfos) { @@ -77,6 +82,11 @@ public abstract class DynamicQueryableAppService : Applicat return ObjectMapper.Map, List>(entities); } + protected virtual string[] GetUserDefineIgnoreFields() + { + return new string[0]; + } + protected virtual (string JavaScriptType, DynamicComparison[] AvailableComparator) GetPropertyTypeMap(Type propertyType) { var isNullableType = false; @@ -86,7 +96,7 @@ public abstract class DynamicQueryableAppService : Applicat isNullableType = true; propertyType = propertyType.GetGenericArguments().FirstOrDefault(); } - var typeFullName = propertyType.FullName.ToLower(); + var typeFullName = propertyType.FullName; switch (typeFullName) { diff --git a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs index 3116c6574..6ab49841e 100644 --- a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs +++ b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs @@ -238,7 +238,8 @@ namespace LINGYUN.Abp.UI.Navigation.VueVbenAdmin displayName: "系统日志", url: "/sys/logs", component: "/sys/logging/index", - description: "系统日志")); + description: "系统日志", + multiTenancySides: MultiTenancySides.Host)); manage.AddItem( new ApplicationMenu( diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs index 73c9be8ba..1ca03c94e 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs @@ -104,7 +104,7 @@ public partial class AuthServerHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index 73c768f3a..a9475e291 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -177,7 +177,7 @@ public partial class AuthServerModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs index 7f9726b84..c168529e0 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs @@ -104,7 +104,7 @@ public partial class BackendAdminHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs index 2f513eb03..cb06e2140 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs @@ -89,7 +89,7 @@ public partial class LocalizationManagementHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs index 841067ccd..2eef82f37 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs @@ -93,7 +93,7 @@ public partial class PlatformManagementHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs index 5426ff878..a82af2b28 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs @@ -131,7 +131,7 @@ public partial class RealtimeMessageHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs index d66942e6e..f137d01ea 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs @@ -134,7 +134,7 @@ public partial class TaskManagementHttpApiHostModule // 解决某些不支持类型的序列化 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs index 61d97a2c4..6c12fe19b 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs @@ -135,7 +135,7 @@ public partial class WebhooksManagementHttpApiHostModule // 解决某些不支持类型的序列化 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs index 9ec46f885..ce98ee703 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs @@ -216,7 +216,7 @@ public partial class WorkflowManagementHttpApiHostModule // 解决某些不支持类型的序列化 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs index 00ed22ae9..32adfa3be 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs @@ -102,7 +102,7 @@ public partial class IdentityServerHttpApiHostModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs index b27e14df7..bbd187310 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs @@ -125,7 +125,7 @@ public partial class IdentityServerModule // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options => diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs index 3f9c7216d..4db55b7b0 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs @@ -77,7 +77,7 @@ namespace LINGYUN.MicroService.Internal.ApiGateway // 统一时间日期格式 Configure(options => { - options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + // options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss"; }); // 中文序列化的编码问题 Configure(options =>