diff --git a/resources/ProjectPathUtil.cs b/resources/ProjectPathUtil.cs
index 4eb8317d3..d8d899c18 100644
--- a/resources/ProjectPathUtil.cs
+++ b/resources/ProjectPathUtil.cs
@@ -1,104 +1,102 @@
-using System.IO;
-using System.Linq;
+namespace System;
 
-namespace System
+public static partial class ProjectPathUtil
 {
-    public static partial class ProjectPathUtil
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+    public static readonly string projPath;
+#pragma warning restore SA1307 // Accessible fields should begin with upper-case letter
+
+    public const string ProjectDir_AvaloniaAppBridge = "ST.Client.Desktop.Avalonia.App.Bridge";
+    public const string ProjectDir_ConsoleAppBridge = "ST.Client.Desktop.Console.App.Bridge";
+    public const string ProjectDir_ConsoleAppBridgePackage = "ST.Client.Desktop.Avalonia.App.Bridge.Package";
+    public const string ProjectDir_AvaloniaApp = "ST.Client.Desktop.Avalonia.App";
+    public const string ProjectDir_Win7Troubleshoot = "ST.Tools.Win7Troubleshoot";
+    public const string ProjectDir_CoreLib = "Common.CoreLib";
+    public const string ProjectDir_ClienDroidLib = "Common.ClientLib.Droid";
+    public const string ProjectDir_ClientDesktop = "ST.Client.Desktop";
+    public const string ProjectDir_ST = "ST";
+    public const string ProjectDir_STClient = "ST.Client";
+
+    public const string release_template_md =
+        @"\release-template.md";
+
+    [Obsolete("use MainDllPath_", true)]
+    public const string MainDllPath =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Steam++.dll";
+
+    public const string MainDllPath_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Steam++.dll";
+
+    [Obsolete("use DirPublishWinX86_")]
+    public const string DirPublishWinX86 =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x86";
+
+    public const string DirPublishWinX86_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\win-x86";
+
+    [Obsolete("use DirPublishWinX64_", true)]
+    public const string DirPublishWinX64 =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x64";
+
+    [Obsolete("use DirPublishWinX64_FDE_", true)]
+    public const string DirPublishWinX64_FDE =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\FrameworkDependent\win-x64";
+
+    public const string DirPublishWinX64_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\win-x64";
+
+    public const string DirPublishOsx =
+       @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\{0}";
+
+    public const string DirPublishWinX64_FDE_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\FrameworkDependent\win-x64";
+
+    [Obsolete("use DirPublish_", true)]
+    public const string DirPublish =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish";
+
+    public const string DirPublish_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish";
+
+    public const string DirPublish_FDE_ =
+        @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\FrameworkDependent";
+
+    //public const string DirPublish_Win7Troubleshoot =
+    //    @"\src\" + ProjectDir_Win7Troubleshoot + @"\bin\Release\Publish\net35";
+
+    static ProjectPathUtil()
     {
-        public static readonly string projPath;
-
-        public const string ProjectDir_AvaloniaAppBridge = "ST.Client.Desktop.Avalonia.App.Bridge";
-        public const string ProjectDir_ConsoleAppBridge = "ST.Client.Desktop.Console.App.Bridge";
-        public const string ProjectDir_ConsoleAppBridgePackage = "ST.Client.Desktop.Avalonia.App.Bridge.Package";
-        public const string ProjectDir_AvaloniaApp = "ST.Client.Desktop.Avalonia.App";
-        public const string ProjectDir_Win7Troubleshoot = "ST.Tools.Win7Troubleshoot";
-        public const string ProjectDir_CoreLib = "Common.CoreLib";
-        public const string ProjectDir_ClienDroidLib = "Common.ClientLib.Droid";
-        public const string ProjectDir_ClientDesktop = "ST.Client.Desktop";
-        public const string ProjectDir_ST = "ST";
-        public const string ProjectDir_STClient = "ST.Client";
-
-        public const string release_template_md =
-            @"\release-template.md";
-
-        [Obsolete("use MainDllPath_", true)]
-        public const string MainDllPath =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Steam++.dll";
-
-        public const string MainDllPath_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Steam++.dll";
-
-        [Obsolete("use DirPublishWinX86_")]
-        public const string DirPublishWinX86 =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x86";
-
-        public const string DirPublishWinX86_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\win-x86";
-
-        [Obsolete("use DirPublishWinX64_", true)]
-        public const string DirPublishWinX64 =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\win-x64";
-
-        [Obsolete("use DirPublishWinX64_FDE_", true)]
-        public const string DirPublishWinX64_FDE =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\FrameworkDependent\win-x64";
-
-        public const string DirPublishWinX64_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\win-x64";
-
-        public const string DirPublishOsx =
-           @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish\{0}";
-
-        public const string DirPublishWinX64_FDE_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\FrameworkDependent\win-x64";
-
-        [Obsolete("use DirPublish_", true)]
-        public const string DirPublish =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish";
-
-        public const string DirPublish_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish";
-
-        public const string DirPublish_FDE_ =
-            @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish\FrameworkDependent";
-
-        //public const string DirPublish_Win7Troubleshoot =
-        //    @"\src\" + ProjectDir_Win7Troubleshoot + @"\bin\Release\Publish\net35";
-
-        static ProjectPathUtil()
+        projPath = GetProjectPath();
+        if (!Directory.Exists(Path.Combine(projPath, ProjectDir_AvaloniaApp)))
         {
-            projPath = GetProjectPath();
-            if (!Directory.Exists(Path.Combine(projPath, ProjectDir_AvaloniaApp)))
-            {
-                projPath = GetProjectPathByServerTool();
-            }
-        }
-
-        /// <summary>
-        /// 获取当前项目绝对路径(.sln文件所在目录)
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        static string GetProjectPath(string? path = null)
-        {
-            path ??= AppContext.BaseDirectory;
-            if (!Directory.GetFiles(path, "*.sln").Any())
-            {
-                var parent = Directory.GetParent(path);
-                if (parent == null) return string.Empty;
-                return GetProjectPath(parent.FullName);
-            }
-            return path;
-        }
-
-        /// <summary>
-        /// 获取公开客户端项目绝对路径，仅供服务端工具项目中使用
-        /// </summary>
-        /// <returns></returns>
-        static string GetProjectPathByServerTool()
-        {
-            var projPath_ = GetProjectPath();
-            return Path.GetFullPath(Path.Combine(projPath_, "..", "SteamTools"));
+            projPath = GetProjectPathByServerTool();
         }
     }
+
+    /// <summary>
+    /// 获取当前项目绝对路径(.sln文件所在目录)
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    static string GetProjectPath(string? path = null)
+    {
+        path ??= AppContext.BaseDirectory;
+        if (!Directory.GetFiles(path, "*.sln").Any())
+        {
+            var parent = Directory.GetParent(path);
+            if (parent == null) return string.Empty;
+            return GetProjectPath(parent.FullName);
+        }
+        return path;
+    }
+
+    /// <summary>
+    /// 获取公开客户端项目绝对路径，仅供服务端工具项目中使用
+    /// </summary>
+    /// <returns></returns>
+    static string GetProjectPathByServerTool()
+    {
+        var projPath_ = GetProjectPath();
+        return Path.GetFullPath(Path.Combine(projPath_, "..", "SteamTools"));
+    }
 }
\ No newline at end of file
diff --git a/src/Common.ClientLib/Application/Essentials/Browser2.isx.cs b/src/Common.ClientLib/Application/Essentials/Browser2.isx.cs
index ac5ed18f6..19a134180 100644
--- a/src/Common.ClientLib/Application/Essentials/Browser2.isx.cs
+++ b/src/Common.ClientLib/Application/Essentials/Browser2.isx.cs
@@ -1,40 +1,39 @@
 using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable once CheckNamespace
-namespace System.Application
+namespace System.Application;
+
+partial class Browser2
 {
-    partial class Browser2
-    {
-        public const string Prefix_HTTPS = "https://";
+    public const string Prefix_HTTPS = "https://";
 
-        public const string Prefix_HTTP = "http://";
+    public const string Prefix_HTTP = "http://";
 
-        public const string Prefix_MSStore = "ms-windows-store://";
+    public const string Prefix_MSStore = "ms-windows-store://";
 
-        public const string Prefix_Email = "mailto:";
+    public const string Prefix_Email = "mailto:";
 
-        /// <summary>
-        /// 判断字符串是否为 Http Url
-        /// </summary>
-        /// <param name="url"></param>
-        /// <param name="httpsOnly">是否仅Https</param>
-        /// <returns></returns>
-        public static bool IsHttpUrl([NotNullWhen(true)] string? url, bool httpsOnly = false) => url != null &&
-            (url.StartsWith(Prefix_HTTPS, StringComparison.OrdinalIgnoreCase) ||
-                  (!httpsOnly && url.StartsWith(Prefix_HTTP, StringComparison.OrdinalIgnoreCase)));
+    /// <summary>
+    /// 判断字符串是否为 Http Url
+    /// </summary>
+    /// <param name="url"></param>
+    /// <param name="httpsOnly">是否仅Https</param>
+    /// <returns></returns>
+    public static bool IsHttpUrl([NotNullWhen(true)] string? url, bool httpsOnly = false) => url != null &&
+        (url.StartsWith(Prefix_HTTPS, StringComparison.OrdinalIgnoreCase) ||
+              (!httpsOnly && url.StartsWith(Prefix_HTTP, StringComparison.OrdinalIgnoreCase)));
 
-        /// <summary>
-        /// 判断字符串是否为 Store Url
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        public static bool IsStoreUrl([NotNullWhen(true)] string? url) => url != null && url.StartsWith(Prefix_MSStore, StringComparison.OrdinalIgnoreCase);
+    /// <summary>
+    /// 判断字符串是否为 Store Url
+    /// </summary>
+    /// <param name="url"></param>
+    /// <returns></returns>
+    public static bool IsStoreUrl([NotNullWhen(true)] string? url) => url != null && url.StartsWith(Prefix_MSStore, StringComparison.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// 判断字符串是否为 Email Url
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        public static bool IsEmailUrl([NotNullWhen(true)] string? url) => url != null && url.StartsWith(Prefix_Email, StringComparison.OrdinalIgnoreCase);
-    }
+    /// <summary>
+    /// 判断字符串是否为 Email Url
+    /// </summary>
+    /// <param name="url"></param>
+    /// <returns></returns>
+    public static bool IsEmailUrl([NotNullWhen(true)] string? url) => url != null && url.StartsWith(Prefix_Email, StringComparison.OrdinalIgnoreCase);
 }
\ No newline at end of file
diff --git a/src/Common.CoreLib/Application/Repositories/IRepository.cs b/src/Common.CoreLib/Application/Repositories/IRepository.cs
index 9321c6306..91d1e997c 100644
--- a/src/Common.CoreLib/Application/Repositories/IRepository.cs
+++ b/src/Common.CoreLib/Application/Repositories/IRepository.cs
@@ -52,6 +52,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         Task<int> InsertAsync(TEntity entity);
 
+        Task<int> InsertAsync(TEntity entity, CancellationToken cancellationToken) => InsertAsync(entity);
+
         /// <summary>
         /// 将多个实体插入到数据库中
         /// </summary>
@@ -59,6 +61,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         public Task<int> InsertRangeAsync(IEnumerable<TEntity> entities) => OperateRangeAsync(entities, InsertAsync);
 
+        public Task<int> InsertRangeAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken) => InsertRangeAsync(entities);
+
         /// <inheritdoc cref="InsertRangeAsync(IEnumerable{TEntity})"/>
         public Task<int> InsertRangeAsync(params TEntity[] entities) => InsertRangeAsync(entities.AsEnumerable());
 
@@ -73,6 +77,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         Task<int> DeleteAsync(TEntity entity);
 
+        Task<int> DeleteAsync(TEntity entity, CancellationToken cancellationToken) => DeleteAsync(entity);
+
         /// <summary>
         /// 将多个实体从数据库中删除
         /// </summary>
@@ -80,6 +86,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         public Task<int> DeleteRangeAsync(IEnumerable<TEntity> entities) => OperateRangeAsync(entities, DeleteAsync);
 
+        public Task<int> DeleteRangeAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken) => DeleteRangeAsync(entities);
+
         /// <inheritdoc cref="DeleteRangeAsync(IEnumerable{TEntity})"/>
         public Task<int> DeleteRangeAsync(params TEntity[] entities) => DeleteRangeAsync(entities.AsEnumerable());
 
@@ -94,6 +102,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         Task<int> UpdateAsync(TEntity entity);
 
+        Task<int> UpdateAsync(TEntity entity, CancellationToken cancellationToken) => UpdateAsync(entity);
+
         /// <summary>
         /// 将多个实体更新到数据库中
         /// </summary>
@@ -101,6 +111,8 @@ namespace System.Application.Repositories
         /// <returns>受影响的行数</returns>
         public Task<int> UpdateRangeAsync(IEnumerable<TEntity> entities) => OperateRangeAsync(entities, UpdateAsync);
 
+        public Task<int> UpdateRangeAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken) => UpdateRangeAsync(entities);
+
         /// <inheritdoc cref="UpdateRangeAsync(IEnumerable{TEntity})"/>
         public Task<int> UpdateRangeAsync(params TEntity[] entities) => UpdateRangeAsync(entities.AsEnumerable());
 
diff --git a/src/Common.CoreLib/Properties/AssemblyInfo.Version.cs b/src/Common.CoreLib/Properties/AssemblyInfo.Version.cs
index a07566c74..a748d9a07 100644
--- a/src/Common.CoreLib/Properties/AssemblyInfo.Version.cs
+++ b/src/Common.CoreLib/Properties/AssemblyInfo.Version.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
-using static System.Properties.ThisAssembly;
+using _ThisAssembly = System.Properties.ThisAssembly;
 
