😎清理代码

Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -39,12 +39,14 @@ public partial class SysDictData : EntityBase
     [SugarColumn(ColumnDescription = "编码", Length = 128)]
     [Required, MaxLength(128)]
     public virtual string Code { get; set; }
+
     /// <summary>
     /// 名称
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 128)]
     [Required, MaxLength(128)]
     public virtual string Name { get; set; }
+
     /// <summary>
     /// 显示样式-标签颜色
     /// </summary>

Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs

@@ -13,16 +13,19 @@ public class EnumToDictJob : IJob
 {
     private readonly IServiceScopeFactory _scopeFactory;
     private readonly IJsonSerializerProvider _jsonSerializer;
+
     public EnumToDictJob(IServiceScopeFactory scopeFactory, IJsonSerializerProvider jsonSerializer)
     {
         _scopeFactory = scopeFactory;
         _jsonSerializer = jsonSerializer;
     }
+
     public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
     {
         using var serviceScope = _scopeFactory.CreateScope();
         var sysEnumService = serviceScope.ServiceProvider.GetService<SysEnumService>();
-        using var db = serviceScope.ServiceProvider.GetService<ISqlSugarClient>().CopyNew();
+        var db = serviceScope.ServiceProvider.GetService<ISqlSugarClient>().CopyNew();
+
         var enumTypeList = sysEnumService.GetEnumTypeList();
         var enumCodeList = enumTypeList.Select(x => x.TypeName);
         var sysDictTypeCodeList = await db.Queryable<SysDictType>().Where(x => enumCodeList.Contains(x.Code)).Select(x => x.Code).ToListAsync(stoppingToken);
@@ -54,14 +57,11 @@ public class EnumToDictJob : IJob
                                 d.Code = enumData.Name;
                                 uSysDictData.Add(d);
                             }
-
                         });
-
                     }
                     if (!uSysDictType.Any(x => x.Id == uDictType.Id))
                     {
                         uSysDictType.Add(uDictType);
-
                     }
                 }
             });
@@ -98,14 +98,13 @@ public class EnumToDictJob : IJob
                 Remark = x.TypeRemark,
                 Status = StatusEnum.Enable,
                 OrderNo = 100
-
             }).ToList();
             // 需要新增的字典数据
             var dictData = iEnumType.Join(iDictType, t1 => t1.TypeName, t2 => t2.Code, (t1, t2) => new
             {
                 data = t1.EnumEntities.Select(x => new SysDictData
                 {
-                    // 性能优化，使用BulkCopyAsync必须手动获取id
+                    // 性能优化，使用BulkCopyAsync必须手动获取Id
                     Id = YitIdHelper.NextId(),
                     DictTypeId = t2.Id,
                     Name = x.Describe,
@@ -143,9 +142,8 @@ public class EnumToDictJob : IJob
         }
 
         var originColor = Console.ForegroundColor;
-        Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine("【" + DateTime.Now + "】服务重启后枚举转换字典");
+        Console.ForegroundColor = ConsoleColor.Green;
+        Console.WriteLine("【" + DateTime.Now + "】系统枚举转换字典");
         Console.ForegroundColor = originColor;
-
     }
 }

Admin.NET/Admin.NET.Core/Job/LogJob.cs

@@ -30,5 +30,10 @@ public class LogJob : IJob
         await logVisRep.CopyNew().AsDeleteable().Where(u => (DateTime)u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除访问日志
         await logOpRep.CopyNew().AsDeleteable().Where(u => (DateTime)u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除操作日志
         await logDiffRep.CopyNew().AsDeleteable().Where(u => (DateTime)u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除差异日志
+
+        var originColor = Console.ForegroundColor;
+        Console.ForegroundColor = ConsoleColor.Yellow;
+        Console.WriteLine("【" + DateTime.Now + "】清空系统日志（30天前）");
+        Console.ForegroundColor = originColor;
     }
 }

Admin.NET/Admin.NET.Core/Job/OnlineUserJob.cs

@@ -27,7 +27,7 @@ public class OnlineUserJob : IJob
 
         var originColor = Console.ForegroundColor;
         Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine("【" + DateTime.Now + "】服务重启清空在线用户");
+        Console.WriteLine("【" + DateTime.Now + "】清空在线用户列表");
         Console.ForegroundColor = originColor;
 
         // 缓存租户列表

Admin.NET/Admin.NET.Core/Service/APIJSON/SelectTable.cs

@@ -3,7 +3,6 @@
 // 必须在法律法规允许的范围内正确使用，严禁将其用于非法、欺诈、恶意或侵犯他人合法权益的目的。
 
 using AspectCore.Extensions.Reflection;
-using Newtonsoft.Json.Linq;
 using System.Dynamic;
 
 namespace Admin.NET.Core.Service;

Admin.NET/Admin.NET.Core/Service/Enum/Dto/EnumOutput.cs

@@ -23,6 +23,7 @@ public class EnumTypeOutput
     /// 枚举类型备注
     /// </summary>
     public string TypeRemark { get; set; }
+
     /// <summary>
     /// 枚举实体
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs

@@ -35,6 +35,11 @@ public class SysEnumService : IDynamicApiController, ITransient
         return result;
     }
 
+    /// <summary>
+    /// 获取字典描述
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
     private EnumTypeOutput GetEnumDescription(Type type)
     {
         string description = type.Name;