Pārlūkot izejas kodu

😁细节调整

zuohuaijun 2 gadi atpakaļ
vecāks
revīzija
7afc973c66

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -53,7 +53,7 @@ public class SysOrg : EntityTenant
     /// 负责人Id
     /// </summary>
     [SugarColumn(ColumnDescription = "负责人Id")]
-    public long DirectorId { get; set; }
+    public long? DirectorId { get; set; }
 
     /// <summary>
     /// 负责人

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -208,7 +208,7 @@ public class SysUser : EntityTenant
     /// 直属主管Id
     /// </summary>
     [SugarColumn(ColumnDescription = "直属主管Id")]
-    public long ManagerUserId { get; set; }
+    public long? ManagerUserId { get; set; }
 
     /// <summary>
     /// 直属主管

+ 1 - 1
Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs

@@ -12,7 +12,7 @@ namespace Admin.NET.Core;
 /// <summary>
 /// 事件订阅
 /// </summary>
-public class AppEventSubscriber : IEventSubscriber, IDisposable
+public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable
 {
     private readonly IServiceScope _serviceScope;
 

+ 1 - 1
Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -26,7 +26,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
             new SysConfig{ Id=1300000000102, Name="默认密码", Code="sys_password", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", OrderNo=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000103, Name="Token过期时间", Code="sys_token_expire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", OrderNo=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000104, Name="操作日志", Code="sys_oplog", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", OrderNo=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=1300000000105, Name="单登录", Code="sys_single_login", Value="False", SysFlag=YesNoEnum.Y, Remark="开启单点登录", OrderNo=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=1300000000105, Name="单设备登录", Code="sys_single_login", Value="False", SysFlag=YesNoEnum.Y, Remark="开启单点登录", OrderNo=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000106, Name="登录二次验证", Code="sys_second_ver", Value="False", SysFlag=YesNoEnum.Y, Remark="登录二次验证", OrderNo=6, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000107, Name="开启图形验证码", Code="sys_captcha", Value="True", SysFlag=YesNoEnum.Y, Remark="开启图形验证码", OrderNo=7, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysConfig{ Id=1300000000108, Name="开启水印", Code="sys_watermark", Value="False", SysFlag=YesNoEnum.Y, Remark="开启水印", OrderNo=8, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

+ 3 - 2
Admin.NET/Admin.NET.Core/Service/Message/SysMessageService.cs

@@ -94,10 +94,11 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// 发送邮件
     /// </summary>
     /// <param name="message"></param>
+    /// <param name="title"></param>
     /// <returns></returns>
     [DisplayName("发送邮件")]
-    public async Task SendEmail([Required] string message)
+    public async Task SendEmail([Required] string message, string title = "系统邮件")
     {
-        await _fluentEmail.To(_emailOptions.DefaultToEmail).Body(message).SendAsync();
+        await _fluentEmail.To(_emailOptions.DefaultToEmail).Subject(title).Body(message).SendAsync();
     }
 }