mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-04-23 14:42:51 +08:00
build: 📦 build err
This commit is contained in:
parent
d4956c94e0
commit
7a7bf0e578
@ -18,7 +18,7 @@
|
|||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<MinVerDefaultPreReleaseIdentifiers>beta</MinVerDefaultPreReleaseIdentifiers>
|
<MinVerDefaultPreReleaseIdentifiers>beta</MinVerDefaultPreReleaseIdentifiers>
|
||||||
<MinVerTagPrefix>v</MinVerTagPrefix>
|
<MinVerTagPrefix>v</MinVerTagPrefix>
|
||||||
<NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SYSLIB1045;SA1010</NoWarn>
|
<NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0072;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SA1010;SYSLIB1045</NoWarn>
|
||||||
<Product>NetAdmin</Product>
|
<Product>NetAdmin</Product>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
|
<RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
|
||||||
|
@ -88,10 +88,7 @@ public sealed class CacheService(IConnectionMultiplexer connectionMultiplexer) /
|
|||||||
, ExpireTime = DateTime.Now + await database.KeyTimeToLiveAsync(req.Key).ConfigureAwait(false)
|
, ExpireTime = DateTime.Now + await database.KeyTimeToLiveAsync(req.Key).ConfigureAwait(false)
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma warning disable IDE0072
|
ret.Data = ret.Type switch {
|
||||||
ret.Data = ret.Type switch
|
|
||||||
#pragma warning restore IDE0072
|
|
||||||
{
|
|
||||||
RedisType.String => await database.StringGetAsync(req.Key).ConfigureAwait(false)
|
RedisType.String => await database.StringGetAsync(req.Key).ConfigureAwait(false)
|
||||||
, RedisType.List => string.Join(", ", await database.ListRangeAsync(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))
|
, RedisType.Set => string.Join(", ", await database.SetMembersAsync(req.Key).ConfigureAwait(false))
|
||||||
|
@ -129,7 +129,7 @@ public sealed class MenuService(BasicRepository<Sys_Menu, long> rpo, IUserServic
|
|||||||
private ISelect<Sys_Menu> QueryInternal(QueryReq<QueryMenuReq> req)
|
private ISelect<Sys_Menu> QueryInternal(QueryReq<QueryMenuReq> req)
|
||||||
{
|
{
|
||||||
var ret = Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter);
|
var ret = Rpo.Select.WhereDynamicFilter(req.DynamicFilter).WhereDynamic(req.Filter);
|
||||||
#pragma warning disable IDE0072
|
|
||||||
return req.Order switch {
|
return req.Order switch {
|
||||||
Orders.None => ret
|
Orders.None => ret
|
||||||
, Orders.Random => ret.OrderByRandom()
|
, Orders.Random => ret.OrderByRandom()
|
||||||
@ -138,6 +138,5 @@ public sealed class MenuService(BasicRepository<Sys_Menu, long> rpo, IUserServic
|
|||||||
.OrderBy(a => a.Name)
|
.OrderBy(a => a.Name)
|
||||||
.OrderBy(a => a.Id)
|
.OrderBy(a => a.Id)
|
||||||
};
|
};
|
||||||
#pragma warning restore IDE0072
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -205,7 +205,7 @@ public sealed class UserProfileService(BasicRepository<Sys_UserProfile, long> rp
|
|||||||
private ISelect<Sys_UserProfile, Sys_DicContent, Sys_DicContent, Sys_DicContent, Sys_DicContent> QueryInternalComplex(
|
private ISelect<Sys_UserProfile, Sys_DicContent, Sys_DicContent, Sys_DicContent, Sys_DicContent> QueryInternalComplex(
|
||||||
QueryReq<QueryUserProfileReq> req)
|
QueryReq<QueryUserProfileReq> req)
|
||||||
{
|
{
|
||||||
#pragma warning disable CA1305,IDE0072
|
#pragma warning disable CA1305
|
||||||
var ret = Rpo.Orm.Select<Sys_UserProfile, Sys_DicContent, Sys_DicContent, Sys_DicContent, Sys_DicContent>()
|
var ret = Rpo.Orm.Select<Sys_UserProfile, Sys_DicContent, Sys_DicContent, Sys_DicContent, Sys_DicContent>()
|
||||||
.LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA)
|
.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)
|
.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<Sys_UserProfile, long> rp
|
|||||||
, _ => ret.OrderByPropertyNameIf(req.Prop?.Length > 0, req.Prop, req.Order == Orders.Ascending)
|
, _ => ret.OrderByPropertyNameIf(req.Prop?.Length > 0, req.Prop, req.Order == Orders.Ascending)
|
||||||
.OrderByDescending((a, _, __, ___, ____) => a.Id)
|
.OrderByDescending((a, _, __, ___, ____) => a.Id)
|
||||||
};
|
};
|
||||||
#pragma warning restore CA1305,IDE0072
|
#pragma warning restore CA1305
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user