From acbdf09428e0e7c1a6dca018d975d2e755e16dbc Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 24 Mar 2026 16:05:27 +0800 Subject: [PATCH] feat: Standardize the application of time formats - The historical issues of the microservice project will not be activated for the time being. --- .../appsettings.json | 6 ++++-- .../appsettings.json | 6 ++++-- .../appsettings.json | 10 ++++++---- .../appsettings.json | 7 ++++--- .../appsettings.json | 7 ++++--- .../appsettings.json | 7 ++++--- .../appsettings.json | 16 ++++------------ .../appsettings.json | 11 ++++++----- .../appsettings.json | 7 ++++--- .../appsettings.json | 7 ++++--- .../Pages/Account/SelectAccount.cshtml | 2 +- .../Pages/Account/SelectAccount.cshtml.cs | 2 +- .../appsettings.json | 4 +++- 13 files changed, 49 insertions(+), 43 deletions(-) diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AIService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AIService/appsettings.json index b8e4da13c..5b6582f3e 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AIService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AIService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -13,7 +13,9 @@ "Json": { "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "Serilog": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.json index b8e4da13c..5b6582f3e 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -13,7 +13,9 @@ "Json": { "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "Serilog": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.json index f76197991..b14a350fb 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/appsettings.json @@ -1,4 +1,7 @@ { + "Clock": { + "Kind": "Utc" + }, "App": { "Branding": { "AppName": "Auth Server" @@ -6,9 +9,6 @@ "SslFile": "openiddict.pfx", "SslPassword": "e1c48393-0c43-11f0-9582-4aecacda42db" }, - "Clock": { - "Kind": "Local" - }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" }, @@ -20,7 +20,9 @@ "Json": { "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.json index 2c4961697..d6c9ee455 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.IdentityService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -14,10 +14,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.LocalizationService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.LocalizationService/appsettings.json index 3c85151c7..c2136b005 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.LocalizationService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.LocalizationService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -15,10 +15,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.MessageService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.MessageService/appsettings.json index 3c85151c7..c2136b005 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.MessageService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.MessageService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -15,10 +15,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.PlatformService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.PlatformService/appsettings.json index 4c9e40bd6..7fb253206 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.PlatformService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.PlatformService/appsettings.json @@ -1,15 +1,6 @@ { - "Aspire": { - "StackExchange": { - "Redis": { - "ConfigurationOptions": { - "ConnectRetry": 5 - } - } - } - }, "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -21,10 +12,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.TaskService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.TaskService/appsettings.json index 06dfdddfc..daf12b49e 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.TaskService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.TaskService/appsettings.json @@ -1,10 +1,10 @@ { + "Clock": { + "Kind": "Utc" + }, "App": { "CorsOrigins": "http://localhost:3100" }, - "Clock": { - "Kind": "Local" - }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" }, @@ -14,10 +14,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WeChatService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WeChatService/appsettings.json index f7f8d8154..c0389eaf0 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WeChatService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WeChatService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -11,10 +11,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/appsettings.json b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/appsettings.json index b862514d8..94f6e3d4e 100644 --- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/appsettings.json +++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.WorkflowService/appsettings.json @@ -1,6 +1,6 @@ { "Clock": { - "Kind": "Local" + "Kind": "Utc" }, "Forwarded": { "ForwardedHeaders": "XForwardedFor,XForwardedProto" @@ -11,10 +11,11 @@ "DefaultSalt": "sf&5)s3#" }, "Json": { - "OutputDateTimeFormat": "yyyy-MM-dd HH:mm:ss", "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "SkyWalking": { diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml index 9dde8b19b..ae75998fe 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml @@ -52,7 +52,7 @@ accountName += "/" + account.TenantName; } // TODO: Date format - var lastLoginTime = account.LastLoginTime.HasValue ? account.LastLoginTime.Value.ToString("yyyy-MM:dd HH:mm:ss") : ""; + var lastLoginTime = account.LastLoginTime.HasValue ? account.LastLoginTime.Value.ToString(SelectAccountModel.DefaultDateFormat) : ""; var isCurrent = account.IsCurrentAccount; // TODO: 实现用户头像 var avatar = !string.IsNullOrWhiteSpace(account.UserName) ? account.UserName[0].ToString().ToUpper() : "U"; diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml.cs index bfe181731..4ec3a00ac 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/Pages/Account/SelectAccount.cshtml.cs @@ -24,7 +24,7 @@ public class SelectAccountModel : AccountPageModel { private const string LastLoginTimeFieldName = "LastLoginTime"; private const string AllowedTenantsFieldName = "AllowedTenants"; - private const string DefaultDateFormat = "yyyy-MM-dd HH:mm:ss"; + public const string DefaultDateFormat = "yyyy-MM-dd HH:mm:ss"; [BindProperty(SupportsGet = true)] public string RedirectUri { get; set; } diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.json b/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.json index 080b0b1d6..85418946b 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.json +++ b/aspnet-core/services/LY.MicroService.Applications.Single/appsettings.json @@ -21,7 +21,9 @@ "Json": { "InputDateTimeFormats": [ "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-ddTHH:mm:ss" + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-dd HH:mm:ssK", + "yyyy-MM-ddTHH:mm:ssK" ] }, "AllowedHosts": "*",