-[assembly: AssemblyFileVersion(Version)]
-//[assembly: AssemblyInformationalVersion(InfoVersion)]
-[assembly: AssemblyVersion(Version)]
\ No newline at end of file
+[assembly: AssemblyFileVersion(_ThisAssembly.Version)]
+//[assembly: AssemblyInformationalVersion(_ThisAssembly.InfoVersion)]
+[assembly: AssemblyVersion(_ThisAssembly.Version)]
\ No newline at end of file
diff --git a/src/Common.CoreLib/Properties/ThisAssembly.cs b/src/Common.CoreLib/Properties/ThisAssembly.cs
index 75eeb7a61..1e8bc9ec8 100644
--- a/src/Common.CoreLib/Properties/ThisAssembly.cs
+++ b/src/Common.CoreLib/Properties/ThisAssembly.cs
@@ -1,49 +1,48 @@
-namespace System.Properties
+namespace System.Properties;
+
+public static partial class ThisAssembly
 {
-    public static partial class ThisAssembly
-    {
-        /// <summary>
-        /// 定义程序集清单的产品名自定义属性
-        /// </summary>
-        public const string AssemblyProduct = "Watt Toolkit";
+    /// <summary>
+    /// 定义程序集清单的产品名自定义属性
+    /// </summary>
+    public const string AssemblyProduct = "Watt Toolkit";
 
-        /// <summary>
-        /// 定义程序集清单的商标自定义属性
-        /// </summary>
-        public const string AssemblyTrademark = "Watt Toolkit";
+    /// <summary>
+    /// 定义程序集清单的商标自定义属性
+    /// </summary>
+    public const string AssemblyTrademark = "Watt Toolkit";
 
-        /// <summary>
-        /// 提供程序集的文本说明
-        /// </summary>
-        public const string AssemblyDescription = "「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱。";
+    /// <summary>
+    /// 提供程序集的文本说明
+    /// </summary>
+    public const string AssemblyDescription = "「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱。";
 
-        /// <summary>
-        /// 定义程序集清单的版权自定义属性
-        /// </summary>
-        public const string AssemblyCopyright = "© 长沙次元超越科技有限公司. All rights reserved.";
+    /// <summary>
+    /// 定义程序集清单的版权自定义属性
+    /// </summary>
+    public const string AssemblyCopyright = "© 长沙次元超越科技有限公司. All rights reserved.";
 
-        /// <summary>
-        /// 定义程序集清单的公司名称自定义属性
-        /// </summary>
-        public const string AssemblyCompany = "长沙次元超越科技有限公司";
+    /// <summary>
+    /// 定义程序集清单的公司名称自定义属性
+    /// </summary>
+    public const string AssemblyCompany = "长沙次元超越科技有限公司";
 
-        public const string PublicKey =
+    public const string PublicKey =
 #if SIGN_ASSEMBLY
-            ", PublicKey=" +
-            "002400000480000094000000060200000024000052534131000400000100010029b4f7706cbb7e23b3cf33be41127d4b" +
-            "12c14a77cc1094412e73ccbbea4fbc873883042b5a9e517df99137f31f610624f79b46980bcceb990db3caa619fbbb31989f" +
-            "5b6db3689d99ff1f70cb9bc20cc4d548beb942e09859cf2c0690683c9ad160a4a7287070e9e49795c75ba3d12723ddb4" +
-            "ddeb11d32f193e0882db10b41de3";
+        ", PublicKey=" +
+        "002400000480000094000000060200000024000052534131000400000100010029b4f7706cbb7e23b3cf33be41127d4b" +
+        "12c14a77cc1094412e73ccbbea4fbc873883042b5a9e517df99137f31f610624f79b46980bcceb990db3caa619fbbb31989f" +
+        "5b6db3689d99ff1f70cb9bc20cc4d548beb942e09859cf2c0690683c9ad160a4a7287070e9e49795c75ba3d12723ddb4" +
+        "ddeb11d32f193e0882db10b41de3";
 #else
-            "";
+        "";
 #endif
 
-        public const bool Debuggable =
+    public const bool Debuggable =
 #if DEBUG
 true
 #else
 false
 #endif
-            ;
-    }
+        ;
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Data/IdentityTableNames.cs b/src/Common.ServerLib/Application/Data/IdentityTableNames.cs
index 38f9ec9af..2847e4845 100644
--- a/src/Common.ServerLib/Application/Data/IdentityTableNames.cs
+++ b/src/Common.ServerLib/Application/Data/IdentityTableNames.cs
@@ -1,33 +1,32 @@
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 
-namespace System.Application.Data
-{
-    public static class IdentityTableNames
-    {
-        const string Users = "Users";
-        const string Roles = "Roles";
-        const string RoleClaims = "RoleClaims";
-        const string UserClaims = "UserClaims";
-        const string UserLogins = "UserLogins";
-        const string UserRoles = "UserRoles";
-        const string UserTokens = "UserTokens";
+namespace System.Application.Data;
 
-        public static void ReNameAspNetIdentity<TUser, TRole, TKey>(this ModelBuilder builder,
-            string? tablePrefix = null)
-            where TUser : IdentityUser<TKey>
-            where TRole : IdentityRole<TKey>
-            where TKey : IEquatable<TKey>
-        {
-            var hasTablePrefix = !string.IsNullOrEmpty(tablePrefix);
-            string GetString(string str) => hasTablePrefix ? tablePrefix + str : str;
-            builder.Entity<TUser>().ToTable(GetString(Users));
-            builder.Entity<TRole>().ToTable(GetString(Roles));
-            builder.Entity<IdentityRoleClaim<TKey>>().ToTable(GetString(RoleClaims));
-            builder.Entity<IdentityUserClaim<TKey>>().ToTable(GetString(UserClaims));
-            builder.Entity<IdentityUserLogin<TKey>>().ToTable(GetString(UserLogins));
-            builder.Entity<IdentityUserRole<TKey>>().ToTable(GetString(UserRoles));
-            builder.Entity<IdentityUserToken<TKey>>().ToTable(GetString(UserTokens));
-        }
+public static class IdentityTableNames
+{
+    const string Users = "Users";
+    const string Roles = "Roles";
+    const string RoleClaims = "RoleClaims";
+    const string UserClaims = "UserClaims";
+    const string UserLogins = "UserLogins";
+    const string UserRoles = "UserRoles";
+    const string UserTokens = "UserTokens";
+
+    public static void ReNameAspNetIdentity<TUser, TRole, TKey>(this ModelBuilder builder,
+        string? tablePrefix = null)
+        where TUser : IdentityUser<TKey>
+        where TRole : IdentityRole<TKey>
+        where TKey : IEquatable<TKey>
+    {
+        var hasTablePrefix = !string.IsNullOrEmpty(tablePrefix);
+        string GetString(string str) => hasTablePrefix ? tablePrefix + str : str;
+        builder.Entity<TUser>().ToTable(GetString(Users));
+        builder.Entity<TRole>().ToTable(GetString(Roles));
+        builder.Entity<IdentityRoleClaim<TKey>>().ToTable(GetString(RoleClaims));
+        builder.Entity<IdentityUserClaim<TKey>>().ToTable(GetString(UserClaims));
+        builder.Entity<IdentityUserLogin<TKey>>().ToTable(GetString(UserLogins));
+        builder.Entity<IdentityUserRole<TKey>>().ToTable(GetString(UserRoles));
+        builder.Entity<IdentityUserToken<TKey>>().ToTable(GetString(UserTokens));
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/Abstractions/IImage.cs b/src/Common.ServerLib/Application/Entities/Abstractions/IImage.cs
index ba908c70e..4421f0203 100644
--- a/src/Common.ServerLib/Application/Entities/Abstractions/IImage.cs
+++ b/src/Common.ServerLib/Application/Entities/Abstractions/IImage.cs
@@ -1,36 +1,35 @@
 using System.IO.FileFormats;
 using System.Application.Columns;
 
-namespace System.Application.Entities.Abstractions
+namespace System.Application.Entities.Abstractions;
+
+public interface IImage : IEntity<Guid>, ISoftDeleted
 {
-    public interface IImage : IEntity<Guid>, ISoftDeleted
-    {
-        ImageFormat Type { get; set; }
+    ImageFormat Type { get; set; }
 
-        /// <summary>
-        /// 文件大小
-        /// </summary>
-        long Size { get; set; }
+    /// <summary>
+    /// 文件大小
+    /// </summary>
+    long Size { get; set; }
 
-        /// <summary>
-        /// 图片宽度
-        /// </summary>
-        int Width { get; set; }
+    /// <summary>
+    /// 图片宽度
+    /// </summary>
+    int Width { get; set; }
 
-        /// <summary>
-        /// 图片高度
-        /// </summary>
-        int Height { get; set; }
+    /// <summary>
+    /// 图片高度
+    /// </summary>
+    int Height { get; set; }
 
-        /// <summary>
-        /// 哈希值（SHA384）
-        /// </summary>
-        string SHA384 { get; set; }
+    /// <summary>
+    /// 哈希值（SHA384）
+    /// </summary>
+    string SHA384 { get; set; }
 
-        /// <summary>
-        /// 获取文件名
-        /// </summary>
-        /// <returns></returns>
-        string GetFileName();
-    }
+    /// <summary>
+    /// 获取文件名
+    /// </summary>
+    /// <returns></returns>
+    string GetFileName();
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/Abstractions/IUser.cs b/src/Common.ServerLib/Application/Entities/Abstractions/IUser.cs
index 612ae1875..38e45f05a 100644
--- a/src/Common.ServerLib/Application/Entities/Abstractions/IUser.cs
+++ b/src/Common.ServerLib/Application/Entities/Abstractions/IUser.cs
@@ -1,20 +1,19 @@
-namespace System.Application.Entities.Abstractions
+namespace System.Application.Entities.Abstractions;
+
+public interface IUser : IEntity<Guid>
 {
-    public interface IUser : IEntity<Guid>
-    {
-        /// <summary>
-        /// 昵称
-        /// </summary>
-        string? NickName { get; set; }
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    string? NickName { get; set; }
 
-        /// <summary>
-        /// 用户名
-        /// </summary>
-        string? UserName { get; set; }
+    /// <summary>
+    /// 用户名
+    /// </summary>
+    string? UserName { get; set; }
 
-        /// <summary>
-        /// 封禁到解封日期
-        /// </summary>
-        DateTimeOffset? BanEnd { get; set; }
-    }
+    /// <summary>
+    /// 封禁到解封日期
+    /// </summary>
+    DateTimeOffset? BanEnd { get; set; }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/AuthMessageRecord.cs b/src/Common.ServerLib/Application/Entities/AuthMessageRecord.cs
index bffcc5538..c018cd77d 100644
--- a/src/Common.ServerLib/Application/Entities/AuthMessageRecord.cs
+++ b/src/Common.ServerLib/Application/Entities/AuthMessageRecord.cs
@@ -1,108 +1,107 @@
 using System.Application.Columns;
 using System.ComponentModel.DataAnnotations;
 
-namespace System.Application.Entities
+namespace System.Application.Entities;
+
+/// <summary>
+/// 验证码纪录表（短信或邮箱）
+/// </summary>
+/// <typeparam name="TSendSmsRequestType"></typeparam>
+/// <typeparam name="TEAuthMessageType"></typeparam>
+public class AuthMessageRecord<TSendSmsRequestType, TEAuthMessageType> : IEntity<Guid>, ICreationTime
+    where TSendSmsRequestType : struct, Enum
+    where TEAuthMessageType : struct, Enum
 {
+    [Key] // EF 主键
+    public Guid Id { get; set; }
+
     /// <summary>
-    /// 验证码纪录表（短信或邮箱）
+    /// 创建时间
     /// </summary>
-    /// <typeparam name="TSendSmsRequestType"></typeparam>
-    /// <typeparam name="TAuthMessageType"></typeparam>
-    public class AuthMessageRecord<TSendSmsRequestType, TAuthMessageType> : IEntity<Guid>, ICreationTime
-        where TSendSmsRequestType : struct, Enum
-        where TAuthMessageType : struct, Enum
-    {
-        [Key] // EF 主键
-        public Guid Id { get; set; }
+    public DateTimeOffset CreationTime { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTimeOffset CreationTime { get; set; }
+    /// <summary>
+    /// 手机号(如果为短信验证码此字段必填)
+    /// </summary>
+    public string? PhoneNumber { get; set; }
 
-        /// <summary>
-        /// 手机号(如果为短信验证码此字段必填)
-        /// </summary>
-        public string? PhoneNumber { get; set; }
+    /// <summary>
+    /// 邮箱地址(如果为邮箱验证码此字段必填)
+    /// </summary>
+    public string? Email { get; set; }
 
-        /// <summary>
-        /// 邮箱地址(如果为邮箱验证码此字段必填)
-        /// </summary>
-        public string? Email { get; set; }
+    /// <summary>
+    /// 调用方IP地址
+    /// </summary>
+    [Required] // EF not null
+    public string IPAddress { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 调用方IP地址
-        /// </summary>
-        [Required] // EF not null
-        public string IPAddress { get; set; } = string.Empty;
+    #region 提供商内容
 
-        #region 提供商内容
+    /// <summary>
+    /// 第三方下发渠道的显示名称
+    /// 比如网易/阿里云
+    /// </summary>
+    [Required] // EF not null
+    public string Channel { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 第三方下发渠道的显示名称
-        /// 比如网易/阿里云
-        /// </summary>
-        [Required] // EF not null
-        public string Channel { get; set; } = string.Empty;
+    /// <summary>
+    /// 第三方提供商返回的内容
+    /// </summary>
+    public string? SendResultRecord { get; set; }
 
-        /// <summary>
-        /// 第三方提供商返回的内容
-        /// </summary>
-        public string? SendResultRecord { get; set; }
+    /// <summary>
+    /// 第三方提供商返回的HTTP状态码
+    /// </summary>
+    public int HttpStatusCode { get; set; }
 
-        /// <summary>
-        /// 第三方提供商返回的HTTP状态码
-        /// </summary>
-        public int HttpStatusCode { get; set; }
+    /// <summary>
+    /// 第三方提供商发送是否成功
+    /// 通常从调用第三方接口返回的JSON中获取状态码判定是否成功
+    /// </summary>
+    public bool SendIsSuccess { get; set; }
 
-        /// <summary>
-        /// 第三方提供商发送是否成功
-        /// 通常从调用第三方接口返回的JSON中获取状态码判定是否成功
-        /// </summary>
-        public bool SendIsSuccess { get; set; }
+    #endregion
 
-        #endregion
+    /// <summary>
+    /// 内容（短信验证码或邮箱验证码的内容）
+    /// 短信内容通常仅含有验证码数字，不包括其他的提示语文字
+    /// </summary>
+    [Required] // EF not null
+    public string Content { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 内容（短信验证码或邮箱验证码的内容）
-        /// 短信内容通常仅含有验证码数字，不包括其他的提示语文字
-        /// </summary>
-        [Required] // EF not null
-        public string Content { get; set; } = string.Empty;
+    /// <summary>
+    /// 是否校验过
+    /// </summary>
+    public bool EverCheck { get; set; }
 
-        /// <summary>
-        /// 是否校验过
-        /// </summary>
-        public bool EverCheck { get; set; }
+    /// <summary>
+    /// 是否校验成功
+    /// </summary>
+    public bool CheckSuccess { get; set; }
 
-        /// <summary>
-        /// 是否校验成功
-        /// </summary>
-        public bool CheckSuccess { get; set; }
+    /// <summary>
+    /// 是否被废弃
+    /// </summary>
+    public bool Abandoned { get; set; }
 
-        /// <summary>
-        /// 是否被废弃
-        /// </summary>
-        public bool Abandoned { get; set; }
+    /// <summary>
+    /// 校验失败次数
+    /// </summary>
+    public int CheckFailuresCount { get; set; }
 
-        /// <summary>
-        /// 校验失败次数
-        /// </summary>
-        public int CheckFailuresCount { get; set; }
+    /// <summary>
+    /// 类型 是属于邮箱验证还是短信验证
+    /// </summary>
+    public TEAuthMessageType Type { get; set; }
 
-        /// <summary>
-        /// 类型 是属于邮箱验证还是短信验证
-        /// </summary>
-        public TAuthMessageType Type { get; set; }
+    /// <summary>
+    /// 发送验证码用途
+    /// </summary>
+    public TSendSmsRequestType RequestType { get; set; }
 
-        /// <summary>
-        /// 发送验证码用途
-        /// </summary>
-        public TSendSmsRequestType RequestType { get; set; }
-
-        /// <summary>
-        /// 所属用户Id
-        /// </summary>
-        public Guid? UserId { get; set; }
-    }
+    /// <summary>
+    /// 所属用户Id
+    /// </summary>
+    public Guid? UserId { get; set; }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/Image.cs b/src/Common.ServerLib/Application/Entities/Image.cs
index 8743fcf0e..e6143adc9 100644
--- a/src/Common.ServerLib/Application/Entities/Image.cs
+++ b/src/Common.ServerLib/Application/Entities/Image.cs
@@ -7,47 +7,46 @@ using System.Diagnostics;
 using System.IO.FileFormats;
 using System.Security.Cryptography;
 
-namespace System.Application.Entities
+namespace System.Application.Entities;
+
+/// <summary>
+/// 图片表
+/// </summary>
+[Table("Images")]
+[DebuggerDisplay("{DebuggerDisplay(),nq}")]
+public class Image<TUser, TUploadImageType> : IImage, INEWSEQUENTIALID
+    where TUser : IUser
+    where TUploadImageType : struct, Enum
 {
+    string DebuggerDisplay() => $"{Id}, {Type}, {SHA384}";
+
+    [Key] // EF 主键
+    public Guid Id { get; set; }
+
+    public ImageFormat Type { get; set; }
+
+    public long Size { get; set; }
+
+    public int Width { get; set; }
+
+    public int Height { get; set; }
+
+    [Required] // EF not null
+    [MaxLength(Hashs.String.Lengths.SHA384 + 3)]
+    [MinLength(Hashs.String.Lengths.SHA384)]
+    public string SHA384 { get; set; } = string.Empty;
+
+    public bool SoftDeleted { get; set; }
+
     /// <summary>
-    /// 图片表
+    /// 上传纪录
     /// </summary>
-    [Table("Images")]
-    [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-    public class Image<TUser, TUploadImageType> : IImage, INEWSEQUENTIALID
-        where TUser : IUser
-        where TUploadImageType : struct, Enum
-    {
-        string DebuggerDisplay() => $"{Id}, {Type}, {SHA384}";
+    public virtual List<ImageUploadRecord<TUser, TUploadImageType>>? Records { get; set; }
 
-        [Key] // EF 主键
-        public Guid Id { get; set; }
+    public string GetFileName() => SHA384 + Type.GetExtension();
 
-        public ImageFormat Type { get; set; }
-
-        public long Size { get; set; }
-
-        public int Width { get; set; }
-
-        public int Height { get; set; }
-
-        [Required] // EF not null
-        [MaxLength(Hashs.String.Lengths.SHA384 + 3)]
-        [MinLength(Hashs.String.Lengths.SHA384)]
-        public string SHA384 { get; set; } = string.Empty;
-
-        public bool SoftDeleted { get; set; }
-
-        /// <summary>
-        /// 上传纪录
-        /// </summary>
-        public virtual List<ImageUploadRecord<TUser, TUploadImageType>>? Records { get; set; }
-
-        public string GetFileName() => SHA384 + Type.GetExtension();
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTimeOffset CreationTime { get; set; } = DateTimeOffset.Now;
-    }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTimeOffset CreationTime { get; set; } = DateTimeOffset.Now;
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/ImageUploadRecord.cs b/src/Common.ServerLib/Application/Entities/ImageUploadRecord.cs
index 51b8dc2f7..c3d8be3f7 100644
--- a/src/Common.ServerLib/Application/Entities/ImageUploadRecord.cs
+++ b/src/Common.ServerLib/Application/Entities/ImageUploadRecord.cs
@@ -4,44 +4,43 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
 
-namespace System.Application.Entities
+namespace System.Application.Entities;
+
+/// <summary>
+/// 图片上传纪录表
+/// </summary>
+[Table("ImageUploadRecords")]
+[DebuggerDisplay("{DebuggerDisplay(),nq}")]
+public class ImageUploadRecord<TUser, TUploadImageType> : INEWSEQUENTIALID, ICreationTime
+    where TUser : IUser
+    where TUploadImageType : struct, Enum
 {
+    string DebuggerDisplay() => $"{ImagesId}, {Type}, {User?.NickName ?? (UserId.ToString())}";
+
+    [Key] // EF 主键
+    public Guid Id { get; set; }
+
     /// <summary>
-    /// 图片上传纪录表
+    /// 上传的用户ID
     /// </summary>
-    [Table("ImageUploadRecords")]
-    [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-    public class ImageUploadRecord<TUser, TUploadImageType> : INEWSEQUENTIALID, ICreationTime
-        where TUser : IUser
-        where TUploadImageType : struct, Enum
-    {
-        string DebuggerDisplay() => $"{ImagesId}, {Type}, {User?.NickName ?? (UserId.ToString())}";
+    [Required] // EF not null
+    public Guid UserId { get; set; }
 
-        [Key] // EF 主键
-        public Guid Id { get; set; }
+    /// <summary>
+    /// 上传的用户
+    /// </summary>
+    public virtual TUser? User { get; set; }
 
-        /// <summary>
-        /// 上传的用户ID
-        /// </summary>
-        [Required] // EF not null
-        public Guid UserId { get; set; }
+    /// <summary>
+    /// 图片ID
+    /// </summary>
+    public Guid ImagesId { get; set; }
 
-        /// <summary>
-        /// 上传的用户
-        /// </summary>
-        public virtual TUser? User { get; set; }
+    public DateTimeOffset CreationTime { get; set; }
 
-        /// <summary>
-        /// 图片ID
-        /// </summary>
-        public Guid ImagesId { get; set; }
-
-        public DateTimeOffset CreationTime { get; set; }
-
-        /// <summary>
-        /// 上传图片类型（用途）
-        /// </summary>
-        [Required] // EF not null
-        public TUploadImageType Type { get; set; }
-    }
+    /// <summary>
+    /// 上传图片类型（用途）
+    /// </summary>
+    [Required] // EF not null
+    public TUploadImageType Type { get; set; }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Entities/KeyValuePair.cs b/src/Common.ServerLib/Application/Entities/KeyValuePair.cs
index 3b4fc38da..7ccac690e 100644
--- a/src/Common.ServerLib/Application/Entities/KeyValuePair.cs
+++ b/src/Common.ServerLib/Application/Entities/KeyValuePair.cs
@@ -3,24 +3,23 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
 
-namespace System.Application.Entities
+namespace System.Application.Entities;
+
+/// <summary>
+/// 键值对表
+/// <para>https://stackoverflow.com/questions/514603/key-value-pairs-in-a-database-table</para>
+/// </summary>
+[Table("KeyValuePairs")]
+[DebuggerDisplay("{DebuggerDisplay(),nq}")]
+public sealed class KeyValuePair : IEntity<string>, ISoftDeleted
 {
-    /// <summary>
-    /// 键值对表
-    /// <para>https://stackoverflow.com/questions/514603/key-value-pairs-in-a-database-table</para>
-    /// </summary>
-    [Table("KeyValuePairs")]
-    [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-    public sealed class KeyValuePair : IEntity<string>, ISoftDeleted
-    {
-        [Key] // EF 主键
-        public string Id { get; set; } = string.Empty;
+    [Key] // EF 主键
+    public string Id { get; set; } = string.Empty;
 
-        [Required] // EF not null
-        public string Value { get; set; } = string.Empty;
+    [Required] // EF not null
+    public string Value { get; set; } = string.Empty;
 
-        public bool SoftDeleted { get; set; }
+    public bool SoftDeleted { get; set; }
 
-        string DebuggerDisplay() => $"{Id}, {Value}";
-    }
+    string DebuggerDisplay() => $"{Id}, {Value}";
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Essentials/Browser2.cs b/src/Common.ServerLib/Application/Essentials/Browser2.cs
index a842d06de..90ac311bb 100644
--- a/src/Common.ServerLib/Application/Essentials/Browser2.cs
+++ b/src/Common.ServerLib/Application/Essentials/Browser2.cs
@@ -1,13 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 // ReSharper disable once CheckNamespace
-namespace System.Application
+namespace System.Application;
+
+public partial class Browser2
 {
-    public partial class Browser2
-    {
 
-    }
 }
diff --git a/src/Common.ServerLib/Application/Filters/AddResponseHeadersAttribute.cs b/src/Common.ServerLib/Application/Filters/AddResponseHeadersAttribute.cs
index 82ed45963..a3e82ce33 100644
--- a/src/Common.ServerLib/Application/Filters/AddResponseHeadersAttribute.cs
+++ b/src/Common.ServerLib/Application/Filters/AddResponseHeadersAttribute.cs
@@ -1,22 +1,21 @@
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace System.Application.Filters
+namespace System.Application.Filters;
+
+/// <summary>
+/// 添加额外响应头
+/// </summary>
+public sealed class AddResponseHeadersAttribute : ActionFilterAttribute
 {
-    /// <summary>
-    /// 添加额外响应头
-    /// </summary>
-    public sealed class AddResponseHeadersAttribute : ActionFilterAttribute
+    public override void OnResultExecuting(ResultExecutingContext context)
     {
-        public override void OnResultExecuting(ResultExecutingContext context)
-        {
-            /* https://developer.mozilla.org/zh-CN/docs/Web/HTTP/X-Frame-Options
-             * X-Frame-Options HTTP 响应头是用来给浏览器指示允许一个页面可否在 <frame>, <iframe> 或者 <object> 中展现的标记。网站可以使用此功能，来确保自己网站的内容没有被嵌到别人的网站中去，也从而避免了点击劫持 (clickjacking) 的攻击。
-             * SAMEORIGIN 表示该页面可以在相同域名页面的 frame 中展示。*/
-            context.HttpContext.Response.Headers.Add("X-FRAME-OPTIONS", "SAMEORIGIN");
+        /* https://developer.mozilla.org/zh-CN/docs/Web/HTTP/X-Frame-Options
+         * X-Frame-Options HTTP 响应头是用来给浏览器指示允许一个页面可否在 <frame>, <iframe> 或者 <object> 中展现的标记。网站可以使用此功能，来确保自己网站的内容没有被嵌到别人的网站中去，也从而避免了点击劫持 (clickjacking) 的攻击。
+         * SAMEORIGIN 表示该页面可以在相同域名页面的 frame 中展示。*/
+        context.HttpContext.Response.Headers.Add("X-FRAME-OPTIONS", "SAMEORIGIN");
 
-            /* https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Headers/X-Content-Type-Options
-             * X-Content-Type-Options 响应首部相当于一个提示标志，被服务器用来提示客户端一定要遵循在 Content-Type 首部中对  MIME 类型 的设定，而不能对其进行修改。这就禁用了客户端的 MIME 类型嗅探行为，换句话说，也就是意味着网站管理员确定自己的设置没有问题。*/
-            context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
-        }
+        /* https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Headers/X-Content-Type-Options
+         * X-Content-Type-Options 响应首部相当于一个提示标志，被服务器用来提示客户端一定要遵循在 Content-Type 首部中对  MIME 类型 的设定，而不能对其进行修改。这就禁用了客户端的 MIME 类型嗅探行为，换句话说，也就是意味着网站管理员确定自己的设置没有问题。*/
+        context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/ProgramHelper.cs b/src/Common.ServerLib/Application/ProgramHelper.cs
index b1737a1d2..7273d0a16 100644
--- a/src/Common.ServerLib/Application/ProgramHelper.cs
+++ b/src/Common.ServerLib/Application/ProgramHelper.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
@@ -9,93 +10,25 @@ using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Reflection;
+using System.ComponentModel;
 
-namespace System.Application
+namespace System.Application;
+
+public static class ProgramHelper
 {
-    public static class ProgramHelper
+    public static string Version { get; private set; } = string.Empty;
+
+#if DEBUG
+    [Obsolete("应迁移到 ASP.NET Core 6.0 中新的最小托管模型的代码", true)]
+    public static void Main<TStartup>(string projectName,
+        string[] args, Action<string>? writeLine = null) where TStartup : class
     {
-        public static string Version { get; private set; } = string.Empty;
-
-        public static void Main<TStartup>(string projectName,
-            string[] args, Action<string>? writeLine = null) where TStartup : class
+        var logger = NLogBuilder.ConfigureNLog(InitNLogConfig()).GetCurrentClassLogger();
+        try
         {
-            var logger = NLogBuilder.ConfigureNLog(InitNLogConfig()).GetCurrentClassLogger();
-            try
-            {
-                logger.Info("init main");
-                var host = CreateHostBuilder<TStartup>(args).Build();
-                DI.Init(host.Services);
-
-                writeLine ??= Console.WriteLine;
-                Console.OutputEncoding = Encoding.Unicode; // 使用UTF16编码输出控制台文字
-                Version = typeof(TStartup).Assembly.GetName().Version?.ToString() ?? string.Empty;
-
-                UnityConsoleOutputHead.Write(writeLine,
-                    projectName,
-                    Version,
-                    RuntimeVersion,
-                    CentralProcessorName);
-
-                host.Run();
-            }
-            catch (Exception exception)
-            {
-                //NLog: catch setup errors
-                logger.Error(exception, "Stopped program because of exception");
-                throw;
-            }
-            finally
-            {
-                // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
-                NLog.LogManager.Shutdown();
-            }
-            static LoggingConfiguration InitNLogConfig()
-            {
-                // https://github.com/NLog/NLog/wiki/Getting-started-with-ASP.NET-Core-5
-                var xmlConfigStr =
-                    "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
-                    "<nlog xmlns=\"http://www.nlog-project.org/schemas/NLog.xsd\"" +
-                    "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
-                    "      autoReload=\"true\"" +
-                    "      internalLogLevel=\"info\"" +
-                    "      internalLogFile=\"logs" + Path.DirectorySeparatorChar + "internal-nlog.txt\">" +
-                    // enable asp.net core layout renderers
-                    "  <extensions>" +
-                    "    <add assembly=\"NLog.Web.AspNetCore\"/>" +
-                    "  </extensions>" +
-                    // the targets to write to
-                    "  <targets>" +
-                    // write logs to file
-                    "    <target xsi:type=\"File\" name=\"allfile\" fileName=\"logs" + Path.DirectorySeparatorChar + "nlog-all-${shortdate}.log\"" +
-                    "            layout=\"${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}\"/>" +
-                    // another file log, only own logs. Uses some ASP.NET core renderers
-                    "    <target xsi:type=\"File\" name=\"ownFile-web\" fileName=\"logs" + Path.DirectorySeparatorChar + "nlog-own-${shortdate}.log\"" +
-                    "            layout=\"${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}\"/>" +
-                    // Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection
-                    "    <target xsi:type=\"Console\" name=\"lifetimeConsole\" layout=\"${level:truncate=4:tolower=true}\\: ${logger}[0]${newline}      ${message}${exception:format=tostring}\" />" +
-                    "  </targets>" +
-                    // rules to map from logger name to target
-                    "  <rules>" +
-                    // All logs, including from Microsoft
-                    "    <logger name=\"*\" minlevel=\"Trace\" writeTo=\"allfile\"/>" +
-                    // Output hosting lifetime messages to console target for faster startup detection
-                    "    <logger name=\"Microsoft.Hosting.Lifetime\" minlevel=\"Info\" writeTo=\"lifetimeConsole, ownFile-web\" final=\"true\" />" +
-                    // Skip non-critical Microsoft logs and so log only own logs
-                    "    <logger name=\"Microsoft.*\" maxLevel=\"Info\" final=\"true\"/>" +
-                    "    <logger name=\"System.Net.Http.*\" maxlevel=\"Info\" final=\"true\" />" +
-                    // BlackHole without writeTo
-                    "    <logger name=\"*\" minlevel=\"Trace\" writeTo=\"ownFile-web\"/>" +
-                    "  </rules>" +
-                    "</nlog>";
-
-                var xmlConfig = XmlLoggingConfiguration.CreateFromXmlString(xmlConfigStr);
-
-                return xmlConfig;
-            }
-        }
-
-        public static IHostBuilder CreateHostBuilder<TStartup>(string[] args) where TStartup : class =>
-            Host.CreateDefaultBuilder(args)
+            logger.Debug("init main");
+            var host = Host.CreateDefaultBuilder(args)
             .ConfigureLogging(logging =>
             {
                 //logging.AddAzureWebAppDiagnostics(); // 添加 Azure Web App 日志 。
@@ -104,145 +37,259 @@ namespace System.Application
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<TStartup>();
-            });
+            })
+            .Build();
+            DI.ConfigureServices(host.Services);
 
-        //static readonly Lazy<string> mRuntimeVersion = new(() =>
-        //{
-        //    try
-        //    {
-        //        var process = Process.GetCurrentProcess();
-        //        var module = process.Modules.Cast<ProcessModule>().FirstOrDefault(x
-        //            => x != null && x.ModuleName != null &&
-        //            (x.ModuleName.StartsWith("hostfxr", StringComparison.OrdinalIgnoreCase) ||
-        //            x.ModuleName.StartsWith("hostpolicy", StringComparison.OrdinalIgnoreCase)
-        //        ));
-        //        if (module != null)
-        //        {
-        //            return module.FileVersionInfo.FileDescription?.Split(" - ").LastOrDefault()?.Trim() ?? string.Empty;
-        //        }
-        //    }
-        //    catch
-        //    {
-        //    }
-        //    return string.Empty;
-        //});
+            writeLine ??= Console.WriteLine;
+            Console.OutputEncoding = Encoding.Unicode; // 使用 UTF16 编码输出控制台文字
+            Version = typeof(TStartup).Assembly.GetName().Version?.ToString() ?? string.Empty;
 
-        /// <summary>
-        /// 获取当前运行时版本
-        /// </summary>
-        public static string RuntimeVersion =>
-            Environment.Version.ToString();
-        //mRuntimeVersion.Value;
+            UnityConsoleOutputHead.Write(writeLine,
+                projectName,
+                Version,
+                RuntimeVersion,
+                CentralProcessorName);
 
-        static readonly Lazy<string> mCentralProcessorName = new(() =>
+            host.Run();
+        }
+        catch (Exception exception)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            //NLog: catch setup errors
+            logger.Error(exception, "Stopped program because of exception");
+            throw;
+        }
+        finally
+        {
+            // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
+            NLog.LogManager.Shutdown();
+        }
+    }
+#endif
+
+    [Description("适用于 ASP.NET Core 6.0 中新的最小托管模型的代码")]
+    public static void Main(
+        string projectName,
+        string[] args,
+        Action<WebApplicationBuilder>? configureServices = null,
+        Action<WebApplication>? configure = null)
+    {
+        var logger = NLogBuilder.ConfigureNLog(InitNLogConfig()).GetCurrentClassLogger();
+        try
+        {
+            // https://github.com/NLog/NLog/wiki/Getting-started-with-ASP.NET-Core-6
+            logger.Debug("init main");
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Host.UseNLog();
+            configureServices?.Invoke(builder);
+            var app = builder.Build();
+            configure?.Invoke(app);
+            DI.ConfigureServices(app.Services);
+
+            Console.OutputEncoding = Encoding.Unicode; // 使用 UTF16 编码输出控制台文字
+            Version = ((configureServices?.Method ?? configure?.Method)?.Module.Assembly ?? Assembly.GetCallingAssembly()).GetName().Version?.ToString() ?? string.Empty;
+
+            UnityConsoleOutputHead.Write(Console.WriteLine,
+                projectName,
+                Version,
+                RuntimeVersion,
+                CentralProcessorName);
+
+            app.Run();
+        }
+        catch (Exception exception)
+        {
+            //NLog: catch setup errors
+            logger.Error(exception, "Stopped program because of exception");
+            throw;
+        }
+        finally
+        {
+            // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
+            NLog.LogManager.Shutdown();
+        }
+    }
+
+    static LoggingConfiguration InitNLogConfig()
+    {
+        // https://github.com/NLog/NLog/wiki/Getting-started-with-ASP.NET-Core-5
+        var xmlConfigStr =
+            "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
+            "<nlog xmlns=\"http://www.nlog-project.org/schemas/NLog.xsd\"" +
+            "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+            "      autoReload=\"true\"" +
+            "      internalLogLevel=\"info\"" +
+            "      internalLogFile=\"logs" + Path.DirectorySeparatorChar + "internal-nlog.txt\">" +
+            // enable asp.net core layout renderers
+            "  <extensions>" +
+            "    <add assembly=\"NLog.Web.AspNetCore\"/>" +
+            "  </extensions>" +
+            // the targets to write to
+            "  <targets>" +
+            // write logs to file
+            "    <target xsi:type=\"File\" name=\"allfile\" fileName=\"logs" + Path.DirectorySeparatorChar + "nlog-all-${shortdate}.log\"" +
+            "            layout=\"${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}\"/>" +
+            // another file log, only own logs. Uses some ASP.NET core renderers
+            "    <target xsi:type=\"File\" name=\"ownFile-web\" fileName=\"logs" + Path.DirectorySeparatorChar + "nlog-own-${shortdate}.log\"" +
+            "            layout=\"${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}\"/>" +
+            // Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection
+            "    <target xsi:type=\"Console\" name=\"lifetimeConsole\" layout=\"${level:truncate=4:tolower=true}\\: ${logger}[0]${newline}      ${message}${exception:format=tostring}\" />" +
+            "  </targets>" +
+            // rules to map from logger name to target
+            "  <rules>" +
+            // All logs, including from Microsoft
+            "    <logger name=\"*\" minlevel=\"Trace\" writeTo=\"allfile\"/>" +
+            // Output hosting lifetime messages to console target for faster startup detection
+            "    <logger name=\"Microsoft.Hosting.Lifetime\" minlevel=\"Info\" writeTo=\"lifetimeConsole, ownFile-web\" final=\"true\" />" +
+            // Skip non-critical Microsoft logs and so log only own logs
+            "    <logger name=\"Microsoft.*\" maxLevel=\"Info\" final=\"true\"/>" +
+            "    <logger name=\"System.Net.Http.*\" maxlevel=\"Info\" final=\"true\" />" +
+            // BlackHole without writeTo
+            "    <logger name=\"*\" minlevel=\"Trace\" writeTo=\"ownFile-web\"/>" +
+            "  </rules>" +
+            "</nlog>";
+
+        var xmlConfig = XmlLoggingConfiguration.CreateFromXmlString(xmlConfigStr);
+
+        return xmlConfig;
+    }
+
+    //static readonly Lazy<string> mRuntimeVersion = new(() =>
+    //{
+    //    try
+    //    {
+    //        var process = Process.GetCurrentProcess();
+    //        var module = process.Modules.Cast<ProcessModule>().FirstOrDefault(x
+    //            => x != null && x.ModuleName != null &&
+    //            (x.ModuleName.StartsWith("hostfxr", StringComparison.OrdinalIgnoreCase) ||
+    //            x.ModuleName.StartsWith("hostpolicy", StringComparison.OrdinalIgnoreCase)
+    //        ));
+    //        if (module != null)
+    //        {
+    //            return module.FileVersionInfo.FileDescription?.Split(" - ").LastOrDefault()?.Trim() ?? string.Empty;
+    //        }
+    //    }
+    //    catch
+    //    {
+    //    }
+    //    return string.Empty;
+    //});
+
+    /// <summary>
+    /// 获取当前运行时版本
+    /// </summary>
+    public static string RuntimeVersion =>
+        Environment.Version.ToString();
+    //mRuntimeVersion.Value;
+
+    static readonly Lazy<string> mCentralProcessorName = new(() =>
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            RegistryKey? registryKey = null;
+            try
             {
-                RegistryKey? registryKey = null;
-                try
-                {
-                    registryKey = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0\");
-                    return registryKey?.GetValue("ProcessorNameString")?.ToString()?.Trim() ?? string.Empty;
-                }
-                catch
-                {
-                }
-                finally
-                {
-                    registryKey?.Dispose();
-                }
+                registryKey = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0\");
+                return registryKey?.GetValue("ProcessorNameString")?.ToString()?.Trim() ?? string.Empty;
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            catch
             {
-                var filePath = string.Format("{0}proc{0}cpuinfo", Path.DirectorySeparatorChar);
-                if (File.Exists(filePath))
+            }
+            finally
+            {
+                registryKey?.Dispose();
+            }
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            var filePath = string.Format("{0}proc{0}cpuinfo", Path.DirectorySeparatorChar);
+            if (File.Exists(filePath))
+            {
+                using var fs = File.OpenRead(filePath);
+                using var sr = new StreamReader(fs);
+                while (sr.Peek() >= 0)
                 {
-                    using var fs = File.OpenRead(filePath);
-                    using var sr = new StreamReader(fs);
-                    while (sr.Peek() >= 0)
+                    var line = sr.ReadLine();
+                    if (line == null) break;
+                    var array = line.Split(':', StringSplitOptions.RemoveEmptyEntries);
+                    if (array.Length == 2)
                     {
-                        var line = sr.ReadLine();
-                        if (line == null) break;
-                        var array = line.Split(':', StringSplitOptions.RemoveEmptyEntries);
-                        if (array.Length == 2)
+                        if (array[0].Trim() == "model name")
                         {
-                            if (array[0].Trim() == "model name")
-                            {
-                                return array[1].Trim();
-                            }
+                            return array[1].Trim();
                         }
                     }
                 }
             }
-            //else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            //{
-            //    //sysctl -n machdep.cpu.brand_string
-            //}
-            return string.Empty;
-        });
+        }
+        //else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        //{
+        //    //sysctl -n machdep.cpu.brand_string
+        //}
+        return string.Empty;
+    });
 
-        /// <summary>
-        /// 获取当前运行的计算机CPU显示名称，仅支持 Windows OS
-        /// </summary>
-        public static string CentralProcessorName => mCentralProcessorName.Value;
+    /// <summary>
+    /// 获取当前运行的计算机CPU显示名称，仅支持 Windows OS
+    /// </summary>
+    public static string CentralProcessorName => mCentralProcessorName.Value;
 
-        public static IActionResult GetInfo(ControllerBase controller, IWebHostEnvironment environment)
+    public static IActionResult GetInfo(ControllerBase controller, IWebHostEnvironment environment)
+    {
+        if (environment.IsDevelopment())
         {
-            if (environment.IsDevelopment())
+            var now = DateTime.Now;
+            return new JsonResult(new
             {
-                var now = DateTime.Now;
-                return new JsonResult(new
+                Version,
+                RuntimeVersion,
+                CentralProcessorName = $"{CentralProcessorName} x{Environment.ProcessorCount}",
+                environment.WebRootPath,
+                environment.ContentRootPath,
+                environment.EnvironmentName,
+                environment.ApplicationName,
+                CurrentCulture = CultureInfo.CurrentCulture.EnglishName,
+                RawUrl = controller.Request.RawUrl(),
+                controller.Request.Protocol,
+                AcceptWebP = controller.Request.AcceptWebP(),
+                UserHostAddress = controller.Request.UserHostAddress(),
+                UserAgent = controller.Request.UserAgent(),
+                AcceptLanguage = controller.Request.Headers["Accept-Language"].ToString(),
+                //AcceptLanguage2 = controller.Request.Headers["Accept-Language2"].ToString(),
+                Now = new Dictionary<string, object>
                 {
-                    Version,
-                    RuntimeVersion,
-                    CentralProcessorName = $"{CentralProcessorName} x{Environment.ProcessorCount}",
-                    environment.WebRootPath,
-                    environment.ContentRootPath,
-                    environment.EnvironmentName,
-                    environment.ApplicationName,
-                    CurrentCulture = CultureInfo.CurrentCulture.EnglishName,
-                    RawUrl = controller.Request.RawUrl(),
-                    controller.Request.Protocol,
-                    AcceptWebP = controller.Request.AcceptWebP(),
-                    UserHostAddress = controller.Request.UserHostAddress(),
-                    UserAgent = controller.Request.UserAgent(),
-                    AcceptLanguage = controller.Request.Headers["Accept-Language"].ToString(),
-                    //AcceptLanguage2 = controller.Request.Headers["Accept-Language2"].ToString(),
-                    Now = new Dictionary<string, object>
-                    {
-                        { "Default", now },
-                        { "RFC1123", now.ToString("r") },
-                        { "Standard", now.ToString(DateTimeFormat.Standard) },
-                    },
-                    DayOfWeek = now.DayOfWeek.ToString2(true),
-                    //Process = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().Select(x => x.FileName).ToArray(),
-                });
-            }
-            return controller.NotFound();
+                    { "Default", now },
+                    { "RFC1123", now.ToString("r") },
+                    { "Standard", now.ToString(DateTimeFormat.Standard) },
+                },
+                DayOfWeek = now.DayOfWeek.ToString2(true),
+                //Process = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().Select(x => x.FileName).ToArray(),
+            });
         }
+        return controller.NotFound();
+    }
 
-        public static IActionResult GetEnv(ControllerBase controller, IWebHostEnvironment environment)
+    public static IActionResult GetEnv(ControllerBase controller, IWebHostEnvironment environment)
+    {
+        var content = $"<h1>{environment.EnvironmentName}</h1>";
+        return controller.Content(content, MediaTypeNames.HTML);
+    }
+
+    /// <inheritdoc cref="Path2.InitFileSystem(Func{string}, Func{string})"/>
+    public static void InitFileSystem(IWebHostEnvironment environment)
+    {
+        IOPath.InitFileSystem(GetAppDataDirectory, GetCacheDirectory);
+        string GetAppDataDirectory()
         {
-            var content = $"<h1>{environment.EnvironmentName}</h1>";
-            return controller.Content(content, MediaTypeNames.HTML);
+            var pathAppData = Path.Combine(environment.ContentRootPath, "AppData");
+            IOPath.DirCreateByNotExists(pathAppData);
+            return pathAppData;
         }
-
-        /// <inheritdoc cref="Path2.InitFileSystem(Func{string}, Func{string})"/>
-        public static void InitFileSystem(IWebHostEnvironment environment)
+        string GetCacheDirectory()
         {
-            IOPath.InitFileSystem(GetAppDataDirectory, GetCacheDirectory);
-            string GetAppDataDirectory()
-            {
-                var pathAppData = Path.Combine(environment.ContentRootPath, "AppData");
-                IOPath.DirCreateByNotExists(pathAppData);
-                return pathAppData;
-            }
-            string GetCacheDirectory()
-            {
-                var pathCache = Path.Combine(environment.ContentRootPath, "Cache");
-                IOPath.DirCreateByNotExists(pathCache);
-                return pathCache;
-            }
+            var pathCache = Path.Combine(environment.ContentRootPath, "Cache");
+            IOPath.DirCreateByNotExists(pathCache);
+            return pathCache;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Repositories/IAuthMessageRecordRepository.cs b/src/Common.ServerLib/Application/Repositories/IAuthMessageRecordRepository.cs
index d89b9b2c1..e638a7003 100644
--- a/src/Common.ServerLib/Application/Repositories/IAuthMessageRecordRepository.cs
+++ b/src/Common.ServerLib/Application/Repositories/IAuthMessageRecordRepository.cs
@@ -1,53 +1,52 @@
-using System.Application.Entities;
+using System.Application.Entities;
 using System.Application.Services;
 using System.Threading.Tasks;
 
-namespace System.Application.Repositories
+namespace System.Application.Repositories;
+
+public interface IAuthMessageRecordRepository<TAuthMessageRecord, TSendSmsRequestType, TEAuthMessageType> : IRepository<TAuthMessageRecord, Guid>
+    where TAuthMessageRecord : AuthMessageRecord<TSendSmsRequestType, TEAuthMessageType>
+    where TSendSmsRequestType : struct, Enum
+    where TEAuthMessageType : struct, Enum
 {
-    public interface IAuthMessageRecordRepository<TAuthMessageRecord, TSendSmsRequestType, TAuthMessageType> : IRepository<TAuthMessageRecord, Guid>
-        where TAuthMessageRecord : AuthMessageRecord<TSendSmsRequestType, TAuthMessageType>
-        where TSendSmsRequestType : struct, Enum
-        where TAuthMessageType : struct, Enum
-    {
-        /// <summary>
-        /// 获取最近的没有校验和没有废弃的一条验证码
-        /// </summary>
-        /// <param name="type">验证码类型</param>
-        /// <param name="phoneNumberOrEmail">手机号码或邮箱地址</param>
-        /// <param name="content">验证码内容</param>
-        /// <returns></returns>
-        Task<TAuthMessageRecord?> GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(
-            TAuthMessageType type,
-            string phoneNumberOrEmail,
-            TSendSmsRequestType useType);
+    /// <summary>
+    /// 获取最近的没有校验和没有废弃的一条验证码
+    /// </summary>
+    /// <param name="type">验证码类型</param>
+    /// <param name="phoneNumberOrEmail">手机号码或邮箱地址</param>
+    /// <param name="content">验证码内容</param>
+    /// <returns></returns>
+    Task<TAuthMessageRecord?> GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(
+        TEAuthMessageType type,
+        string phoneNumberOrEmail,
+        TSendSmsRequestType useType);
 
-        /// <summary>
-        /// 校验验证码
-        /// </summary>
-        /// <param name="smsSender"></param>
-        /// <param name="phoneNumberOrEmail"></param>
-        /// <param name="message"></param>
-        /// <param name="useType"></param>
-        /// <param name="type">验证码类型</param>
-        /// <returns></returns>
-        Task<TAuthMessageRecord?> CheckAuthMessageAsync(ISmsSender smsSender, string phoneNumberOrEmail, string message, TSendSmsRequestType useType, TAuthMessageType? type = null);
+    /// <summary>
+    /// 校验验证码
+    /// </summary>
+    /// <param name="smsSender"></param>
+    /// <param name="phoneNumberOrEmail"></param>
+    /// <param name="message"></param>
+    /// <param name="useType"></param>
+    /// <param name="type">验证码类型</param>
+    /// <returns></returns>
+    Task<TAuthMessageRecord?> CheckAuthMessageAsync(ISmsSender smsSender, string phoneNumberOrEmail, string message, TSendSmsRequestType useType, TEAuthMessageType? type = null);
 
-        /// <summary>
-        /// 获取手机号上次发送验证码的时间
-        /// </summary>
-        /// <param name="phoneNumberOrEmail">手机号码</param>
-        /// <param name="requestType">验证码请求类型</param>
-        /// <param name="type">验证码类型</param>
-        /// <returns></returns>
-        Task<DateTimeOffset?> GetLastSendSmsTime(string phoneNumberOrEmail, TSendSmsRequestType? requestType = null, TAuthMessageType? type = null);
+    /// <summary>
+    /// 获取手机号上次发送验证码的时间
+    /// </summary>
+    /// <param name="phoneNumberOrEmail">手机号码</param>
+    /// <param name="requestType">验证码请求类型</param>
+    /// <param name="type">验证码类型</param>
+    /// <returns></returns>
+    Task<DateTimeOffset?> GetLastSendSmsTime(string phoneNumberOrEmail, TSendSmsRequestType? requestType = null, TEAuthMessageType? type = null);
 
-        /// <summary>
-        /// 根据手机号获取今天是否超过了最大的短信次数限制
-        /// </summary>
-        /// <param name="phoneNum">手机号码</param>
-        /// <param name="maxSendSmsDay">一天内最大发送次数</param>
-        /// <param name="type">验证码类型</param>
-        /// <returns></returns>
-        Task<bool> IsMaxSendSmsDay(string phoneNum, byte? maxSendSmsDay = null, TAuthMessageType? type = null);
-    }
+    /// <summary>
+    /// 根据手机号获取今天是否超过了最大的短信次数限制
+    /// </summary>
+    /// <param name="phoneNum">手机号码</param>
+    /// <param name="maxSendSmsDay">一天内最大发送次数</param>
+    /// <param name="type">验证码类型</param>
+    /// <returns></returns>
+    Task<bool> IsMaxSendSmsDay(string phoneNum, byte? maxSendSmsDay = null, TEAuthMessageType? type = null);
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/Repositories/Implementation/AuthMessageRecordRepository.cs b/src/Common.ServerLib/Application/Repositories/Implementation/AuthMessageRecordRepository.cs
index 5cce87df8..7fe18a72e 100644
--- a/src/Common.ServerLib/Application/Repositories/Implementation/AuthMessageRecordRepository.cs
+++ b/src/Common.ServerLib/Application/Repositories/Implementation/AuthMessageRecordRepository.cs
@@ -1,132 +1,132 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
 using System.Application.Entities;
 using System.Application.Services;
 using System.Linq;
 using System.Threading.Tasks;
 using SMS = System.Application.SMSConstants;
 
-namespace System.Application.Repositories.Implementation
+namespace System.Application.Repositories.Implementation;
+
+public abstract class AuthMessageRecordRepository<TDbContext, TAuthMessageRecord, TSendSmsRequestType, TEAuthMessageType> : Repository<TDbContext, TAuthMessageRecord, Guid>, IAuthMessageRecordRepository<TAuthMessageRecord, TSendSmsRequestType, TEAuthMessageType>
+    where TDbContext : DbContext
+    where TAuthMessageRecord : AuthMessageRecord<TSendSmsRequestType, TEAuthMessageType>
+    where TSendSmsRequestType : struct, Enum
+    where TEAuthMessageType : struct, Enum
 {
-    public abstract class AuthMessageRecordRepository<TDbContext, TAuthMessageRecord, TSendSmsRequestType, TAuthMessageType> : Repository<TDbContext, TAuthMessageRecord, Guid>, IAuthMessageRecordRepository<TAuthMessageRecord, TSendSmsRequestType, TAuthMessageType>
-        where TDbContext : DbContext
-        where TAuthMessageRecord : AuthMessageRecord<TSendSmsRequestType, TAuthMessageType>
-        where TSendSmsRequestType : struct, Enum
-        where TAuthMessageType : struct, Enum
+    public AuthMessageRecordRepository(TDbContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
     {
-        public AuthMessageRecordRepository(TDbContext dbContext) : base(dbContext)
+    }
+
+    protected abstract TEAuthMessageType GetDefaultEAuthMessageType();
+
+    /// <summary>
+    /// <see langword="true"/> IsPhoneNumber
+    /// <para>|</para>
+    /// <see langword="false"/> IsEmail
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    protected abstract bool IsPhoneNumberOrEmail(TEAuthMessageType type);
+
+    public async Task<TAuthMessageRecord?> GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(TEAuthMessageType type, string phoneNumberOrEmail, TSendSmsRequestType useType)
+    {
+        var m30_minutes_before = DateTimeOffset.Now.AddSeconds(-SMS.SmsSendPeriodValidity); // 30分钟之前
+        var query = Entity.OrderByDescending(x => x.CreationTime) // 时间倒排序
+            .Where(x => x.RequestType.Equals(useType) && x.CreationTime >= m30_minutes_before && !x.Abandoned && !x.CheckSuccess && x.Type.Equals(type));
+        // 过滤条件 30分钟之前创建的短信 没有废弃的(!Abandoned) 并且是 没有成功的(!CheckSuccess)
+
+        TAuthMessageRecord? item = default;
+
+        var isPhoneNumberOrEmail = IsPhoneNumberOrEmail(type);
+
+        if (isPhoneNumberOrEmail)
         {
+            item = await query.FirstOrDefaultAsync(x => x.PhoneNumber == phoneNumberOrEmail);
+        }
+        else
+        {
+            item = await query.FirstOrDefaultAsync(x => x.Email == phoneNumberOrEmail);
         }
 
-        protected abstract TAuthMessageType GetDefaultAuthMessageType();
+        return item;
+    }
 
-        /// <summary>
-        /// <see langword="true"/> IsPhoneNumber
-        /// <para>|</para>
-        /// <see langword="false"/> IsEmail
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        protected abstract bool IsPhoneNumberOrEmail(TAuthMessageType type);
+    public async Task<TAuthMessageRecord?> CheckAuthMessageAsync(ISmsSender smsSender, string phoneNumberOrEmail, string message, TSendSmsRequestType useType, TEAuthMessageType? type = null)
+    {
+        var type_ = type ?? GetDefaultEAuthMessageType();
 
-        public async Task<TAuthMessageRecord?> GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(TAuthMessageType type, string phoneNumberOrEmail, TSendSmsRequestType useType)
+        var lastEffectiveRecord = await GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(type_, phoneNumberOrEmail, useType);
+        if (lastEffectiveRecord == null || lastEffectiveRecord.Content != message) return null;
+        // ↑ 上一条有效纪录不存在或者验证码值不相同，返回null
+
+        if (!lastEffectiveRecord.EverCheck) // 如果这条纪录没有校验过
         {
-            var m30_minutes_before = DateTimeOffset.Now.AddSeconds(-SMS.SmsSendPeriodValidity); // 30分钟之前
-            var query = Entity.OrderByDescending(x => x.CreationTime) // 时间倒排序
-                .Where(x => x.RequestType.Equals(useType) && x.CreationTime >= m30_minutes_before && !x.Abandoned && !x.CheckSuccess && x.Type.Equals(type));
-            // 过滤条件 30分钟之前创建的短信 没有废弃的(!Abandoned) 并且是 没有成功的(!CheckSuccess)
-
-            TAuthMessageRecord? item = default;
-
-            var isPhoneNumberOrEmail = IsPhoneNumberOrEmail(type);
-
-            if (isPhoneNumberOrEmail)
-            {
-                item = await query.FirstOrDefaultAsync(x => x.PhoneNumber == phoneNumberOrEmail);
-            }
-            else
-            {
-                item = await query.FirstOrDefaultAsync(x => x.Email == phoneNumberOrEmail);
-            }
-
-            return item;
+            lastEffectiveRecord.EverCheck = true; // 设置此条纪录已经校验过
         }
 
-        public async Task<TAuthMessageRecord?> CheckAuthMessageAsync(ISmsSender smsSender, string phoneNumberOrEmail, string message, TSendSmsRequestType useType, TAuthMessageType? type = null)
+        if (lastEffectiveRecord.CheckFailuresCount >= SMS.MaxCheckFailuresCount)
         {
-            var type_ = type ?? GetDefaultAuthMessageType();
-
-            var lastEffectiveRecord = await GetMostRecentVerificationCodeWithoutChecksumAndMoDiscard(type_, phoneNumberOrEmail, useType);
-            if (lastEffectiveRecord == null || lastEffectiveRecord.Content != message) return null;
-            // ↑ 上一条有效纪录不存在或者验证码值不相同，返回null
-
-            if (!lastEffectiveRecord.EverCheck) // 如果这条纪录没有校验过
+            lastEffectiveRecord.Abandoned = true;
+        }
+        else
+        {
+            if (IsPhoneNumberOrEmail(type_) && smsSender != null && smsSender.SupportCheck)
             {
-                lastEffectiveRecord.EverCheck = true; // 设置此条纪录已经校验过
+                /* var check_provide_result =*/
+                await smsSender.CheckSmsAsync(phoneNumberOrEmail, message);
+                // 第三方提供商要求调用验证短信接口，返回值可忽略，由内部实现纪录错误日志
             }
 
+            lastEffectiveRecord.CheckSuccess = true;
+        }
+
+        if (!lastEffectiveRecord.CheckSuccess)
+        {
+            lastEffectiveRecord.CheckFailuresCount++;
             if (lastEffectiveRecord.CheckFailuresCount >= SMS.MaxCheckFailuresCount)
             {
-                lastEffectiveRecord.Abandoned = true;
+                lastEffectiveRecord.Abandoned = true; // 验证错误次数太多，此条纪录标记废弃
             }
-            else
-            {
-                if (IsPhoneNumberOrEmail(type_) && smsSender != null && smsSender.SupportCheck)
-                {
-                    /* var check_provide_result =*/
-                    await smsSender.CheckSmsAsync(phoneNumberOrEmail, message);
-                    // 第三方提供商要求调用验证短信接口，返回值可忽略，由内部实现纪录错误日志
-                }
-
-                lastEffectiveRecord.CheckSuccess = true;
-            }
-
-            if (!lastEffectiveRecord.CheckSuccess)
-            {
-                lastEffectiveRecord.CheckFailuresCount++;
-                if (lastEffectiveRecord.CheckFailuresCount >= SMS.MaxCheckFailuresCount)
-                {
-                    lastEffectiveRecord.Abandoned = true; // 验证错误次数太多，此条纪录标记废弃
-                }
-            }
-
-            await db.SaveChangesAsync();
-            return lastEffectiveRecord;
         }
 
-        public async Task<DateTimeOffset?> GetLastSendSmsTime(string phoneNumberOrEmail, TSendSmsRequestType? requestType = null, TAuthMessageType? type = null)
+        await db.SaveChangesAsync();
+        return lastEffectiveRecord;
+    }
+
+    public async Task<DateTimeOffset?> GetLastSendSmsTime(string phoneNumberOrEmail, TSendSmsRequestType? requestType = null, TEAuthMessageType? type = null)
+    {
+        IQueryable<TAuthMessageRecord> query = Entity;
+
+        if (requestType.HasValue)
         {
-            IQueryable<TAuthMessageRecord> query = Entity;
-
-            if (requestType.HasValue)
-            {
-                var requestTypeValue = requestType.Value;
-                query = query.Where(x => x.RequestType.Equals(requestTypeValue));
-            }
-
-            var type_ = type ?? GetDefaultAuthMessageType();
-
-            var item = await query
-                .OrderByDescending(x => x.CreationTime)
-                .Select(x => new { x.PhoneNumber, x.CreationTime, x.Type })
-                .FirstOrDefaultAsync(x => x.PhoneNumber == phoneNumberOrEmail && x.Type.Equals(type_));
-
-            return item?.CreationTime;
+            var requestTypeValue = requestType.Value;
+            query = query.Where(x => x.RequestType.Equals(requestTypeValue));
         }
 
-        public async Task<bool> IsMaxSendSmsDay(string phoneNum, byte? maxSendSmsDay = null, TAuthMessageType? type = null)
-        {
-            var type_ = type ?? GetDefaultAuthMessageType();
-            var maxSendSmsDay_ = maxSendSmsDay ?? SMS.MaxSendSmsDay;
-            var today = DateTimeOffset.Now.Date;
-            var tomorrow = today.AddDays(1);
+        var type_ = type ?? GetDefaultEAuthMessageType();
 
-            var count = await Entity
-                .CountAsync(x => x.PhoneNumber == phoneNum &&
-                x.CreationTime >= today &&
-                x.CreationTime < tomorrow &&
-                x.Type.Equals(type_));
+        var item = await query
+            .OrderByDescending(x => x.CreationTime)
+            .Select(x => new { x.PhoneNumber, x.CreationTime, x.Type })
+            .FirstOrDefaultAsync(x => x.PhoneNumber == phoneNumberOrEmail && x.Type.Equals(type_));
 
-            return count > maxSendSmsDay_;
-        }
+        return item?.CreationTime;
+    }
+
+    public async Task<bool> IsMaxSendSmsDay(string phoneNum, byte? maxSendSmsDay = null, TEAuthMessageType? type = null)
+    {
+        var type_ = type ?? GetDefaultEAuthMessageType();
+        var maxSendSmsDay_ = maxSendSmsDay ?? SMS.MaxSendSmsDay;
+        var today = DateTimeOffset.Now.Date;
+        var tomorrow = today.AddDays(1);
+
+        var count = await Entity
+            .CountAsync(x => x.PhoneNumber == phoneNum &&
+            x.CreationTime >= today &&
+            x.CreationTime < tomorrow &&
+            x.Type.Equals(type_));
+
+        return count > maxSendSmsDay_;
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/SMSConstants.cs b/src/Common.ServerLib/Application/SMSConstants.cs
index 4ffe5589b..2cb527a6f 100644
--- a/src/Common.ServerLib/Application/SMSConstants.cs
+++ b/src/Common.ServerLib/Application/SMSConstants.cs
@@ -1,25 +1,24 @@
-namespace System.Application
+namespace System.Application;
+
+public static class SMSConstants
 {
-    public static class SMSConstants
-    {
-        /// <summary>
-        /// （单位秒）短信发送有效期（10分钟）+1min 。
-        /// </summary>
-        public const ushort SmsSendPeriodValidity = 660;
+    /// <summary>
+    /// （单位秒）短信发送有效期（10分钟）+1min 。
+    /// </summary>
+    public const ushort SmsSendPeriodValidity = 660;
 
-        /// <summary>
-        /// 同一个手机号码一天发送短信验证码最大次数
-        /// </summary>
-        public const byte MaxSendSmsDay = 10;
+    /// <summary>
+    /// 同一个手机号码一天发送短信验证码最大次数
+    /// </summary>
+    public const byte MaxSendSmsDay = 10;
 
-        /// <summary>
-        /// 最大校验失败作废次数
-        /// </summary>
-        public const int MaxCheckFailuresCount = 20;
+    /// <summary>
+    /// 最大校验失败作废次数
+    /// </summary>
+    public const int MaxCheckFailuresCount = 20;
 
-        /// <summary>
-        /// （单位秒）发送短信过于频繁，距离上一次发送的时间+此秒值大于等于现在则返回错误提示
-        /// </summary>
-        public const ushort SmsSendTooFrequently = 59;
-    }
+    /// <summary>
+    /// （单位秒）发送短信过于频繁，距离上一次发送的时间+此秒值大于等于现在则返回错误提示
+    /// </summary>
+    public const ushort SmsSendTooFrequently = 59;
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Application/UnityConsoleOutputHead.cs b/src/Common.ServerLib/Application/UnityConsoleOutputHead.cs
index 195ce2953..70134f6ba 100644
--- a/src/Common.ServerLib/Application/UnityConsoleOutputHead.cs
+++ b/src/Common.ServerLib/Application/UnityConsoleOutputHead.cs
@@ -1,27 +1,26 @@
-using System.Globalization;
+using System.Globalization;
 
-namespace System.Application
+namespace System.Application;
+
+/// <summary>
+/// 统一控制台输出头部内容
+/// </summary>
+internal static class UnityConsoleOutputHead
 {
-    /// <summary>
-    /// 统一控制台输出头部内容
-    /// </summary>
-    internal static class UnityConsoleOutputHead
+    /// <inheritdoc cref="UnityConsoleOutputHead"/>
+    public static void Write(Action<string> writeLine,
+        string projectName,
+        string? version,
+        string? runtimeVersion = null,
+        string? cpuName = null)
     {
-        /// <inheritdoc cref="UnityConsoleOutputHead"/>
-        public static void Write(Action<string> writeLine,
-            string projectName,
-            string? version,
-            string? runtimeVersion = null,
-            string? cpuName = null)
-        {
-            // 项目代号和版本信息
-            writeLine($"Project {projectName} [{nameof(Version)} {version}{(string.IsNullOrEmpty(runtimeVersion) ? null : $" / Runtime {runtimeVersion}")}]" + Environment.NewLine);
-            if (!string.IsNullOrEmpty(cpuName))
-                writeLine($"CentralProcessorName: {cpuName} x{Environment.ProcessorCount}");
-            writeLine($"LocalTime: {DateTimeOffset.Now.ToLocalTime()}");
-            // 输出当前系统设置区域
-            writeLine($"CurrentCulture: {CultureInfo.CurrentCulture.Name} {CultureInfo.CurrentCulture.EnglishName}");
-            writeLine(string.Empty);
-        }
+        // 项目代号和版本信息
+        writeLine($"Project {projectName} [{nameof(Version)} {version}{(string.IsNullOrEmpty(runtimeVersion) ? null : $" / Runtime {runtimeVersion}")}]" + Environment.NewLine);
+        if (!string.IsNullOrEmpty(cpuName))
+            writeLine($"CentralProcessorName: {cpuName} x{Environment.ProcessorCount}");
+        writeLine($"LocalTime: {DateTimeOffset.Now.ToLocalTime()}");
+        // 输出当前系统设置区域
+        writeLine($"CurrentCulture: {CultureInfo.CurrentCulture.Name} {CultureInfo.CurrentCulture.EnglishName}");
+        writeLine(string.Empty);
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Extensions/HttpContextExtensions.cs b/src/Common.ServerLib/Extensions/HttpContextExtensions.cs
index d6669d665..e0e406373 100644
--- a/src/Common.ServerLib/Extensions/HttpContextExtensions.cs
+++ b/src/Common.ServerLib/Extensions/HttpContextExtensions.cs
@@ -5,34 +5,33 @@ using System.Linq;
 using System.Threading.Tasks;
 
 // ReSharper disable once CheckNamespace
-namespace System
+namespace System;
+
+public static class HttpContextExtensions
 {
-    public static class HttpContextExtensions
+    public static async Task<AuthenticationScheme[]> GetExternalProvidersAsync(this HttpContext context)
     {
-        public static async Task<AuthenticationScheme[]> GetExternalProvidersAsync(this HttpContext context)
+        if (context == null)
         {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            var schemes = context.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();
-
-            return (from scheme in await schemes.GetAllSchemesAsync()
-                    where !string.IsNullOrEmpty(scheme.DisplayName)
-                    select scheme).ToArray();
+            throw new ArgumentNullException(nameof(context));
         }
 
-        public static async Task<bool> IsProviderSupportedAsync(this HttpContext context, string provider)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
+        var schemes = context.RequestServices.GetRequiredService<IAuthenticationSchemeProvider>();
 
-            return (from scheme in await context.GetExternalProvidersAsync()
-                    where string.Equals(scheme.Name, provider, StringComparison.OrdinalIgnoreCase)
-                    select scheme).Any();
+        return (from scheme in await schemes.GetAllSchemesAsync()
+                where !string.IsNullOrEmpty(scheme.DisplayName)
+                select scheme).ToArray();
+    }
+
+    public static async Task<bool> IsProviderSupportedAsync(this HttpContext context, string provider)
+    {
+        if (context == null)
+        {
+            throw new ArgumentNullException(nameof(context));
         }
+
+        return (from scheme in await context.GetExternalProvidersAsync()
+                where string.Equals(scheme.Name, provider, StringComparison.OrdinalIgnoreCase)
+                select scheme).Any();
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Extensions/MvcExtensions.cs b/src/Common.ServerLib/Extensions/MvcExtensions.cs
index 88f1461db..2ebd5fa4a 100644
--- a/src/Common.ServerLib/Extensions/MvcExtensions.cs
+++ b/src/Common.ServerLib/Extensions/MvcExtensions.cs
@@ -1,39 +1,38 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 // ReSharper disable once CheckNamespace
-namespace System
-{
-    public static class MvcExtensions
-    {
-        /// <summary>
-        /// https://github.com/dotnet/aspnetcore/blob/v5.0.3/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs#L221
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public static bool HasAllowAnonymous(this FilterContext context)
-        {
-            var filters = context.Filters;
-            for (var i = 0; i < filters.Count; i++)
-            {
-                if (filters[i] is IAllowAnonymousFilter)
-                {
-                    return true;
-                }
-            }
+namespace System;
 
-            // When doing endpoint routing, MVC does not add AllowAnonymousFilters for AllowAnonymousAttributes that
-            // were discovered on controllers and actions. To maintain compat with 2.x,
-            // we'll check for the presence of IAllowAnonymous in endpoint metadata.
-            var endpoint = context.HttpContext.GetEndpoint();
-            if (endpoint?.Metadata?.GetMetadata<IAllowAnonymous>() != null)
+public static class MvcExtensions
+{
+    /// <summary>
+    /// https://github.com/dotnet/aspnetcore/blob/v5.0.3/src/Mvc/Mvc.Core/src/Authorization/AuthorizeFilter.cs#L221
+    /// </summary>
+    /// <param name="context"></param>
+    /// <returns></returns>
+    public static bool HasAllowAnonymous(this FilterContext context)
+    {
+        var filters = context.Filters;
+        for (var i = 0; i < filters.Count; i++)
+        {
+            if (filters[i] is IAllowAnonymousFilter)
             {
                 return true;
             }
-
-            return false;
         }
+
+        // When doing endpoint routing, MVC does not add AllowAnonymousFilters for AllowAnonymousAttributes that
+        // were discovered on controllers and actions. To maintain compat with 2.x,
+        // we'll check for the presence of IAllowAnonymous in endpoint metadata.
+        var endpoint = context.HttpContext.GetEndpoint();
+        if (endpoint?.Metadata?.GetMetadata<IAllowAnonymous>() != null)
+        {
+            return true;
+        }
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Extensions/RequestExtension.cs b/src/Common.ServerLib/Extensions/RequestExtension.cs
index 46f6bd8f9..65aae64c4 100644
--- a/src/Common.ServerLib/Extensions/RequestExtension.cs
+++ b/src/Common.ServerLib/Extensions/RequestExtension.cs
@@ -2,37 +2,36 @@ using Microsoft.AspNetCore.Http;
 using System.Linq;
 
 // ReSharper disable once CheckNamespace
-namespace System
+namespace System;
+
+public static class RequestExtension
 {
-    public static class RequestExtension
+    static bool AcceptWebP_(this HttpRequest httpRequest)
     {
-        static bool AcceptWebP_(this HttpRequest httpRequest)
+        if (httpRequest.Headers.TryGetValue("Accept", out var accept))
         {
-            if (httpRequest.Headers.TryGetValue("Accept", out var accept))
-            {
-                return accept.ToArray().Any(x => x.IndexOf("image/webp", StringComparison.OrdinalIgnoreCase) != -1);
-            }
-            return false;
+            return accept.ToArray().Any(x => x.IndexOf("image/webp", StringComparison.OrdinalIgnoreCase) != -1);
         }
+        return false;
+    }
 
-        const string KEY_ACCEPT_WEBP = "KEY_ACCEPT_WEBP";
+    const string KEY_ACCEPT_WEBP = "KEY_ACCEPT_WEBP";
 
-        public static bool AcceptWebP(this HttpRequest httpRequest)
+    public static bool AcceptWebP(this HttpRequest httpRequest)
+    {
+        if (httpRequest.HttpContext.Items[KEY_ACCEPT_WEBP] is bool b) return b;
+        var result = httpRequest.AcceptWebP_();
+        httpRequest.HttpContext.Items[KEY_ACCEPT_WEBP] = result;
+        return result;
+    }
+
+    public static string ImgSrcToWebP(this HttpRequest httpRequest, string src, bool? acceptWebP = null)
+    {
+        acceptWebP ??= httpRequest.AcceptWebP();
+        if (acceptWebP.Value)
         {
-            if (httpRequest.HttpContext.Items[KEY_ACCEPT_WEBP] is bool b) return b;
-            var result = httpRequest.AcceptWebP_();
-            httpRequest.HttpContext.Items[KEY_ACCEPT_WEBP] = result;
-            return result;
-        }
-
-        public static string ImgSrcToWebP(this HttpRequest httpRequest, string src, bool? acceptWebP = null)
-        {
-            acceptWebP ??= httpRequest.AcceptWebP();
-            if (acceptWebP.Value)
-            {
-                return string.Concat(src.AsSpan(0, src.LastIndexOf(".", StringComparison.Ordinal)), ".webp");
-            }
-            return src;
+            return string.Concat(src.AsSpan(0, src.LastIndexOf(".", StringComparison.Ordinal)), ".webp");
         }
+        return src;
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Extensions/SystemWebExtensions.cs b/src/Common.ServerLib/Extensions/SystemWebExtensions.cs
index 4d1f95307..0cc7b31b9 100644
--- a/src/Common.ServerLib/Extensions/SystemWebExtensions.cs
+++ b/src/Common.ServerLib/Extensions/SystemWebExtensions.cs
@@ -4,81 +4,80 @@ using System.Net.Sockets;
 using System.Text;
 
 // ReSharper disable once CheckNamespace
-namespace System
+namespace System;
+
+/// <summary>
+/// 提供 ASP.NET 的兼容
+/// <para>https://docs.microsoft.com/zh-cn/dotnet/api/system.web.httprequest</para>
+/// </summary>
+public static class SystemWebExtensions
 {
     /// <summary>
-    /// 提供 ASP.NET 的兼容
-    /// <para>https://docs.microsoft.com/zh-cn/dotnet/api/system.web.httprequest</para>
+    /// 获取所提供的客户端浏览器的原始用户代理字符串。 请注意此字符串可能为 <see langword="null"/>
     /// </summary>
-    public static class SystemWebExtensions
+    /// <param name="request"></param>
+    /// <returns></returns>
+    public static string? UserAgent(this HttpRequest request)
     {
-        /// <summary>
-        /// 获取所提供的客户端浏览器的原始用户代理字符串。 请注意此字符串可能为 <see langword="null"/>
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public static string? UserAgent(this HttpRequest request)
-        {
-            return request.Headers.TryGetValue("User-Agent", out var value) ? value.ToString() : null;
-        }
+        return request.Headers.TryGetValue("User-Agent", out var value) ? value.ToString() : null;
+    }
 
-        /// <summary>
-        /// 获取当前请求的原始 URL
-        /// </summary>
-        /// <remarks>原始 URL 定义为后面包含域信息的 URL 部分。 在 URL 字符串 http://www.contoso.com/articles/recent.aspx中，原始 URL 为/articles/recent.aspx。 原始 URL 包括查询字符串（如果存在）</remarks>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public static string RawUrl(this HttpRequest request)
+    /// <summary>
+    /// 获取当前请求的原始 URL
+    /// </summary>
+    /// <remarks>原始 URL 定义为后面包含域信息的 URL 部分。 在 URL 字符串 http://www.contoso.com/articles/recent.aspx中，原始 URL 为/articles/recent.aspx。 原始 URL 包括查询字符串（如果存在）</remarks>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    public static string RawUrl(this HttpRequest request)
+    {
+        // 实现参考：https://github.com/dotnet/aspnetcore/blob/v3.1.5/src/Http/Http.Extensions/src/UriHelper.cs#L196
+        var pathBase = request.PathBase.Value ?? string.Empty;
+        var path = request.Path.Value ?? string.Empty;
+        var queryString = request.QueryString.Value ?? string.Empty;
+        var length = pathBase.Length + path.Length + queryString.Length;
+        return new StringBuilder(length)
+            .Append(pathBase)
+            .Append(path)
+            .Append(queryString)
+            .ToString();
+    }
+
+    public static string Action(this IUrlHelper helper, string action, QueryString values)
+    {
+        var url = helper.Action(action);
+        if (values.HasValue)
         {
-            // 实现参考：https://github.com/dotnet/aspnetcore/blob/v3.1.5/src/Http/Http.Extensions/src/UriHelper.cs#L196
-            var pathBase = request.PathBase.Value ?? string.Empty;
-            var path = request.Path.Value ?? string.Empty;
-            var queryString = request.QueryString.Value ?? string.Empty;
-            var length = pathBase.Length + path.Length + queryString.Length;
+            var length = url.Length + values.Value!.Length;
             return new StringBuilder(length)
-                .Append(pathBase)
-                .Append(path)
-                .Append(queryString)
-                .ToString();
+               .Append(url)
+               .Append(values.Value)
+               .ToString();
         }
-
-        public static string Action(this IUrlHelper helper, string action, QueryString values)
+        else
         {
-            var url = helper.Action(action);
-            if (values.HasValue)
-            {
-                var length = url.Length + values.Value!.Length;
-                return new StringBuilder(length)
-                   .Append(url)
-                   .Append(values.Value)
-                   .ToString();
-            }
-            else
-            {
-                return url;
-            }
+            return url;
         }
+    }
 
-        /// <summary>
-        /// 获取远程客户端的 IP 主机地址
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="ipv4"></param>
-        /// <returns></returns>
-        public static string UserHostAddress(this HttpRequest request, bool ipv4 = true)
+    /// <summary>
+    /// 获取远程客户端的 IP 主机地址
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="ipv4"></param>
+    /// <returns></returns>
+    public static string UserHostAddress(this HttpRequest request, bool ipv4 = true)
+    {
+        var remoteIpAddress = request.HttpContext.Connection.RemoteIpAddress;
+        if (remoteIpAddress == null) throw new ArgumentNullException(nameof(remoteIpAddress));
+        try
         {
-            var remoteIpAddress = request.HttpContext.Connection.RemoteIpAddress;
-            if (remoteIpAddress == null) throw new ArgumentNullException(nameof(remoteIpAddress));
-            try
-            {
-                return ipv4
-                    ? (remoteIpAddress.AddressFamily == AddressFamily.InterNetwork ? remoteIpAddress.ToString() : remoteIpAddress.MapToIPv4().ToString())
-                    : (remoteIpAddress.AddressFamily == AddressFamily.InterNetworkV6 ? remoteIpAddress.ToString() : remoteIpAddress.MapToIPv6().ToString());
-            }
-            catch
-            {
-                return remoteIpAddress.ToString();
-            }
+            return ipv4
+                ? (remoteIpAddress.AddressFamily == AddressFamily.InterNetwork ? remoteIpAddress.ToString() : remoteIpAddress.MapToIPv4().ToString())
+                : (remoteIpAddress.AddressFamily == AddressFamily.InterNetworkV6 ? remoteIpAddress.ToString() : remoteIpAddress.MapToIPv6().ToString());
+        }
+        catch
+        {
+            return remoteIpAddress.ToString();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/Security/RepositorySecureStorage.cs b/src/Common.ServerLib/Security/RepositorySecureStorage.cs
index 3e9de40de..58d9a01a5 100644
--- a/src/Common.ServerLib/Security/RepositorySecureStorage.cs
+++ b/src/Common.ServerLib/Security/RepositorySecureStorage.cs
@@ -3,77 +3,62 @@ using Microsoft.EntityFrameworkCore;
 using System.Application.Repositories;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Threading;
 using System.Threading.Tasks;
 using Z.EntityFramework.Plus;
 using KeyValuePair = System.Application.Entities.KeyValuePair;
 
-namespace System.Security
+namespace System.Security;
+
+/// <summary>
+/// 由 <see cref="Repository{TDbContext, TEntity, TPrimaryKey}"/> 实现的 <see cref="ISecureStorage"/>
+/// <para>无加密(明文)</para>
+/// </summary>
+/// <typeparam name="TDbContext"></typeparam>
+internal sealed class RepositorySecureStorage<TDbContext> : Repository<TDbContext, KeyValuePair, string>, ISecureStorage
+    where TDbContext : DbContext
 {
-    /// <summary>
-    /// 由 <see cref="Repository{TDbContext, TEntity, TPrimaryKey}"/> 实现的 <see cref="ISecureStorage"/>
-    /// <para>无加密(明文)</para>
-    /// </summary>
-    /// <typeparam name="TDbContext"></typeparam>
-    internal sealed class RepositorySecureStorage<TDbContext> : Repository<TDbContext, KeyValuePair, string>, ISecureStorage
-        where TDbContext : DbContext
+    public RepositorySecureStorage(TDbContext dbContext, IHttpContextAccessor accessor) : base(dbContext, accessor)
     {
-        readonly IHttpContextAccessor accessor;
+    }
 
-        public RepositorySecureStorage(TDbContext dbContext, IHttpContextAccessor accessor) : base(dbContext)
+    bool ISecureStorage.IsNativeSupportedBytes => false;
+
+    IQueryable<string> Get(string key)
+        => Entity.Where(x => !x.SoftDeleted && x.Id == key).Select(x => x.Value);
+
+    async Task<string?> ISecureStorage.GetAsync(string key)
+    {
+        var value = await Get(key).FirstOrDefaultAsync(RequestAborted);
+        return value;
+    }
+
+    IQueryable<KeyValuePair> GetSetQuery(string key)
+        => Entity.IgnoreQueryFilters().Where(x => x.Id == key);
+
+    static Expression<Func<KeyValuePair, KeyValuePair>> GetSetValueUpdateExpression(string value)
+           => x => new KeyValuePair { SoftDeleted = false, Value = value };
+
+    Task ISecureStorage.SetAsync(string key, string? value)
+    {
+        if (string.IsNullOrEmpty(value))
         {
-            this.accessor = accessor;
+            return DeleteAsync(key);
         }
-
-        CancellationToken CancellationToken
+        else
         {
-            get
-            {
-                var context = accessor.HttpContext;
-                if (context != null) return context.RequestAborted;
-                return default;
-            }
-        }
-
-        bool ISecureStorage.IsNativeSupportedBytes => false;
-
-        IQueryable<string> Get(string key)
-            => Entity.Where(x => !x.SoftDeleted && x.Id == key).Select(x => x.Value);
-
-        async Task<string?> ISecureStorage.GetAsync(string key)
-        {
-            var value = await Get(key).FirstOrDefaultAsync(CancellationToken);
-            return value;
-        }
-
-        IQueryable<KeyValuePair> GetSetQuery(string key)
-            => Entity.IgnoreQueryFilters().Where(x => x.Id == key);
-
-        static Expression<Func<KeyValuePair, KeyValuePair>> GetSetValueUpdateExpression(string value)
-               => x => new KeyValuePair { SoftDeleted = false, Value = value };
-
-        Task ISecureStorage.SetAsync(string key, string? value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                return DeleteAsync(key, CancellationToken);
-            }
-            else
-            {
-                return GetSetQuery(key).UpdateAsync(GetSetValueUpdateExpression(value), CancellationToken);
-            }
-        }
-
-        async Task<bool> ISecureStorage.RemoveAsync(string key)
-        {
-            var result = await DeleteAsync(key, CancellationToken);
-            return result > 0;
-        }
-
-        async Task<bool> ISecureStorage.ContainsKeyAsync(string key)
-        {
-            var result = await Get(key).AnyAsync(CancellationToken);
-            return result;
+            return GetSetQuery(key).UpdateAsync(GetSetValueUpdateExpression(value));
         }
     }
+
+    async Task<bool> ISecureStorage.RemoveAsync(string key)
+    {
+        var result = await DeleteAsync(key);
+        return result > 0;
+    }
+
+    async Task<bool> ISecureStorage.ContainsKeyAsync(string key)
+    {
+        var result = await Get(key).AnyAsync(RequestAborted);
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/src/Common.ServerLib/ServiceCollectionExtensions.cs b/src/Common.ServerLib/ServiceCollectionExtensions.cs
index f593c73e8..7f25c7176 100644
--- a/src/Common.ServerLib/ServiceCollectionExtensions.cs
+++ b/src/Common.ServerLib/ServiceCollectionExtensions.cs
@@ -8,102 +8,101 @@ using System.Application.Models;
 using System.Security;
 
 // ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// 添加由 Repository 实现的 <see cref="ISecureStorage"/>
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection TryAddSecureStorage<TDbContext>(this IServiceCollection services) where TDbContext : DbContext
     {
-        /// <summary>
-        /// 添加由 Repository 实现的 <see cref="ISecureStorage"/>
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection TryAddSecureStorage<TDbContext>(this IServiceCollection services) where TDbContext : DbContext
-        {
-            services.TryAddScoped<ISecureStorage, RepositorySecureStorage<TDbContext>>();
-            return services;
-        }
+        services.TryAddScoped<ISecureStorage, RepositorySecureStorage<TDbContext>>();
+        return services;
+    }
 
-        /// <summary>
-        /// 隐藏服务响应头
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection HideServerHeader(this IServiceCollection services)
+    /// <summary>
+    /// 隐藏服务响应头
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection HideServerHeader(this IServiceCollection services)
+    {
+        services.Configure<KestrelServerOptions>(options =>
         {
-            services.Configure<KestrelServerOptions>(options =>
+            options.AddServerHeader = false;
+        });
+        return services;
+    }
+
+    const string MigrationsHistory = "__EFMigrationsHistory";
+
+    /// <summary>
+    /// 添加数据库上下文，并配置使用 SqlServer
+    /// </summary>
+    /// <typeparam name="TContext"></typeparam>
+    /// <typeparam name="TAppSettings"></typeparam>
+    /// <param name="services"></param>
+    /// <param name="appSettings"></param>
+    /// <param name="connectionString"></param>
+    /// <param name="migrationsHistoryTableNameSuffix"></param>
+    /// <returns></returns>
+    public static TAppSettings AddDbContextWithAppSettings<TContext, TAppSettings>(
+        this IServiceCollection services,
+        TAppSettings appSettings,
+        string connectionString,
+        string? migrationsHistoryTableNameSuffix = null)
+        where TContext : DbContext
+        where TAppSettings : class, IDatabaseSettings
+    {
+        var tablePrefix = appSettings.TablePrefix;
+        if (!string.IsNullOrWhiteSpace(connectionString))
+        {
+            var hasTablePrefix = !string.IsNullOrEmpty(tablePrefix);
+            var hasSuffix = !string.IsNullOrEmpty(migrationsHistoryTableNameSuffix);
+            void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder b)
             {
-                options.AddServerHeader = false;
-            });
-            return services;
-        }
-
-        const string MigrationsHistory = "__EFMigrationsHistory";
-
-        /// <summary>
-        /// 添加数据库上下文，并配置使用 SqlServer
-        /// </summary>
-        /// <typeparam name="TContext"></typeparam>
-        /// <typeparam name="TAppSettings"></typeparam>
-        /// <param name="services"></param>
-        /// <param name="appSettings"></param>
-        /// <param name="connectionString"></param>
-        /// <param name="migrationsHistoryTableNameSuffix"></param>
-        /// <returns></returns>
-        public static TAppSettings AddDbContextWithAppSettings<TContext, TAppSettings>(
-            this IServiceCollection services,
-            TAppSettings appSettings,
-            string connectionString,
-            string? migrationsHistoryTableNameSuffix = null)
-            where TContext : DbContext
-            where TAppSettings : class, IDatabaseSettings
-        {
-            var tablePrefix = appSettings.TablePrefix;
-            if (!string.IsNullOrWhiteSpace(connectionString))
-            {
-                var hasTablePrefix = !string.IsNullOrEmpty(tablePrefix);
-                var hasSuffix = !string.IsNullOrEmpty(migrationsHistoryTableNameSuffix);
-                void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder b)
+                var tableName = MigrationsHistory;
+                if (hasTablePrefix)
                 {
-                    var tableName = MigrationsHistory;
-                    if (hasTablePrefix)
-                    {
-                        tableName = tablePrefix + tableName;
-                    }
-                    if (hasSuffix)
-                    {
-                        tableName = tableName + "_" + migrationsHistoryTableNameSuffix;
-                    }
-                    b.MigrationsHistoryTable(tableName);
+                    tableName = tablePrefix + tableName;
                 }
-                Action<SqlServerDbContextOptionsBuilder>? sqlServerOptionsAction
-                    = (hasTablePrefix || hasSuffix) ? SqlServerOptionsAction : null;
-                services.AddDbContext<TContext>(options
-                    => options.UseSqlServer(connectionString, sqlServerOptionsAction));
+                if (hasSuffix)
+                {
+                    tableName = tableName + "_" + migrationsHistoryTableNameSuffix;
+                }
+                b.MigrationsHistoryTable(tableName);
             }
-            return appSettings;
+            Action<SqlServerDbContextOptionsBuilder>? sqlServerOptionsAction
+                = (hasTablePrefix || hasSuffix) ? SqlServerOptionsAction : null;
+            services.AddDbContext<TContext>(options
+                => options.UseSqlServer(connectionString, sqlServerOptionsAction));
         }
+        return appSettings;
+    }
 
-        /// <summary>
-        /// 添加数据库上下文，并配置使用 SqlServer
-        /// </summary>
-        /// <typeparam name="TContext"></typeparam>
-        /// <param name="services"></param>
-        /// <param name="configuration"></param>
-        /// <param name="cfgName"></param>
-        /// <returns></returns>
-        public static TAppSettings AddDbContextWithAppSettings<TContext, TAppSettings>(
-            this IServiceCollection services,
-            IConfiguration configuration,
-            string cfgName = "DefaultConnection",
-            string? migrationsHistoryTableNameSuffix = null)
-            where TContext : DbContext
-            where TAppSettings : class, IDatabaseSettings
-        {
-            var appSettings_ = configuration.GetSection("AppSettings");
-            services.Configure<TAppSettings>(appSettings_);
-            var appSettings = appSettings_.Get<TAppSettings>();
-            var connectionString = configuration.GetConnectionString(cfgName);
-            return services.AddDbContextWithAppSettings<TContext, TAppSettings>(appSettings, connectionString, migrationsHistoryTableNameSuffix);
-        }
+    /// <summary>
+    /// 添加数据库上下文，并配置使用 SqlServer
+    /// </summary>
+    /// <typeparam name="TContext"></typeparam>
+    /// <param name="services"></param>
+    /// <param name="configuration"></param>
+    /// <param name="cfgName"></param>
+    /// <returns></returns>
+    public static TAppSettings AddDbContextWithAppSettings<TContext, TAppSettings>(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        string cfgName = "DefaultConnection",
+        string? migrationsHistoryTableNameSuffix = null)
+        where TContext : DbContext
+        where TAppSettings : class, IDatabaseSettings
+    {
+        var appSettings_ = configuration.GetSection("AppSettings");
+        services.Configure<TAppSettings>(appSettings_);
+        var appSettings = appSettings_.Get<TAppSettings>();
+        var connectionString = configuration.GetConnectionString(cfgName);
+        return services.AddDbContextWithAppSettings<TContext, TAppSettings>(appSettings, connectionString, migrationsHistoryTableNameSuffix);
     }
 }
\ No newline at end of file
diff --git a/src/Repositories.EFCore/Application/Repositories/IEFRepository.cs b/src/Repositories.EFCore/Application/Repositories/IEFRepository.cs
index 26e52f656..b2c2471f8 100644
--- a/src/Repositories.EFCore/Application/Repositories/IEFRepository.cs
+++ b/src/Repositories.EFCore/Application/Repositories/IEFRepository.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -22,5 +22,7 @@ namespace System.Application.Repositories
     public interface IEFRepository<TEntity> : IEFRepository where TEntity : class
     {
         DbSet<TEntity> Entity { get; }
+
+        protected CancellationToken RequestAborted { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Repositories.EFCore/Application/Repositories/Repository.cs b/src/Repositories.EFCore/Application/Repositories/Repository.cs
index 370ce44a9..c6c5fdbb3 100644
--- a/src/Repositories.EFCore/Application/Repositories/Repository.cs
+++ b/src/Repositories.EFCore/Application/Repositories/Repository.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using System.Application.Columns;
@@ -40,21 +41,27 @@ namespace System.Application.Repositories
 
         readonly Lazy<string> mTableName;
         readonly Lazy<IEntityType> mEntityType;
+        readonly IHttpContextAccessor mHttpContextAccessor;
 
         public string TableName => mTableName.Value;
 
         public IEntityType EntityType => mEntityType.Value;
 
         static readonly Type entityType = typeof(TEntity);
-        static readonly Lazy<bool> mIsSoftDeleted = new Lazy<bool>(() => ModelBuilderExtensions.IsSoftDeleted(entityType));
+        static readonly Lazy<bool> mIsSoftDeleted = new(() => ModelBuilderExtensions.IsSoftDeleted(entityType));
 
         public static bool IsSoftDeleted => mIsSoftDeleted.Value;
 
-        public Repository(TDbContext dbContext) : base(dbContext)
+        protected CancellationToken RequestAborted => mHttpContextAccessor.HttpContext?.RequestAborted ?? default;
+
+        CancellationToken IEFRepository<TEntity>.RequestAborted => RequestAborted;
+
+        public Repository(TDbContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext)
         {
             Entity = dbContext.Set<TEntity>();
             mEntityType = new Lazy<IEntityType>(() => dbContext.Model.FindEntityType(entityType).ThrowIsNull(nameof(entityType)));
             mTableName = new Lazy<string>(() => EFCoreUtils.GetTableNameByClrType(dbContext.Database, EntityType));
+            mHttpContextAccessor = httpContextAccessor;
         }
 
         #region 增(Insert Funs) 立即执行并返回受影响的行数
@@ -169,7 +176,7 @@ namespace System.Application.Repositories
 
         readonly Lazy<bool> mIsAutoGeneratedKey;
 
-        public Repository(TDbContext dbContext) : base(dbContext)
+        public Repository(TDbContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
         {
             mIsAutoGeneratedKey = new Lazy<bool>(() =>
             {
@@ -182,6 +189,8 @@ namespace System.Application.Repositories
             });
         }
 
+
+
         #region 删(Delete Funs) 立即执行并返回受影响的行数
 
         public virtual Task<int> DeleteAsync(TPrimaryKey primaryKey) => DeleteAsync(primaryKey, default);
diff --git a/src/Repositories.EFCore/Repositories.EFCore.csproj b/src/Repositories.EFCore/Repositories.EFCore.csproj
index c8f7457b6..cc8e70cad 100644
--- a/src/Repositories.EFCore/Repositories.EFCore.csproj
+++ b/src/Repositories.EFCore/Repositories.EFCore.csproj
@@ -30,4 +30,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" />
   </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ST.Client/DeviceIdHelper.shared.cs b/src/ST.Client/DeviceIdHelper.shared.cs
index 957447608..be8fba99d 100644
--- a/src/ST.Client/DeviceIdHelper.shared.cs
+++ b/src/ST.Client/DeviceIdHelper.shared.cs
@@ -1,16 +1,17 @@
-using System.Collections.Generic;
+#pragma warning disable IDE0079
+#pragma warning disable IDE0005
 using System.Security.Cryptography;
-using System.Text;
+#pragma warning restore IDE0005
+#pragma warning restore IDE0079
 
-namespace System.Application
+namespace System.Application;
+
+/// <summary>
+/// 用于匿名统计的设备 Id 生成助手类
+/// </summary>
+static partial class DeviceIdHelper
 {
-    /// <summary>
-    /// 用于匿名统计的设备 Id 生成助手类
-    /// </summary>
-    static partial class DeviceIdHelper
-    {
-        const int DeviceIdRLength = 7;
+    const int DeviceIdRLength = 7;
 
-        public const int MaxLength = ShortGuid.StringLength + DeviceIdRLength + Hashs.String.Lengths.SHA256;
-    }
+    public const int MaxLength = ShortGuid.StringLength + DeviceIdRLength + Hashs.String.Lengths.SHA256;
 }
diff --git a/src/ST.Services.CloudService.Models/Models/ApiResponse.cs b/src/ST.Services.CloudService.Models/Models/ApiResponse.cs
index 35965aa6d..999db1359 100644
--- a/src/ST.Services.CloudService.Models/Models/ApiResponse.cs
+++ b/src/ST.Services.CloudService.Models/Models/ApiResponse.cs
@@ -15,8 +15,8 @@ namespace System.Application.Models
 
         static Type GetDeserializeType<T>()
         {
-            if (typeof(T) == typeof(object)) return typeof(ApiResponseImpl);
-            return typeof(ApiResponseImpl<T>);
+            if (typeof(T) == typeof(object)) return typeof(ApiRsp);
+            return typeof(ApiRsp<T>);
         }
 
         public static IApiResponse<T> Deserialize<T>(
@@ -114,7 +114,7 @@ namespace System.Application.Models
             var message = response.InternalMessage;
             if (string.IsNullOrWhiteSpace(message))
             {
-                if (response.Code == ApiResponseCode.ClientException && response is ApiResponseImpl impl && impl.ClientException != null)
+                if (response.Code == ApiResponseCode.ClientException && response is ApiRsp impl && impl.ClientException != null)
                 {
                     var exMsg = impl.ClientException.GetAllMessage();
                     if (string.IsNullOrWhiteSpace(errorAppendText)) errorAppendText = exMsg;
@@ -125,22 +125,22 @@ namespace System.Application.Models
             return message;
         }
 
-        public static IApiResponse Code(ApiResponseCode code, string? message = null, Exception? exception = null) => new ApiResponseImpl
+        public static ApiRsp Code(ApiResponseCode code, string? message = null, Exception? exception = null) => new()
         {
             Code = code,
             InternalMessage = message,
             ClientException = exception,
         };
 
-        static readonly Lazy<IApiResponse> okRsp = new(() => Code(ApiResponseCode.OK));
+        static readonly Lazy<ApiRsp> okRsp = new(() => Code(ApiResponseCode.OK));
 
-        public static IApiResponse Ok() => okRsp.Value;
+        public static ApiRsp Ok() => okRsp.Value;
 
-        public static IApiResponse<T> Code<T>(
+        public static ApiRsp<T> Code<T>(
             ApiResponseCode code,
             string? message,
             T? content,
-            Exception? exception = null) => new ApiResponseImpl<T>
+            Exception? exception = null) => new()
             {
                 Code = code,
                 InternalMessage = message,
@@ -148,23 +148,23 @@ namespace System.Application.Models
                 ClientException = exception,
             };
 
-        public static IApiResponse<T> Code<T>(
+        public static ApiRsp<T> Code<T>(
             ApiResponseCode code,
             string? message = null) => Code<T>(code, message, default);
 
-        public static IApiResponse<T> Ok<T>(T? content = default)
+        public static ApiRsp<T> Ok<T>(T? content = default)
             => Code(ApiResponseCode.OK, null, content);
 
-        public static IApiResponse<T> Fail<T>(string? message = null)
+        public static ApiRsp<T> Fail<T>(string? message = null)
             => Code<T>(ApiResponseCode.Fail, message);
 
-        public static IApiResponse Fail(string? message = null)
+        public static ApiRsp Fail(string? message = null)
             => Code(ApiResponseCode.Fail, message);
 
-        public static IApiResponse Exception(Exception exception)
+        public static ApiRsp Exception(Exception exception)
             => Code(ApiResponseCode.ClientException, null, exception);
 
-        public static IApiResponse<T> Exception<T>(Exception exception)
+        public static ApiRsp<T> Exception<T>(Exception exception)
             => Code<T>(ApiResponseCode.ClientException, null, default, exception);
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs b/src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs
index 8e07a1ddf..aad0a62df 100644
--- a/src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs
+++ b/src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs
@@ -1,3 +1,5 @@
+using System.Application.Models.Internals;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using MPKey = MessagePack.KeyAttribute;
@@ -9,7 +11,7 @@ using SJsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace System.Application.Models.Internals
 {
-    public abstract class ApiResponseImplBase : IApiResponse
+    public abstract class ApiResponseImpl : IApiResponse
     {
         ApiResponseCode mCode;
         bool mIsSuccess;
@@ -63,33 +65,27 @@ namespace System.Application.Models.Internals
         [NJSONIgnore]
         public string? Url { get; set; }
     }
+}
 
+namespace System.Application.Models
+{
     [MPObject]
-    public sealed class ApiResponseImpl<T> : ApiResponseImplBase, IApiResponse<T>
+    public sealed class ApiRsp<T> : ApiResponseImpl, IApiResponse<T>
     {
         [MPKey(LastMKeyIndex + 1)]
         [NJsonProperty("🦓")]
         [SJsonProperty("🦓")]
         public T? Content { get; set; }
 
-        public static implicit operator ApiResponseImpl<T>(T content)
-        {
-            return (ApiResponseImpl<T>)ApiResponse.Ok(content);
-        }
+        public static implicit operator ApiRsp<T>(T content) => ApiResponse.Ok(content);
 
-        public static implicit operator ApiResponseImpl<T>(ApiResponseCode code)
-        {
-            return (ApiResponseImpl<T>)ApiResponse.Code<T>(code);
-        }
+        public static implicit operator ApiRsp<T>(ApiResponseCode code) => ApiResponse.Code<T>(code);
 
-        public static implicit operator ApiResponseImpl<T>((ApiResponseCode code, string? message) args)
-        {
-            return (ApiResponseImpl<T>)ApiResponse.Code<T>(args.code, args.message);
-        }
+        public static implicit operator ApiRsp<T>((ApiResponseCode code, string? message) args) => ApiResponse.Code<T>(args.code, args.message);
     }
 
     [MPObject]
-    public sealed class ApiResponseImpl : ApiResponseImplBase, IApiResponse<object>
+    public sealed class ApiRsp : ApiResponseImpl, IApiResponse<object>
     {
         [IgnoreDataMember]
         [MPIgnore]
@@ -97,14 +93,8 @@ namespace System.Application.Models.Internals
         [NJSONIgnore]
         public object? Content => null;
 
-        public static implicit operator ApiResponseImpl(ApiResponseCode code)
-        {
-            return (ApiResponseImpl)ApiResponse.Code(code);
-        }
+        public static implicit operator ApiRsp(ApiResponseCode code) => ApiResponse.Code(code);
 
-        public static implicit operator ApiResponseImpl((ApiResponseCode code, string? message) args)
-        {
-            return (ApiResponseImpl)ApiResponse.Code(args.code, args.message);
-        }
+        public static implicit operator ApiRsp((ApiResponseCode code, string? message) args) => ApiResponse.Code(args.code, args.message);
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj
index a36d6d5c7..32e4f1d3f 100644
--- a/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj
+++ b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
     <AssemblyName>System.Application.SteamTools.Services.CloudService.Models</AssemblyName>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Services.CloudService.ViewModels/ST.Services.CloudService.ViewModels.csproj b/src/ST.Services.CloudService.ViewModels/ST.Services.CloudService.ViewModels.csproj
index 7a958025b..0e871b7c9 100644
--- a/src/ST.Services.CloudService.ViewModels/ST.Services.CloudService.ViewModels.csproj
+++ b/src/ST.Services.CloudService.ViewModels/ST.Services.CloudService.ViewModels.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>System.Application</RootNamespace>
     <AssemblyName>System.Application.SteamTools.Services.CloudService.Models</AssemblyName>
     <DefineConstants>MVVM_VM;$(DefineConstants)</DefineConstants>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs
index b65a40509..237cb18c0 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs
@@ -1,41 +1,34 @@
-#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
 using MessagePack;
-using System.Diagnostics.CodeAnalysis;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
-using NotNullAttribute = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+/// <inheritdoc cref="IGAPAuthenticatorDTO"/>
+[MessagePackObject(keyAsPropertyName: true)]
+public sealed partial class GAPAuthenticatorDTO : IGAPAuthenticatorDTO, IExplicitHasValue
 {
-    /// <inheritdoc cref="IGAPAuthenticatorDTO"/>
-    [MessagePackObject(keyAsPropertyName: true)]
-    public sealed partial class GAPAuthenticatorDTO : IGAPAuthenticatorDTO, IExplicitHasValue
+    [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+    public ushort Id { get; set; }
+
+    public int Index { get; set; }
+
+    public string Name { get; set; } = string.Empty;
+
+    [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+    public GamePlatform Platform => Value == null ? default : Value.Platform;
+
+    public Guid? ServerId { get; set; }
+
+    public DateTimeOffset Created { get; set; }
+
+    public DateTimeOffset LastUpdate { get; set; }
+
+    public IGAPAuthenticatorValueDTO? Value { get; set; }
+
+    bool IExplicitHasValue.ExplicitHasValue()
     {
-        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-        public ushort Id { get; set; }
-
-        public int Index { get; set; }
-
-        [NotNull, DisallowNull] // C# 8 not null
-        public string? Name { get; set; }
-
-        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-        public GamePlatform Platform => Value.Platform;
-
-        public Guid? ServerId { get; set; }
-
-        public DateTimeOffset Created { get; set; }
-
-        public DateTimeOffset LastUpdate { get; set; }
-
-        [NotNull, DisallowNull] // C# 8 not null
-        public IGAPAuthenticatorValueDTO? Value { get; set; }
-
-        bool IExplicitHasValue.ExplicitHasValue()
-        {
-            return !string.IsNullOrEmpty(Name) && Value != null;
-        }
+        return !string.IsNullOrEmpty(Name) && Value != null;
     }
-}
-#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs
index 1c9a10a13..e71817fde 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs
@@ -1,24 +1,21 @@
-using System.Application.Columns;
+namespace System.Application.Models;
 
-namespace System.Application.Models
+/// <summary>
+/// 游戏平台令牌可传输模型
+/// </summary>
+public interface IGAPAuthenticatorDTO : IOrderGAPAuthenticator
 {
-    /// <summary>
-    /// 游戏平台令牌可传输模型
-    /// </summary>
-    public interface IGAPAuthenticatorDTO : IOrderGAPAuthenticator
-    {
-        const int MaxLength_Name = 32;
+    const int MaxLength_Name = 32;
 
-        string Name { get; set; }
+    string Name { get; set; }
 
-        GamePlatform Platform { get; }
+    GamePlatform Platform { get; }
 
-        Guid? ServerId { get; set; }
+    Guid? ServerId { get; set; }
 
-        public DateTimeOffset Created { get; set; }
+    public DateTimeOffset Created { get; set; }
 
-        public DateTimeOffset LastUpdate { get; set; }
+    public DateTimeOffset LastUpdate { get; set; }
 
-        IGAPAuthenticatorValueDTO Value { get; set; }
-    }
+    IGAPAuthenticatorValueDTO? Value { get; set; }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs
index 929790448..4d9010a29 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs
@@ -2,70 +2,69 @@ using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+/// <summary>
+/// Class that implements base RFC 4226 an RFC 6238 authenticator
+/// </summary>
+public abstract partial class GAPAuthenticatorValueDTO : IGAPAuthenticatorValueDTO, IExplicitHasValue
 {
     /// <summary>
-    /// Class that implements base RFC 4226 an RFC 6238 authenticator
+    /// HMAC hashing algorithm types
     /// </summary>
-    public abstract partial class GAPAuthenticatorValueDTO : IGAPAuthenticatorValueDTO, IExplicitHasValue
+    public enum HMACTypes
     {
-        /// <summary>
-        /// HMAC hashing algorithm types
-        /// </summary>
-        public enum HMACTypes
-        {
-            SHA1 = 0,
-            SHA256 = 1,
-            SHA512 = 2
-        }
-
-        public GAPAuthenticatorValueDTO()
-        {
-        }
-
-        /// <summary>
-        /// Default number of digits in code
-        /// </summary>
-        public const int DEFAULT_CODE_DIGITS = 6;
-
-        /// <summary>
-        /// Default period of 30s
-        /// </summary>
-        public const int DEFAULT_PERIOD = 30;
-
-        /// <summary>
-        /// Create a new Authenticator object
-        /// </summary>
-        public GAPAuthenticatorValueDTO(int codeDigits = DEFAULT_CODE_DIGITS, HMACTypes hmacType = HMACTypes.SHA1, int period = DEFAULT_PERIOD) : this()
-        {
-            CodeDigits = codeDigits;
-            HMACType = hmacType;
-            Period = period;
-        }
-
-        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-        public abstract GamePlatform Platform { get; }
-
-        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-        public virtual string? Issuer { get; set; }
-
-        public long ServerTimeDiff { get; set; }
-
-        public long LastServerTime { get; set; }
-
-        public byte[]? SecretKey { get; set; }
-
-        public int CodeDigits { get; set; }
-
-        public HMACTypes HMACType { get; set; }
-
-        public int Period { get; set; }
-
-        protected virtual bool ExplicitHasValue()
-        {
-            return SecretKey != null && CodeDigits > 0 && HMACType.IsDefined() && Period > 0;
-        }
-
-        bool IExplicitHasValue.ExplicitHasValue() => ExplicitHasValue();
+        SHA1 = 0,
+        SHA256 = 1,
+        SHA512 = 2
     }
+
+    public GAPAuthenticatorValueDTO()
+    {
+    }
+
+    /// <summary>
+    /// Default number of digits in code
+    /// </summary>
+    public const int DEFAULT_CODE_DIGITS = 6;
+
+    /// <summary>
+    /// Default period of 30s
+    /// </summary>
+    public const int DEFAULT_PERIOD = 30;
+
+    /// <summary>
+    /// Create a new Authenticator object
+    /// </summary>
+    public GAPAuthenticatorValueDTO(int codeDigits = DEFAULT_CODE_DIGITS, HMACTypes hmacType = HMACTypes.SHA1, int period = DEFAULT_PERIOD) : this()
+    {
+        CodeDigits = codeDigits;
+        HMACType = hmacType;
+        Period = period;
+    }
+
+    [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+    public abstract GamePlatform Platform { get; }
+
+    [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+    public virtual string? Issuer { get; set; }
+
+    public long ServerTimeDiff { get; set; }
+
+    public long LastServerTime { get; set; }
+
+    public byte[]? SecretKey { get; set; }
+
+    public int CodeDigits { get; set; }
+
+    public HMACTypes HMACType { get; set; }
+
+    public int Period { get; set; }
+
+    protected virtual bool ExplicitHasValue()
+    {
+        return SecretKey != null && CodeDigits > 0 && HMACType.IsDefined() && Period > 0;
+    }
+
+    bool IExplicitHasValue.ExplicitHasValue() => ExplicitHasValue();
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs
index f54b79f5e..1c51fc8b5 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs
@@ -1,44 +1,43 @@
-using static System.Application.Models.GAPAuthenticatorValueDTO;
+using static System.Application.Models.GAPAuthenticatorValueDTO;
 using MPUnion = MessagePack.UnionAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+[MPUnion((int)GamePlatform.BattleNet, typeof(BattleNetAuthenticator))]
+[MPUnion((int)GamePlatform.Google, typeof(GoogleAuthenticator))]
+[MPUnion((int)GamePlatform.MicrosoftStore, typeof(MicrosoftAuthenticator))]
+[MPUnion((int)GamePlatform.Steam, typeof(SteamAuthenticator))]
+public partial interface IGAPAuthenticatorValueDTO : IExplicitHasValue
 {
-    [MPUnion((int)GamePlatform.BattleNet, typeof(BattleNetAuthenticator))]
-    [MPUnion((int)GamePlatform.Google, typeof(GoogleAuthenticator))]
-    [MPUnion((int)GamePlatform.MicrosoftStore, typeof(MicrosoftAuthenticator))]
-    [MPUnion((int)GamePlatform.Steam, typeof(SteamAuthenticator))]
-    public partial interface IGAPAuthenticatorValueDTO : IExplicitHasValue
-    {
-        GamePlatform Platform { get; }
+    GamePlatform Platform { get; }
 
-        /// <summary>
-        /// 本地机器和服务器的时间差（毫秒）
-        /// </summary>
-        long ServerTimeDiff { get; set; }
+    /// <summary>
+    /// 本地机器和服务器的时间差（毫秒）
+    /// </summary>
+    long ServerTimeDiff { get; set; }
 
-        /// <summary>
-        /// 上次同步时间
-        /// </summary>
-        long LastServerTime { get; set; }
+    /// <summary>
+    /// 上次同步时间
+    /// </summary>
+    long LastServerTime { get; set; }
 
-        /// <summary>
-        /// 用于身份验证器的密钥
-        /// </summary>
-        byte[]? SecretKey { get; set; }
+    /// <summary>
+    /// 用于身份验证器的密钥
+    /// </summary>
+    byte[]? SecretKey { get; set; }
 
-        /// <summary>
-        /// 代码中返回的位数（默认为6）
-        /// </summary>
-        int CodeDigits { get; set; }
+    /// <summary>
+    /// 代码中返回的位数（默认为6）
+    /// </summary>
+    int CodeDigits { get; set; }
 
-        /// <summary>
-        /// 用于OTP生成的哈希算法（默认为SHA1）
-        /// </summary>
-        HMACTypes HMACType { get; set; }
+    /// <summary>
+    /// 用于OTP生成的哈希算法（默认为SHA1）
+    /// </summary>
+    HMACTypes HMACType { get; set; }
 
-        /// <summary>
-        /// 下一个代码的周期（秒）
-        /// </summary>
-        int Period { get; set; }
-    }
+    /// <summary>
+    /// 下一个代码的周期（秒）
+    /// </summary>
+    int Period { get; set; }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs
index 65ecd5586..2b015c081 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs
@@ -1,45 +1,44 @@
-using MessagePack;
+using MessagePack;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+partial class GAPAuthenticatorValueDTO
 {
-    partial class GAPAuthenticatorValueDTO
+    [MessagePackObject(keyAsPropertyName: true)]
+    public partial class BattleNetAuthenticator : GAPAuthenticatorValueDTO
     {
-        [MessagePackObject(keyAsPropertyName: true)]
-        public partial class BattleNetAuthenticator : GAPAuthenticatorValueDTO
+        /// <summary>
+        /// Number of digits in code
+        /// </summary>
+        const int CODE_DIGITS = 8;
+
+        const string BATTLENET_ISSUER = "BattleNet";
+
+        /// <summary>
+        /// Create a new Authenticator object
+        /// </summary>
+        [SerializationConstructor]
+        public BattleNetAuthenticator() : base(CODE_DIGITS)
         {
-            /// <summary>
-            /// Number of digits in code
-            /// </summary>
-            const int CODE_DIGITS = 8;
+            Issuer = BATTLENET_ISSUER;
+        }
 
-            const string BATTLENET_ISSUER = "BattleNet";
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public override GamePlatform Platform => GamePlatform.BattleNet;
 
-            /// <summary>
-            /// Create a new Authenticator object
-            /// </summary>
-            [SerializationConstructor]
-            public BattleNetAuthenticator() : base(CODE_DIGITS)
-            {
-                Issuer = BATTLENET_ISSUER;
-            }
+        public string? Serial { get; set; }
 
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public override GamePlatform Platform => GamePlatform.BattleNet;
+        /// <summary>
+        /// We can check if the restore code is valid and rememeber so don't have to do it again
+        /// </summary>
+        public bool RestoreCodeVerified { get; set; }
 
-            public string? Serial { get; set; }
-
-            /// <summary>
-            /// We can check if the restore code is valid and rememeber so don't have to do it again
-            /// </summary>
-            public bool RestoreCodeVerified { get; set; }
-
-            protected override bool ExplicitHasValue()
-            {
-                return base.ExplicitHasValue() && Serial != null;
-            }
+        protected override bool ExplicitHasValue()
+        {
+            return base.ExplicitHasValue() && Serial != null;
         }
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs
index 4e4c41370..e08be2654 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs
@@ -1,30 +1,29 @@
-using MessagePack;
+using MessagePack;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+partial class GAPAuthenticatorValueDTO
 {
-    partial class GAPAuthenticatorValueDTO
+    [MessagePackObject(keyAsPropertyName: true)]
+    public partial class GoogleAuthenticator : GAPAuthenticatorValueDTO
     {
-        [MessagePackObject(keyAsPropertyName: true)]
-        public partial class GoogleAuthenticator : GAPAuthenticatorValueDTO
+        /// <summary>
+        /// Number of digits in code
+        /// </summary>
+        const int CODE_DIGITS = 6;
+
+        /// <summary>
+        /// Create a new Authenticator object
+        /// </summary>
+        [SerializationConstructor]
+        public GoogleAuthenticator() : base(CODE_DIGITS)
         {
-            /// <summary>
-            /// Number of digits in code
-            /// </summary>
-            const int CODE_DIGITS = 6;
-
-            /// <summary>
-            /// Create a new Authenticator object
-            /// </summary>
-            [SerializationConstructor]
-            public GoogleAuthenticator() : base(CODE_DIGITS)
-            {
-            }
-
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public override GamePlatform Platform => GamePlatform.Google;
         }
+
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public override GamePlatform Platform => GamePlatform.Google;
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs
index 0f0ba5f0d..ad4dcbcab 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs
@@ -1,30 +1,29 @@
-using MessagePack;
+using MessagePack;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+partial class GAPAuthenticatorValueDTO
 {
-    partial class GAPAuthenticatorValueDTO
+    [MessagePackObject(keyAsPropertyName: true)]
+    public partial class HOTPAuthenticator : GAPAuthenticatorValueDTO
     {
-        [MessagePackObject(keyAsPropertyName: true)]
-        public partial class HOTPAuthenticator : GAPAuthenticatorValueDTO
+        /// <summary>
+        /// Create a new Authenticator object optionally with a specified number of digits
+        /// </summary>
+        [SerializationConstructor]
+        public HOTPAuthenticator() : base(DEFAULT_CODE_DIGITS)
         {
-            /// <summary>
-            /// Create a new Authenticator object optionally with a specified number of digits
-            /// </summary>
-            [SerializationConstructor]
-            public HOTPAuthenticator() : base(DEFAULT_CODE_DIGITS)
-            {
-            }
-
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public override GamePlatform Platform => default;
-
-            /// <summary>
-            /// Counter for authenticator input
-            /// </summary>
-            public long Counter { get; set; }
         }
+
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public override GamePlatform Platform => default;
+
+        /// <summary>
+        /// Counter for authenticator input
+        /// </summary>
+        public long Counter { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs
index f6daf4e43..1f52643fd 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs
@@ -1,22 +1,21 @@
-using MessagePack;
+using MessagePack;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
-{
-    partial class GAPAuthenticatorValueDTO
-    {
-        [MessagePackObject(keyAsPropertyName: true)]
-        public partial class MicrosoftAuthenticator : GoogleAuthenticator
-        {
-            [SerializationConstructor]
-            public MicrosoftAuthenticator() : base()
-            {
-            }
+namespace System.Application.Models;
 
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public override GamePlatform Platform => GamePlatform.MicrosoftStore;
+partial class GAPAuthenticatorValueDTO
+{
+    [MessagePackObject(keyAsPropertyName: true)]
+    public partial class MicrosoftAuthenticator : GoogleAuthenticator
+    {
+        [SerializationConstructor]
+        public MicrosoftAuthenticator() : base()
+        {
         }
+
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public override GamePlatform Platform => GamePlatform.MicrosoftStore;
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs
index 18f013e17..976e51a4d 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs
@@ -1,80 +1,79 @@
-using MessagePack;
+using MessagePack;
 using Newtonsoft.Json.Linq;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using N_JsonIgnore = Newtonsoft.Json.JsonIgnoreAttribute;
 using S_JsonIgnore = System.Text.Json.Serialization.JsonIgnoreAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+partial class GAPAuthenticatorValueDTO
 {
-    partial class GAPAuthenticatorValueDTO
+    [MessagePackObject(keyAsPropertyName: true)]
+    public partial class SteamAuthenticator : GAPAuthenticatorValueDTO
     {
-        [MessagePackObject(keyAsPropertyName: true)]
-        public partial class SteamAuthenticator : GAPAuthenticatorValueDTO
+        /// <summary>
+        /// Number of characters in code
+        /// </summary>
+        const int CODE_DIGITS = 5;
+
+        /// <summary>
+        /// Steam issuer for KeyUri
+        /// </summary>
+        const string STEAM_ISSUER = "Steam";
+
+        /// <summary>
+        /// Create a new Authenticator object
+        /// </summary>
+        [SerializationConstructor]
+        public SteamAuthenticator() : base(CODE_DIGITS)
         {
-            /// <summary>
-            /// Number of characters in code
-            /// </summary>
-            const int CODE_DIGITS = 5;
+            Issuer = STEAM_ISSUER;
+        }
 
-            /// <summary>
-            /// Steam issuer for KeyUri
-            /// </summary>
-            const string STEAM_ISSUER = "Steam";
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public override GamePlatform Platform => GamePlatform.Steam;
 
-            /// <summary>
-            /// Create a new Authenticator object
-            /// </summary>
-            [SerializationConstructor]
-            public SteamAuthenticator() : base(CODE_DIGITS)
-            {
-                Issuer = STEAM_ISSUER;
-            }
+        /// <summary>
+        /// Returned serial number of authenticator
+        /// </summary>
+        public string? Serial { get; set; }
 
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public override GamePlatform Platform => GamePlatform.Steam;
+        /// <summary>
+        /// Random device ID we created and registered
+        /// </summary>
+        public string? DeviceId { get; set; }
 
-            /// <summary>
-            /// Returned serial number of authenticator
-            /// </summary>
-            public string? Serial { get; set; }
+        /// <summary>
+        /// JSON steam data
+        /// </summary>
+        public string? SteamData { get; set; }
 
-            /// <summary>
-            /// Random device ID we created and registered
-            /// </summary>
-            public string? DeviceId { get; set; }
+        /// <summary>
+        /// revocation_code
+        /// </summary>
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public string? RecoveryCode => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("revocation_code")?.Value<string>();
 
-            /// <summary>
-            /// JSON steam data
-            /// </summary>
-            public string? SteamData { get; set; }
+        /// <summary>
+        /// account_name
+        /// </summary>
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public string? AccountName => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("account_name")?.Value<string>();
 
-            /// <summary>
-            /// revocation_code
-            /// </summary>
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public string? RecoveryCode => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("revocation_code")?.Value<string>();
+        /// <summary>
+        /// steamid64
+        /// </summary>
+        [MPIgnore, N_JsonIgnore, S_JsonIgnore]
+        public string? SteamId64 => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("steamid")?.Value<string>();
 
-            /// <summary>
-            /// account_name
-            /// </summary>
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public string? AccountName => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("account_name")?.Value<string>();
+        /// <summary>
+        /// JSON session data
+        /// </summary>
+        public string? SessionData { get; set; }
 
-            /// <summary>
-            /// steamid64
-            /// </summary>
-            [MPIgnore, N_JsonIgnore, S_JsonIgnore]
-            public string? SteamId64 => string.IsNullOrEmpty(SteamData) ? null : JObject.Parse(SteamData).SelectToken("steamid")?.Value<string>();
-
-            /// <summary>
-            /// JSON session data
-            /// </summary>
-            public string? SessionData { get; set; }
-
-            protected override bool ExplicitHasValue()
-            {
-                return base.ExplicitHasValue() && Serial != null && DeviceId != null && SteamData != null && SessionData != null;
-            }
+        protected override bool ExplicitHasValue()
+        {
+            return base.ExplicitHasValue() && Serial != null && DeviceId != null && SteamData != null && SessionData != null;
         }
     }
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/ST.Services.CloudService.csproj b/src/ST.Services.CloudService/ST.Services.CloudService.csproj
index 3c45ff328..9db4f475a 100644
--- a/src/ST.Services.CloudService/ST.Services.CloudService.csproj
+++ b/src/ST.Services.CloudService/ST.Services.CloudService.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>System.Application</RootNamespace>
     <AssemblyName>System.Application.SteamTools.Services.CloudService</AssemblyName>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -45,4 +46,9 @@
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.Application.Models" />
+    <Using Include="System.Application.Columns" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs b/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
index 24c1efb21..fa5672653 100644
--- a/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
+++ b/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs
@@ -300,7 +300,7 @@ namespace System.Application.Services.CloudService
                 }
             }
 
-            if (response is ApiResponseImplBase rspImpl)
+            if (response is ApiResponseImpl rspImpl)
             {
                 rspImpl.Url = requestUri;
             }
diff --git a/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.Accelerate.cs b/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.Accelerate.cs
index 620c41ce6..759f6aa01 100644
--- a/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.Accelerate.cs
+++ b/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.Accelerate.cs
@@ -1,7 +1,4 @@
 #if (DEBUG && !UI_DEMO) || (!DEBUG && UI_DEMO)
-using System.Application.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace System.Application.Services.CloudService
 {
@@ -44,7 +41,7 @@ namespace System.Application.Services.CloudService
                     Description = "基础脚本框架(不建议取消勾选，会导致某些脚本无法运行)",
                 },
             };
-            return Task.FromResult(ApiResponse.Ok(list));
+            return Task.FromResult<IApiResponse<List<ScriptDTO>>>(ApiResponse.Ok(list));
         }
 
         public Task<IApiResponse<List<AccelerateProjectGroupDTO>>> All()
@@ -63,7 +60,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "steamcommunity.com",
                             ForwardDomainName = "steamcommunity.rmbgame.net",
                             Hosts = "steamcommunity.com;www.steamcommunity.com",
-                            Enable  = true,
+                            Enable = true,
                         },
                         new AccelerateProjectDTO
                         {
@@ -72,7 +69,7 @@ namespace System.Application.Services.CloudService
                             DomainNames="store.steampowered.com;api.steampowered.com",
                             ForwardDomainName = "steamstore.rmbgame.net",
                             Hosts = "store.steampowered.com;api.steampowered.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -127,7 +124,7 @@ namespace System.Application.Services.CloudService
                             ForwardDomainIP = "162.159.130.233",
                             Hosts = "discordapp.com;support.discordapp.com;url9177.discordapp.com;canary-api.discordapp.com;cdn-ptb.discordapp.com;ptb.discordapp.com;status.discordapp.com;cdn-canary.discordapp.com;cdn.discordapp.com;streamkit.discordapp.com;i18n.discordapp.com;url9624.discordapp.com;url7195.discordapp.com;merch.discordapp.com;printer.discordapp.com;canary.discordapp.com;apps.discordapp.com;pax.discordapp.com;",
                             //104.20.96.100 dl.discordapp.net;104.20.96.100 media.discordapp.net;104.20.96.100 images-ext-2.discordapp.net;104.20.96.100 images-ext-1.discordapp.net
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -137,7 +134,7 @@ namespace System.Application.Services.CloudService
                             ForwardDomainName = "discordcom.rmbgame.net",
                             //ForwardDomainIP = "162.159.136.232",
                             Hosts = "discord.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -147,7 +144,7 @@ namespace System.Application.Services.CloudService
                             ForwardDomainName = "discordnet.rmbgame.net",
                             //ForwardDomainIP = "162.159.130.232",
                             Hosts = "dl.discordapp.net;media.discordapp.net;images-ext-2.discordapp.net;images-ext-1.discordapp.net;images-2.discordapp.net;images-1.discordapp.net",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -162,7 +159,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "irc-ws.chat.twitch.tv",
                             ForwardDomainName = "twitchchat.rmbgame.net",
                             Hosts = "irc-ws.chat.twitch.tv;irc-ws-r.chat.twitch.tv",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -171,7 +168,7 @@ namespace System.Application.Services.CloudService
                             //ForwardDomainName = "twitchchat.rmbgame.net",
                             ForwardDomainIP = "54.213.193.53",
                             Hosts = "passport.twitch.tv",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -180,7 +177,7 @@ namespace System.Application.Services.CloudService
                             //ForwardDomainName = "twitchchat.rmbgame.net",
                             ForwardDomainIP = "34.213.92.235",
                             Hosts = "id.twitch.tv",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -189,7 +186,7 @@ namespace System.Application.Services.CloudService
                             //ForwardDomainName = "twitchchat.rmbgame.net",
                             ForwardDomainIP = "52.32.137.233",
                             Hosts = "countess.twitch.tv",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -198,7 +195,7 @@ namespace System.Application.Services.CloudService
                             //ForwardDomainName = "twitchchat.rmbgame.net",
                             ForwardDomainIP = "54.186.211.17",
                             Hosts = "video-edge-d6c541.pdx01.abs.hls.ttvnw.net",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -207,7 +204,7 @@ namespace System.Application.Services.CloudService
                             //ForwardDomainName = "twitchchat.rmbgame.net",
                             ForwardDomainIP = "54.186.146.179",
                             Hosts = "pubsub-edge.twitch.tv",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -216,7 +213,7 @@ namespace System.Application.Services.CloudService
                             ForwardDomainName = "twitch.rmbgame.net",
                             Hosts = "twitch.tv;www.twitch.tv;m.twitch.tv;app.twitch.tv;music.twitch.tv;badges.twitch.tv;blog.twitch.tv;inspector.twitch.tv;stream.twitch.tv;dev.twitch.tv;clips.twitch.tv;spade.twitch.tv;gql.twitch.tv;vod-secure.twitch.tv;vod-storyboards.twitch.tv;trowel.twitch.tv;countess.twitch.tv;extension-files.twitch.tv;vod-metro.twitch.tv;pubster.twitch.tv;help.twitch.tv;link.twitch.tv;id-cdn.twitch.tv;player.twitch.tv;api.twitch.tv;cvp.twitch.tv;clips-media-assets2.twitch.tv;client-event-reporter.twitch.tv;gds-vhs-drops-campaign-images.twitch.tv;us-west-2.uploads-regional.twitch.tv;assets.help.twitch.tv;discuss.dev.twitch.tv",
                             //"platform.twitter.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -231,7 +228,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "origin-a.akamaihd.net",
                             ForwardDomainName = "originakamaidownload.rmbgame.net",
                             Hosts = "origin-a.akamaihd.net",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -246,7 +243,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "static3.cdn.ubi.com",
                             ForwardDomainName = "ubisoftstatic3.rmbgame.net",
                             Hosts = "static3.cdn.ubi.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -261,7 +258,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "gog.com",
                             ForwardDomainName = "gog.rmbgame.net",
                             Hosts = "gog.com;www.gog.com;images.gog.com;images-1.gog.com;images-2.gog.com;images-3.gog.com;images-4.gog.com;webinstallers.gog.com;menu.gog.com;auth.gog.com;login.gog.com;api.gog.com;reviews.gog.com;insights-collector.gog.com;remote-config.gog.com;external-accounts.gog.com;chat.gog.com;presence.gog.com;external-users.gog.com;gamesdb.gog.com;gameplay.gog.com;cfg.gog.com;notifications.gog.com;users.gog.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -276,7 +273,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "www.google.com",
                             ForwardDomainName = "www.recaptcha.net",
                             Hosts = "www.google.com",
-                            Enable  = false,
+                            Enable = false,
                             Redirect=true,
                         },
                     },
@@ -292,7 +289,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "githubusercontent.com;raw.github.com",
                             ForwardDomainName = "githubusercontent.rmbgame.net",
                             Hosts = "raw.github.com;githubusercontent.com;raw.githubusercontent.com;camo.githubusercontent.com;cloud.githubusercontent.com;avatars.githubusercontent.com;avatars0.githubusercontent.com;avatars1.githubusercontent.com;avatars2.githubusercontent.com;avatars3.githubusercontent.com;user-images.githubusercontent.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -300,7 +297,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "gist.github.com",
                             ForwardDomainName = "github.rmbgame.net",
                             Hosts = "gist.github.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -308,7 +305,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "github.com",
                             ForwardDomainName = "github.rmbgame.net",
                             Hosts = "github.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
@@ -323,7 +320,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "pixiv.net",
                             ForwardDomainName = "pixiv.rmbgame.net",
                             Hosts = "www.pixiv.net;touch.pixiv.net;source.pixiv.net;accounts.pixiv.net;imgaz.pixiv.net;app-api.pixiv.net;oauth.secure.pixiv.net;dic.pixiv.net;comic.pixiv.net;factory.pixiv.net;g-client-proxy.pixiv.net;sketch.pixiv.net;payment.pixiv.net;sensei.pixiv.net;novel.pixiv.net;ssl.pixiv.net;times.pixiv.net;recruit.pixiv.net;pixiv.net;p2.pixiv.net;matsuri.pixiv.net;m.pixiv.net;iracon.pixiv.net;inside.pixiv.net;i1.pixiv.net;help.pixiv.net;goods.pixiv.net;genepixiv.pr.pixiv.net;festa.pixiv.net;en.dic.pixiv.net;dev.pixiv.net;chat.pixiv.net;blog.pixiv.net;embed.pixiv.net;comic-api.pixiv.net;pay.pixiv.net",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -331,7 +328,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "pximg.net",
                             ForwardDomainName = "pximg.rmbgame.net",
                             Hosts = "pximg.net;i.pximg.net;s.pximg.net;img-sketch.pximg.net;source.pximg.net;booth.pximg.net;i-f.pximg.net;imp.pximg.net;public-img-comic.pximg.net",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -339,7 +336,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "pinterest.com;pinimg.com",
                             ForwardDomainName = "pinterest.rmbgame.net",
                             Hosts = "pinterest.com;www.pinterest.com;pinimg.com;sm.pinimg.com;s.pinimg.com;i.pinimg.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -347,7 +344,7 @@ namespace System.Application.Services.CloudService
                             DomainNames = "dlsite.com;dlsite.jp;nijiyome.jp;nijiyome.com",
                             ForwardDomainName = "dlsite.rmbgame.net",
                             Hosts = "dlsite.com;dlsite.jp;nijiyome.jp;nijiyome.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                         new AccelerateProjectDTO
                         {
@@ -355,12 +352,12 @@ namespace System.Application.Services.CloudService
                             DomainNames = "artstation.com",
                             ForwardDomainIP = "104.16.226.51",
                             Hosts = "artstation.com",
-                            Enable  = false,
+                            Enable = false,
                         },
                     },
                 },
             };
-            return Task.FromResult(ApiResponse.Ok(list));
+            return Task.FromResult<IApiResponse<List<AccelerateProjectGroupDTO>>>(ApiResponse.Ok(list));
         }
     }
 }
diff --git a/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.cs b/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.cs
index 68eddb4e6..85aa1e339 100644
--- a/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.cs
+++ b/src/ST.Services.CloudService/Services/CloudService/MockCloudServiceClient.cs
@@ -43,7 +43,7 @@ namespace System.Application.Services.CloudService
 
         public INoticeClient Notice => this;
 
-#region ModelValidator
+        #region ModelValidator
 
         IApiResponse? ModelValidator<TRequestModel>(TRequestModel requestModel) => ModelValidator<TRequestModel, object>(requestModel);
 
@@ -60,7 +60,7 @@ namespace System.Application.Services.CloudService
             return null;
         }
 
-#endregion
+        #endregion
 
         void ShowResponseErrorMessage(IApiResponse response)
         {
@@ -121,7 +121,7 @@ namespace System.Application.Services.CloudService
 
         public Task<IApiResponse<AppVersionDTO?>> CheckUpdate(Guid id, Platform platform, DeviceIdiom deviceIdiom, ArchitectureFlags supportedAbis, Version osVersion, ArchitectureFlags abi)
         {
-            return Task.FromResult(ApiResponse.Ok<AppVersionDTO?>(default));
+            return Task.FromResult<IApiResponse<AppVersionDTO?>>(ApiResponse.Ok<AppVersionDTO?>(default));
         }
 
         public Task<IApiResponse<AppVersionDTO?>> CheckUpdate2(Guid id,
@@ -131,17 +131,17 @@ namespace System.Application.Services.CloudService
             Architecture architecture,
             DeploymentMode deploymentMode)
         {
-            return Task.FromResult(ApiResponse.Ok<AppVersionDTO?>(default));
+            return Task.FromResult<IApiResponse<AppVersionDTO?>>(ApiResponse.Ok<AppVersionDTO?>(default));
         }
 
         public Task<IApiResponse> UnbundleAccount(FastLoginChannel channel)
         {
-            return Task.FromResult(ApiResponse.Ok());
+            return Task.FromResult<IApiResponse>(ApiResponse.Ok());
         }
 
         public Task<IApiResponse<UserInfoDTO>> RefreshUserInfo()
         {
-            return Task.FromResult(ApiResponse.Ok(new UserInfoDTO
+            return Task.FromResult<IApiResponse<UserInfoDTO>>(ApiResponse.Ok(new UserInfoDTO
             {
 
             }));
@@ -149,7 +149,7 @@ namespace System.Application.Services.CloudService
 
         public Task<IApiResponse<ClockInResponse>> ClockIn()
         {
-            return Task.FromResult(ApiResponse.Ok(new ClockInResponse
+            return Task.FromResult<IApiResponse<ClockInResponse>>(ApiResponse.Ok(new ClockInResponse
             {
                 Level = 99,
             }));
@@ -157,12 +157,12 @@ namespace System.Application.Services.CloudService
 
         public Task<IApiResponse> DeleteAccount()
         {
-            return Task.FromResult(ApiResponse.Ok());
+            return Task.FromResult<IApiResponse>(ApiResponse.Ok());
         }
 
         public Task<IApiResponse> Download(bool isAnonymous, string requestUri, string cacheFilePath, IProgress<float>? progress, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult(ApiResponse.Ok());
+            return Task.FromResult<IApiResponse>(ApiResponse.Ok());
         }
 
         public Task<HttpResponseMessage> Forward(HttpRequestMessage request, HttpCompletionOption completionOption, CancellationToken cancellationToken = default)
@@ -201,7 +201,7 @@ namespace System.Application.Services.CloudService
 
         public Task<IApiResponse> Post(ActiveUserRecordDTO record)
         {
-            return Task.FromResult(ApiResponse.Ok());
+            return Task.FromResult<IApiResponse>(ApiResponse.Ok());
         }
 
         public Task<IApiResponse<JWTEntity>> RefreshToken(string refresh_token)
diff --git a/src/ST.Tools.AndroidResourceLink/ST.Tools.AndroidResourceLink.csproj b/src/ST.Tools.AndroidResourceLink/ST.Tools.AndroidResourceLink.csproj
index 10fbd9012..9a22d7946 100644
--- a/src/ST.Tools.AndroidResourceLink/ST.Tools.AndroidResourceLink.csproj
+++ b/src/ST.Tools.AndroidResourceLink/ST.Tools.AndroidResourceLink.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Steam++.AndroidResourceLink</AssemblyName>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Tools.AreaImport/ST.Tools.AreaImport.csproj b/src/ST.Tools.AreaImport/ST.Tools.AreaImport.csproj
index 6cfdbaef7..3ac5b91b7 100644
--- a/src/ST.Tools.AreaImport/ST.Tools.AreaImport.csproj
+++ b/src/ST.Tools.AreaImport/ST.Tools.AreaImport.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Steam++.AreaImport</AssemblyName>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Tools.DesktopBridgeLink/ST.Tools.DesktopBridgeLink.csproj b/src/ST.Tools.DesktopBridgeLink/ST.Tools.DesktopBridgeLink.csproj
index 7cca326e0..1abcd001b 100644
--- a/src/ST.Tools.DesktopBridgeLink/ST.Tools.DesktopBridgeLink.csproj
+++ b/src/ST.Tools.DesktopBridgeLink/ST.Tools.DesktopBridgeLink.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Steam++.DesktopBridgeLink</AssemblyName>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj b/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj
index d14dfd92a..99ff3ce1f 100644
--- a/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj
+++ b/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj
@@ -6,6 +6,7 @@
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Steam++.OpenSourceLibraryListGenerate</AssemblyName>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Tools.Packager/ST.Tools.Packager.csproj b/src/ST.Tools.Packager/ST.Tools.Packager.csproj
index 6d86866d3..4e26c44ca 100644
--- a/src/ST.Tools.Packager/ST.Tools.Packager.csproj
+++ b/src/ST.Tools.Packager/ST.Tools.Packager.csproj
@@ -7,6 +7,7 @@
     <AssemblyName>Steam++.Packager</AssemblyName>
     <RootNamespace>System</RootNamespace>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST.Tools.Publish/Models/AppIdWithPublicKey.cs b/src/ST.Tools.Publish/Models/AppIdWithPublicKey.cs
index 319ff6742..fddb15cba 100644
--- a/src/ST.Tools.Publish/Models/AppIdWithPublicKey.cs
+++ b/src/ST.Tools.Publish/Models/AppIdWithPublicKey.cs
@@ -1,17 +1,16 @@
 using MPKey = MessagePack.KeyAttribute;
 using MPObject = MessagePack.MessagePackObjectAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+[MPObject]
+public class AppIdWithPublicKey
 {
-    [MPObject]
-    public class AppIdWithPublicKey
-    {
-        [MPKey(0)]
-        public Guid AppId { get; set; }
+    [MPKey(0)]
+    public Guid AppId { get; set; }
 
-        [MPKey(1)]
-        public string? PublicKey { get; set; }
+    [MPKey(1)]
+    public string? PublicKey { get; set; }
 
-        public const string AuthorizationToken = "AuthorizationToken";
-    }
+    public const string AuthorizationToken = "AuthorizationToken";
 }
diff --git a/src/ST.Tools.Publish/Models/CreateVersionRequest.cs b/src/ST.Tools.Publish/Models/CreateVersionRequest.cs
index 35f582330..ad4fe7ec8 100644
--- a/src/ST.Tools.Publish/Models/CreateVersionRequest.cs
+++ b/src/ST.Tools.Publish/Models/CreateVersionRequest.cs
@@ -1,24 +1,23 @@
 using MPKey = MessagePack.KeyAttribute;
 using MPObject = MessagePack.MessagePackObjectAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+[MPObject]
+public class CreateVersionRequest
 {
-    [MPObject]
-    public class CreateVersionRequest
-    {
-        [MPKey(0)]
-        public string? Version { get; set; }
+    [MPKey(0)]
+    public string? Version { get; set; }
 
-        /// <summary>
-        /// 新版本的描述
-        /// </summary>
-        [MPKey(1)]
-        public string? Desc { get; set; }
+    /// <summary>
+    /// 新版本的描述
+    /// </summary>
+    [MPKey(1)]
+    public string? Desc { get; set; }
 
-        /// <summary>
-        /// 是否使用上一个版本的密钥
-        /// </summary>
-        [MPKey(2)]
-        public bool UseLastSKey { get; set; }
-    }
+    /// <summary>
+    /// 是否使用上一个版本的密钥
+    /// </summary>
+    [MPKey(2)]
+    public bool UseLastSKey { get; set; }
 }
diff --git a/src/ST.Tools.Publish/Models/PublishDirInfo.cs b/src/ST.Tools.Publish/Models/PublishDirInfo.cs
index e89dc1e29..56d0a2632 100644
--- a/src/ST.Tools.Publish/Models/PublishDirInfo.cs
+++ b/src/ST.Tools.Publish/Models/PublishDirInfo.cs
@@ -1,104 +1,102 @@
 using MessagePack;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using MPIgnore = MessagePack.IgnoreMemberAttribute;
 using MPKey = MessagePack.KeyAttribute;
 using MPObject = MessagePack.MessagePackObjectAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+/// <summary>
+/// 发布文件夹信息
+/// </summary>
+[MPObject]
+public class PublishDirInfo
 {
-    /// <summary>
-    /// 发布文件夹信息
-    /// </summary>
-    [MPObject]
-    public class PublishDirInfo
+    [SerializationConstructor]
+    public PublishDirInfo()
     {
-        [SerializationConstructor]
-        public PublishDirInfo()
-        {
-        }
-
-        public PublishDirInfo(string dirName, string dirPath, DeploymentMode deploymentMode)
-        {
-            Name = dirName;
-            Path = dirPath;
-            DeploymentMode = deploymentMode;
-        }
-
-        string _Name = string.Empty;
-
-        /// <summary>
-        /// 发布文件夹名
-        /// </summary>
-        [MPKey(0)]
-        public string Name
-        {
-            get => _Name;
-            set
-            {
-                var array = value.Split('-', StringSplitOptions.RemoveEmptyEntries);
-                if (array.Length >= 1)
-                {
-                    switch (array[0]?.ToLower())
-                    {
-                        case "win":
-                            Platform = OSPlatform.Windows;
-                            break;
-                        case "linux":
-                            Platform = OSPlatform.Linux;
-                            break;
-                        case "osx":
-                            Platform = OSPlatform.OSX;
-                            break;
-                    }
-                }
-                if (array.Length >= 2)
-                {
-                    switch (array[1]?.ToLower())
-                    {
-                        case "x86":
-                            Architecture = Architecture.X86;
-                            break;
-                        case "x64":
-                            Architecture = Architecture.X64;
-                            break;
-                        case "arm":
-                            Architecture = Architecture.Arm;
-                            break;
-                        case "arm64":
-                            Architecture = Architecture.Arm64;
-                            break;
-                    }
-                }
-                _Name = value;
-            }
-        }
-
-        [MPIgnore]
-        public OSPlatform Platform { get; private set; }
-
-        [MPIgnore]
-        public Architecture Architecture { get; private set; } = (Architecture)int.MinValue;
-
-        /// <summary>
-        /// 发布文件夹路径
-        /// </summary>
-        [MPKey(1)]
-        public string Path { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 文件列表
-        /// </summary>
-        [MPKey(2)]
-        public List<PublishFileInfo> Files { get; set; } = new();
-
-        /// <summary>
-        /// 单文件打包哈希值
-        /// </summary>
-        [MPKey(3)]
-        public Dictionary<AppDownloadType, PublishFileInfo> BuildDownloads { get; set; } = new();
-
-        [MPKey(4)]
-        public DeploymentMode DeploymentMode { get; set; }
     }
+
+    public PublishDirInfo(string dirName, string dirPath, DeploymentMode deploymentMode)
+    {
+        Name = dirName;
+        Path = dirPath;
+        DeploymentMode = deploymentMode;
+    }
+
+    string _Name = string.Empty;
+
+    /// <summary>
+    /// 发布文件夹名
+    /// </summary>
+    [MPKey(0)]
+    public string Name
+    {
+        get => _Name;
+        set
+        {
+            var array = value.Split('-', StringSplitOptions.RemoveEmptyEntries);
+            if (array.Length >= 1)
+            {
+                switch (array[0]?.ToLower())
+                {
+                    case "win":
+                        Platform = OSPlatform.Windows;
+                        break;
+                    case "linux":
+                        Platform = OSPlatform.Linux;
+                        break;
+                    case "osx":
+                        Platform = OSPlatform.OSX;
+                        break;
+                }
+            }
+            if (array.Length >= 2)
+            {
+                switch (array[1]?.ToLower())
+                {
+                    case "x86":
+                        Architecture = Architecture.X86;
+                        break;
+                    case "x64":
+                        Architecture = Architecture.X64;
+                        break;
+                    case "arm":
+                        Architecture = Architecture.Arm;
+                        break;
+                    case "arm64":
+                        Architecture = Architecture.Arm64;
+                        break;
+                }
+            }
+            _Name = value;
+        }
+    }
+
+    [MPIgnore]
+    public OSPlatform Platform { get; private set; }
+
+    [MPIgnore]
+    public Architecture Architecture { get; private set; } = (Architecture)int.MinValue;
+
+    /// <summary>
+    /// 发布文件夹路径
+    /// </summary>
+    [MPKey(1)]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件列表
+    /// </summary>
+    [MPKey(2)]
+    public List<PublishFileInfo> Files { get; set; } = new();
+
+    /// <summary>
+    /// 单文件打包哈希值
+    /// </summary>
+    [MPKey(3)]
+    public Dictionary<AppDownloadType, PublishFileInfo> BuildDownloads { get; set; } = new();
+
+    [MPKey(4)]
+    public DeploymentMode DeploymentMode { get; set; }
 }
\ No newline at end of file
diff --git a/src/ST.Tools.Publish/Models/PublishFileInfo.cs b/src/ST.Tools.Publish/Models/PublishFileInfo.cs
index eea6269ff..ac4ccb0f1 100644
--- a/src/ST.Tools.Publish/Models/PublishFileInfo.cs
+++ b/src/ST.Tools.Publish/Models/PublishFileInfo.cs
@@ -1,70 +1,68 @@
 using MessagePack;
-using System.IO;
 using MPKey = MessagePack.KeyAttribute;
 using MPObject = MessagePack.MessagePackObjectAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+/// <summary>
+/// 发布文件信息
+/// </summary>
+[MPObject]
+public class PublishFileInfo
 {
-    /// <summary>
-    /// 发布文件信息
-    /// </summary>
-    [MPObject]
-    public class PublishFileInfo
+    [SerializationConstructor]
+    public PublishFileInfo()
     {
-        [SerializationConstructor]
-        public PublishFileInfo()
-        {
-        }
-
-        const string CEF = "CEF";
-        const string Bin = "Bin";
-
-        public PublishFileInfo(string path, string relativeTo)
-        {
-            Path = path;
-            FileEx = IO.Path.GetExtension(path);
-            Length = new FileInfo(path).Length;
-            RelativePath = IO.Path.GetRelativePath(relativeTo, path);
-            if (RelativePath.StartsWith(CEF, StringComparison.OrdinalIgnoreCase))
-            {
-                RelativePath = Bin + IO.Path.DirectorySeparatorChar + CEF + RelativePath.Substring(CEF.Length, RelativePath.Length - CEF.Length);
-            }
-        }
-
-        /// <summary>
-        /// 文件路径
-        /// </summary>
-        [MPKey(0)]
-        public string Path { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 文件相对路径
-        /// </summary>
-        [MPKey(1)]
-        public string RelativePath { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 文件原哈希值
-        /// </summary>
-        [MPKey(2)]
-        public string SHA256 { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 文件扩展名
-        /// </summary>
-        [MPKey(3)]
-        public string FileEx { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 数字签名后的哈希值
-        /// </summary>
-        [MPKey(4)]
-        public string DigitalSignSHA256 { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 文件大小
-        /// </summary>
-        [MPKey(5)]
-        public long Length { get; set; }
     }
+
+    const string CEF = "CEF";
+    const string Bin = "Bin";
+
+    public PublishFileInfo(string path, string relativeTo)
+    {
+        Path = path;
+        FileEx = IO.Path.GetExtension(path);
+        Length = new FileInfo(path).Length;
+        RelativePath = IO.Path.GetRelativePath(relativeTo, path);
+        if (RelativePath.StartsWith(CEF, StringComparison.OrdinalIgnoreCase))
+        {
+            RelativePath = Bin + IO.Path.DirectorySeparatorChar + CEF + RelativePath.Substring(CEF.Length, RelativePath.Length - CEF.Length);
+        }
+    }
+
+    /// <summary>
+    /// 文件路径
+    /// </summary>
+    [MPKey(0)]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件相对路径
+    /// </summary>
+    [MPKey(1)]
+    public string RelativePath { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件原哈希值
+    /// </summary>
+    [MPKey(2)]
+    public string SHA256 { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件扩展名
+    /// </summary>
+    [MPKey(3)]
+    public string FileEx { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 数字签名后的哈希值
+    /// </summary>
+    [MPKey(4)]
+    public string DigitalSignSHA256 { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 文件大小
+    /// </summary>
+    [MPKey(5)]
+    public long Length { get; set; }
 }
\ No newline at end of file
diff --git a/src/ST.Tools.Publish/Models/UpdateVersionRequest.cs b/src/ST.Tools.Publish/Models/UpdateVersionRequest.cs
index 4b974ccad..19d20d944 100644
--- a/src/ST.Tools.Publish/Models/UpdateVersionRequest.cs
+++ b/src/ST.Tools.Publish/Models/UpdateVersionRequest.cs
@@ -1,37 +1,35 @@
-using System.Collections.Generic;
 using MPKey = MessagePack.KeyAttribute;
 using MPObject = MessagePack.MessagePackObjectAttribute;
 
-namespace System.Application.Models
+namespace System.Application.Models;
+
+[MPObject]
+public class UpdateVersionRequest
 {
-    [MPObject]
-    public class UpdateVersionRequest
-    {
-        /// <summary>
-        /// 指定一个版本号
-        /// </summary>
-        [MPKey(0)]
-        public string? Version { get; set; }
+    /// <summary>
+    /// 指定一个版本号
+    /// </summary>
+    [MPKey(0)]
+    public string Version { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 是否为开发环境，默认值否
-        /// </summary>
-        [MPKey(1)]
-        public bool Dev { get; set; }
+    /// <summary>
+    /// 是否为开发环境，默认值否
+    /// </summary>
+    [MPKey(1)]
+    public bool Dev { get; set; }
 
-        /// <summary>
-        /// 指定码云下载链接，使用分号分割多个下载链接
-        /// </summary>
-        [MPKey(2)]
-        public string? Gitee { get; set; }
+    /// <summary>
+    /// 指定码云下载链接，使用分号分割多个下载链接
+    /// </summary>
+    [MPKey(2)]
+    public string? Gitee { get; set; }
 
-        /// <summary>
-        /// 指定测试环境自定义下载链接，使用分号分割多个下载链接
-        /// </summary>
-        [MPKey(3)]
-        public string? DevCustom { get; set; }
+    /// <summary>
+    /// 指定测试环境自定义下载链接，使用分号分割多个下载链接
+    /// </summary>
+    [MPKey(3)]
+    public string? DevCustom { get; set; }
 
-        [MPKey(4)]
-        public IList<PublishDirInfo>? DirNames { get; set; }
-    }
+    [MPKey(4)]
+    public IList<PublishDirInfo>? DirNames { get; set; }
 }
diff --git a/src/ST.Tools.Publish/Packaging.Targets/Task.cs b/src/ST.Tools.Publish/Packaging.Targets/Task.cs
new file mode 100644
index 000000000..37a601f2d
--- /dev/null
+++ b/src/ST.Tools.Publish/Packaging.Targets/Task.cs
@@ -0,0 +1,6 @@
+namespace Packaging.Targets;
+
+public abstract class Task : Microsoft.Build.Utilities.Task
+{
+
+}
diff --git a/src/ST.Tools.Publish/ST.Tools.Publish.csproj b/src/ST.Tools.Publish/ST.Tools.Publish.csproj
index a57fe2b91..efc0404ff 100644
--- a/src/ST.Tools.Publish/ST.Tools.Publish.csproj
+++ b/src/ST.Tools.Publish/ST.Tools.Publish.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -8,6 +8,7 @@
     <ApplicationIcon>..\..\..\SteamTools\src\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
     <DefineConstants>NOT_XE;NOT_MP;NOT_NJSON;NOT_DI;$(DefineConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
diff --git a/src/ST.Tools.Publish/Steps/Step_cd.cs b/src/ST.Tools.Publish/Steps/Step_cd.cs
index b65cb078b..8b66a2cca 100644
--- a/src/ST.Tools.Publish/Steps/Step_cd.cs
+++ b/src/ST.Tools.Publish/Steps/Step_cd.cs
@@ -488,7 +488,7 @@ namespace System.Application.Steps
             //return await ApiResponse.DeserializeAsync<T>(stream, default);
 
             var json = await responseMessage.Content.ReadAsStringAsync();
-            return Serializable.DJSON_Original<ApiResponseImpl<T>>(json)!;
+            return Serializable.DJSON_Original<ApiRsp<T>>(json)!;
         }
 
         static async Task<IApiResponse> GetResponseAsync(HttpResponseMessage responseMessage)
diff --git a/src/ST.Tools.Translate/ST.Tools.Translate.csproj b/src/ST.Tools.Translate/ST.Tools.Translate.csproj
index ecd1d7b58..c3622110a 100644
--- a/src/ST.Tools.Translate/ST.Tools.Translate.csproj
+++ b/src/ST.Tools.Translate/ST.Tools.Translate.csproj
@@ -6,6 +6,7 @@
     <AssemblyName>t</AssemblyName>
     <RootNamespace>System</RootNamespace>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ST/Properties/InternalsVisibleTo.cs b/src/ST/Properties/InternalsVisibleTo.cs
index 2bbed215e..d57ea6c46 100644
--- a/src/ST/Properties/InternalsVisibleTo.cs
+++ b/src/ST/Properties/InternalsVisibleTo.cs
@@ -3,4 +3,4 @@ using static System.Properties.ThisAssembly;
 
 [assembly: InternalsVisibleTo("System.Application.SteamTools.Client.UnitTest" + PublicKey)]
 [assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Desktop.UnitTest" + PublicKey)]
-[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Droid.UnitTest" + PublicKey)] 
\ No newline at end of file
+[assembly: InternalsVisibleTo("System.Application.SteamTools.Client.Droid.UnitTest" + PublicKey)]
\ No newline at end of file
diff --git a/src/Startup.cs b/src/Startup.cs
index 4a4fde78a..a0757844a 100644
--- a/src/Startup.cs
+++ b/src/Startup.cs
@@ -125,13 +125,17 @@ namespace System.Application.UI
                         //                            }
                         //                        }
                         //#endif
+                        const string ApiBaseUrl_Development =
+#if USE_DEBUG_SERVER
+                            $"{Prefix_HTTPS}localhost:5001";
+#else
+                            $"{Prefix_HTTPS}pan.mossimo.net:8862";
+#endif
+                        const string ApiBaseUrl_Production = $"{Prefix_HTTPS}api.steampp.net";
                         var value =
                             (_ThisAssembly.Debuggable || !s.GetIsOfficialChannelPackage()) ?
-                            Prefix_HTTPS +
-                            "pan.mossimo.net:8862"
-                            /*"localhost:5001"*/
-                            :
-                            Prefix_HTTPS + "api.steampp.net";
+                                ApiBaseUrl_Development :
+                                ApiBaseUrl_Production;
                         s.ApiBaseUrl = value;
                     }
                 }
diff --git a/tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs b/tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs
index 90ab0578c..4084680d2 100644
--- a/tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs
+++ b/tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs
@@ -14,7 +14,7 @@ namespace System.UnitTest
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.0.26")]
 	public partial class Resource
 	{