diff --git a/Directory.Build.props b/Directory.Build.props index 435da0f8..daa6b1e1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,7 +18,7 @@ preview beta v - CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SYSLIB1045;SA1010 + CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0072;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SA1010;SYSLIB1045 NetAdmin git https://github.com/nsnail/NetAdmin.git diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs index 27f65598..bfc32d3b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs @@ -88,10 +88,7 @@ public sealed class CacheService(IConnectionMultiplexer connectionMultiplexer) / , ExpireTime = DateTime.Now + await database.KeyTimeToLiveAsync(req.Key).ConfigureAwait(false) }; - #pragma warning disable IDE0072 - ret.Data = ret.Type switch - #pragma warning restore IDE0072 - { + ret.Data = ret.Type switch { RedisType.String => await database.StringGetAsync(req.Key).ConfigureAwait(false) , RedisType.List => string.Join(", ", await database.ListRangeAsync(req.Key).ConfigureAwait(false)) , RedisType.Set => string.Join(", ", await database.SetMembersAsync(req.Key).ConfigureAwait(false)) diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs index 4f6c4f40..7edfe30c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs @@ -129,7 +129,7 @@ public sealed class MenuService(BasicRepository rpo, IUserServic private ISelect QueryInternal(QueryReq req) { var ret = Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter); - #pragma warning disable IDE0072 + return req.Order switch { Orders.None => ret , Orders.Random => ret.OrderByRandom() @@ -138,6 +138,5 @@ public sealed class MenuService(BasicRepository rpo, IUserServic .OrderBy(a => a.Name) .OrderBy(a => a.Id) }; - #pragma warning restore IDE0072 } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs index 44a2f2a1..b6a2a838 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs @@ -205,7 +205,7 @@ public sealed class UserProfileService(BasicRepository rp private ISelect QueryInternalComplex( QueryReq req) { - #pragma warning disable CA1305,IDE0072 + #pragma warning disable CA1305 var ret = Rpo.Orm.Select() .LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) .LeftJoin((a, _, c, __, ___) => a.CompanyArea.ToString() == c.Value && c.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) @@ -219,6 +219,6 @@ public sealed class UserProfileService(BasicRepository rp , _ => ret.OrderByPropertyNameIf(req.Prop?.Length > 0, req.Prop, req.Order == Orders.Ascending) .OrderByDescending((a, _, __, ___, ____) => a.Id) }; - #pragma warning restore CA1305,IDE0072 + #pragma warning restore CA1305 } } \ No newline at end of file