feat: ✨ 框架代码同步

Author: tk

assets/res/NetAdmin.Statements.ln

@@ -68,6 +68,7 @@ XML注释文件不存在
 消息内容不能为空
 父节点不存在
 用户不存在
+用户名不符合要求
 用户名不能为空
 用户名不能是手机号码
 用户名或密码错误

build/code.quality.props

@@ -23,7 +23,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.13.0.120203">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.14.0.120626">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/backend/NetAdmin/NetAdmin.Application/Extensions/ISelectExtensions.cs

@@ -15,7 +15,8 @@ public static ISelect<T> AppendOtherFilters<T, TQuery>(this ISelect<T> me, Query
         where TQuery : DataAbstraction, new()
     {
         if (req.IgnoreOwner) {
-            me = me.DisableGlobalFilter(Chars.FLG_FREE_SQL_GLOBAL_FILTER_DATA);
+            me = me.DisableGlobalFilter(Chars.FLG_FREE_SQL_GLOBAL_FILTER_SELF, Chars.FLG_FREE_SQL_GLOBAL_FILTER_DEPT
+                                      , Chars.FLG_FREE_SQL_GLOBAL_FILTER_DEPT_WITH_CHILD);
         }
 
         return me;

src/backend/NetAdmin/NetAdmin.Application/Services/RepositoryService.cs

@@ -62,6 +62,23 @@ protected static async Task<IActionResult> ExportAsync<TQuery, TExport>( //
         return await GetExportFileStreamAsync<TExport>(fileName, list).ConfigureAwait(false);
     }
 
+    /// <summary>
+    ///     唯一索引冲突处理
+    /// </summary>
+    protected static async Task OnUniqueIndexConflictAsync(Func<Task> actionTry, Func<Task> actionCatch = null)
+    {
+        try {
+            await actionTry().ConfigureAwait(false);
+        }
+        catch (Exception ex) when (ex.Message.Contains(Chars.FLG_DB_EXCEPTION_PRIMARY_KEY_CONFLICT)       ||
+                                   ex.Message.Contains(Chars.FLG_DB_EXCEPTION_UNIQUE_CONSTRAINT_CONFLICT) ||
+                                   ex.Message.Contains(Chars.FLG_DB_EXCEPTION_IDX)) {
+            if (actionCatch != null) {
+                await actionCatch().ConfigureAwait(false);
+            }
+        }
+    }
+
     /// <summary>
     ///     更新实体
     /// </summary>
@@ -85,7 +102,8 @@ TEntity                         newValue             //
         whereExp ??= a => a.Id.Equals(newValue.Id);
         var update = BuildUpdate(newValue, includeFields, excludeFields, ignoreVersion).Where(whereExp).Where(whereSql);
         if (disableGlobalDataFilter) {
-            update = update.DisableGlobalFilter(nameof(Chars.FLG_FREE_SQL_GLOBAL_FILTER_DATA));
+            update = update.DisableGlobalFilter(Chars.FLG_FREE_SQL_GLOBAL_FILTER_SELF, Chars.FLG_FREE_SQL_GLOBAL_FILTER_DEPT
+                                              , Chars.FLG_FREE_SQL_GLOBAL_FILTER_DEPT_WITH_CHILD);
         }
 
         return update.ExecuteEffectsAsync();
@@ -106,8 +124,8 @@ protected Task<List<TEntity>> UpdateReturnListAsync(     //
         TEntity                         newValue             //
       , List<string>                    includeFields = null //
       , List<string>                    excludeFields = null //
-      , Expression<Func<TEntity, bool>> whereExp = null //
-      , string                          whereSql = null //
+      , Expression<Func<TEntity, bool>> whereExp      = null //
+      , string                          whereSql      = null //
       , bool                            ignoreVersion = false)
     {
         // 默认匹配主键

src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/UserNameAttribute.cs

@@ -19,7 +19,7 @@ public UserNameAttribute() //
     public override bool IsValid(object value)
     {
         if (!base.IsValid(value)) {
-            ErrorMessageResourceName = nameof(Ln.用户名长度4位以上);
+            ErrorMessageResourceName = nameof(Ln.用户名不符合要求);
             return false;
         }
 

src/backend/NetAdmin/NetAdmin.Domain/DataAbstraction.cs

@@ -3,14 +3,23 @@ namespace NetAdmin.Domain;
 /// <summary>
 ///     数据基类
 /// </summary>
-public abstract record DataAbstraction
+public abstract record DataAbstraction : IValidatableObject
 {
+    /// <summary>
+    ///     是否已验证
+    /// </summary>
+    protected bool HasValidated { get; set; }
+
     /// <summary>
     ///     如果数据校验失败，抛出异常
     /// </summary>
     /// <exception cref="NetAdminValidateException">NetAdminValidateException</exception>
     public void ThrowIfInvalid()
     {
+        if (HasValidated) {
+            return;
+        }
+
         var validationResult = this.TryValidate();
         if (!validationResult.IsValid) {
             throw new NetAdminValidateException(validationResult.ValidationResults.ToDictionary( //
@@ -45,4 +54,19 @@ public void TruncateStrings()
             property.SetValue(this, s);
         }
     }
+
+    /// <inheritdoc />
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        HasValidated = true;
+        return ValidateInternal(validationContext);
+    }
+
+    /// <summary>
+    ///     内部验证
+    /// </summary>
+    protected virtual IEnumerable<ValidationResult> ValidateInternal(ValidationContext validationContext)
+    {
+        yield return ValidationResult.Success;
+    }
 }

src/backend/NetAdmin/NetAdmin.Domain/Dto/Dependency/JobReq.cs

@@ -0,0 +1,22 @@
+namespace NetAdmin.Domain.Dto.Dependency;
+
+/// <summary>
+///     工作批请求
+/// </summary>
+public record JobReq : DataAbstraction
+{
+    /// <summary>
+    ///     处理数量
+    /// </summary>
+    public int? Count { get; init; }
+
+    /// <summary>
+    ///     n秒以前
+    /// </summary>
+    public int? SecondsAgo { get; init; }
+
+    /// <summary>
+    ///     直到n秒前
+    /// </summary>
+    public int? UntilSecondsAgo { get; init; }
+}

src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/DepositOrder/CreateDepositOrderReq.cs

@@ -3,7 +3,7 @@ namespace NetAdmin.Domain.Dto.Sys.DepositOrder;
 /// <summary>
 ///     请求：创建充值订单
 /// </summary>
-public record CreateDepositOrderReq : Sys_DepositOrder, IValidatableObject
+public record CreateDepositOrderReq : Sys_DepositOrder
 {
     /// <inheritdoc cref="Sys_DepositOrder.ActualPayAmount" />
     public override long ActualPayAmount { get; init; }
@@ -25,7 +25,7 @@ public record CreateDepositOrderReq : Sys_DepositOrder, IValidatableObject
     public override int ToPointRate { get; init; }
 
     /// <inheritdoc />
-    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    protected override IEnumerable<ValidationResult> ValidateInternal(ValidationContext validationContext)
     {
         if (PaymentMode != PaymentModes.USDT) {
             yield return new ValidationResult(Ln.支付方式不正确, [nameof(PaymentMode)]);

src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/DepositOrder/ReceivedConfirmationReq.cs

@@ -5,9 +5,8 @@ namespace NetAdmin.Domain.Dto.Sys.Dept;
 /// </summary>
 public record CreateDeptReq : Sys_Dept
 {
-    /// <inheritdoc cref="IFieldEnabled.Enabled" />
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public override bool Enabled { get; init; }
+    /// <inheritdoc />
+    public override bool Enabled { get; init; } = true;
 
     /// <inheritdoc cref="Sys_Dept.Name" />
     [JsonIgnore(Condition = JsonIgnoreCondition.Never)]