Merge branch 'abp-dev' into abp

This commit is contained in:
陈淳
2024-04-29 18:18:04 +08:00

View File

@@ -18,12 +18,11 @@ namespace Yi.Framework.Rbac.Application.Jobs
public class BackupDataBaseJob : QuartzBackgroundWorkerBase public class BackupDataBaseJob : QuartzBackgroundWorkerBase
{ {
private ISqlSugarDbContext _dbContext; private ISqlSugarDbContext _dbContext;
private IOptions<RbacOptions> _options;
public BackupDataBaseJob(ISqlSugarDbContext dbContext, IOptions<RbacOptions> options) public BackupDataBaseJob(ISqlSugarDbContext dbContext, IOptions<RbacOptions> options)
{ {
if (options.Value.EnableDataBaseBackup)
{ _options = options;
return;
}
_dbContext = dbContext; _dbContext = dbContext;
JobDetail = JobBuilder.Create<BackupDataBaseJob>().WithIdentity(nameof(BackupDataBaseJob)).Build(); JobDetail = JobBuilder.Create<BackupDataBaseJob>().WithIdentity(nameof(BackupDataBaseJob)).Build();
@@ -33,14 +32,13 @@ namespace Yi.Framework.Rbac.Application.Jobs
} }
public override Task Execute(IJobExecutionContext context) public override Task Execute(IJobExecutionContext context)
{ {
if (_options.Value.EnableDataBaseBackup)
{
var logger = LoggerFactory.CreateLogger<BackupDataBaseJob>(); var logger = LoggerFactory.CreateLogger<BackupDataBaseJob>();
logger.LogWarning("正在进行数据库备份"); logger.LogWarning("正在进行数据库备份");
_dbContext.BackupDataBase(); _dbContext.BackupDataBase();
logger.LogWarning("数据库备份已完成"); logger.LogWarning("数据库备份已完成");
}
return Task.CompletedTask; return Task.CompletedTask;
} }
} }