Merge pull request #1447 from colinin/clock-kind-utc

feat: Standardize the application of time formats

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": {

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": {

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": {

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": {

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": {

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": {

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": {

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": {

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": {

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": {

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";

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; }

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": "*",