From 35411b8c38640a5045c948063610ad85744cb4dd Mon Sep 17 00:00:00 2001 From: nsnail Date: Tue, 23 Jan 2024 10:50:26 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20(#83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../Dto/Sys/Cache/CacheStatisticsRsp.cs | 18 +++++++++--------- .../Extensions/ServiceCollectionExtensions.cs | 4 ++-- .../NetAdmin.Host/Filters/ApiResultHandler.cs | 2 +- .../NetAdmin.Host/Utils/RequestLogger.cs | 2 +- .../Utils/CaptchaImageHelper.cs | 2 +- .../Utils/FreeSqlBuilder.cs | 16 +++++++++------- .../Services/Sys/VerifyCodeService.cs | 2 +- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1ae919a3..560fe74b 100644 --- a/README.md +++ b/README.md @@ -127,4 +127,4 @@ XC-->XA | JavaScript | JavaScript解析器 | [Terser](https://github.com/terser/terser) | | JavaScript | 代码质量检查 | [ESLint](https://github.com/eslint/eslint) | | JavaScript | 代码格式化工具 | [Prettier](https://github.com/prettier/prettier) | -| JavaScript | 标准加密库 | [crypto-js](https://github.com/brix/crypto-js) | +| JavaScript | 标准加密库 | [crypto-js](https://github.com/brix/crypto-js) | \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs index c1396d69..fcad116a 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs @@ -5,15 +5,15 @@ namespace NetAdmin.Domain.Dto.Sys.Cache; /// public sealed record CacheStatisticsRsp : DataAbstraction { - private static readonly Regex[] _regexes = { - new(@"keyspace_hits:(\d+)", RegexOptions.Compiled) - , new(@"keyspace_misses:(\d+)", RegexOptions.Compiled) - , new(@"uptime_in_seconds:(\d+)", RegexOptions.Compiled) - , new(@"used_cpu_sys:([\d\\.]+)", RegexOptions.Compiled) - , new(@"used_cpu_user:([\d\\.]+)", RegexOptions.Compiled) - , new(@"used_memory:(\d+)", RegexOptions.Compiled) - , new("redis_version:(.+)", RegexOptions.Compiled) - }; + private static readonly Regex[] _regexes = [ + new Regex(@"keyspace_hits:(\d+)", RegexOptions.Compiled) // + , new Regex(@"keyspace_misses:(\d+)", RegexOptions.Compiled) // + , new Regex(@"uptime_in_seconds:(\d+)", RegexOptions.Compiled) // + , new Regex(@"used_cpu_sys:([\d\\.]+)", RegexOptions.Compiled) // + , new Regex(@"used_cpu_user:([\d\\.]+)", RegexOptions.Compiled) // + , new Regex(@"used_memory:(\d+)", RegexOptions.Compiled) // + , new Regex("redis_version:(.+)", RegexOptions.Compiled) // + ]; /// /// Initializes a new instance of the class. diff --git a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs index 4321b395..74b3183d 100644 --- a/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin.Host/Extensions/ServiceCollectionExtensions.cs @@ -90,8 +90,8 @@ public static class ServiceCollectionExtensions foreach (var type in optionsTypes) { var configureMethod = typeof(ConfigurableOptionsServiceCollectionExtensions).GetMethod( nameof(ConfigurableOptionsServiceCollectionExtensions.AddConfigurableOptions) - , BindingFlags.Public | BindingFlags.Static, new[] { typeof(IServiceCollection) }); - _ = configureMethod!.MakeGenericMethod(type).Invoke(me, new object[] { me }); + , BindingFlags.Public | BindingFlags.Static, [typeof(IServiceCollection)]); + _ = configureMethod!.MakeGenericMethod(type).Invoke(me, [me]); _ = sbLog.Append(CultureInfo.InvariantCulture, $" {type.Name}"); } diff --git a/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs b/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs index fc6c600d..fd090edf 100644 --- a/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs +++ b/src/backend/NetAdmin.Host/Filters/ApiResultHandler.cs @@ -75,7 +75,7 @@ public abstract class ApiResultHandler ? dic.ToDictionary( // x => (startWithDollar = x.Key.StartsWith('$')) ? x.Key[1..].TrimStart('.').NullOrEmpty(null) ?? throw new NetAdminInvalidInputException() - : x.Key, x => startWithDollar ? new[] { Ln.参数格式不正确 } : x.Value) + : x.Key, x => startWithDollar ? [Ln.参数格式不正确] : x.Value) : validationResult; } catch (NetAdminInvalidInputException) { diff --git a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs b/src/backend/NetAdmin.Host/Utils/RequestLogger.cs index 67e60593..39a922c9 100644 --- a/src/backend/NetAdmin.Host/Utils/RequestLogger.cs +++ b/src/backend/NetAdmin.Host/Utils/RequestLogger.cs @@ -12,7 +12,7 @@ public sealed class RequestLogger( , IOptions specificationDocumentSettingsOptions , IEventPublisher eventPublisher) : ISingleton { - private static readonly string[] _textContentTypes = { "text", "json", "xml", "urlencoded" }; + private static readonly string[] _textContentTypes = ["text", "json", "xml", "urlencoded"]; private readonly int _tokenPrefixLength = specificationDocumentSettingsOptions?.Value.SecurityDefinitions?[0]?.Scheme?.Length + 1 ?? diff --git a/src/backend/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs b/src/backend/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs index 189ef34b..6db0b706 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/CaptchaImageHelper.cs @@ -12,7 +12,7 @@ namespace NetAdmin.Infrastructure.Utils; /// public static class CaptchaImageHelper { - private static readonly int[] _randRange = { 70, 100 }; + private static readonly int[] _randRange = [70, 100]; /// /// 创建一个缺口滑块验证码图片 diff --git a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs index 6246f246..13569216 100644 --- a/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs +++ b/src/backend/NetAdmin.Infrastructure/Utils/FreeSqlBuilder.cs @@ -49,11 +49,13 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) private static MethodInfo MakeInsertMethod(Type entityType) { return typeof(IBaseRepository<>).MakeGenericType(entityType) - .GetMethod( // - nameof(IBaseRepository.Insert) - , BindingFlags.Public | BindingFlags.Instance, null - , CallingConventions.Any - , new[] { typeof(IEnumerable<>).MakeGenericType(entityType) }, null); + .GetMethod( // + nameof(IBaseRepository.Insert) // + , BindingFlags.Public | BindingFlags.Instance // + , null // + , CallingConventions.Any // + , [typeof(IEnumerable<>).MakeGenericType(entityType)] // + , null); } /// @@ -108,7 +110,7 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) continue; } - var rep = MakeGetRepositoryMethod(entityType)?.Invoke(null, new object[] { freeSql, null }); + var rep = MakeGetRepositoryMethod(entityType)?.Invoke(null, [freeSql, null]); if (rep?.GetType().GetProperty(nameof(DbContextOptions))?.GetValue(rep) is DbContextOptions options) { options.EnableCascadeSave = true; options.NoneParameter = true; @@ -116,7 +118,7 @@ public sealed class FreeSqlBuilder(DatabaseOptions databaseOptions) var insert = MakeInsertMethod(entityType); - _ = insert?.Invoke(rep, new[] { entities }); + _ = insert?.Invoke(rep, [entities]); } } diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs index 60c8b48e..0cd67834 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs @@ -14,7 +14,7 @@ namespace NetAdmin.SysComponent.Application.Services.Sys; public sealed class VerifyCodeService(DefaultRepository rpo, IEventPublisher eventPublisher) // : RepositoryService(rpo), IVerifyCodeService { - private static readonly int[] _randRange = { 0, 10000 }; + private static readonly int[] _randRange = [0, 10000]; /// public async Task BulkDeleteAsync(BulkReq req)