feat: 完成hangfire支持工作单元

Merge pull request !78 from Po/N/A

Yi.Abp.Net8/Yi.Abp.sln

@@ -156,6 +156,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Abp.Tool.HttpApi.Client"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.SettingManagement.Application", "module\setting-management\Yi.Framework.SettingManagement.Application\Yi.Framework.SettingManagement.Application.csproj", "{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.BackgroundWorkers.Hangfire", "framework\Yi.Framework.BackgroundWorkers.Hangfire\Yi.Framework.BackgroundWorkers.Hangfire.csproj", "{862CA181-BEE6-4870-82D2-B662E527ED8C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -390,6 +392,10 @@ Global
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956}.Release|Any CPU.Build.0 = Release|Any CPU
+		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{862CA181-BEE6-4870-82D2-B662E527ED8C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -459,6 +465,7 @@ Global
 		{4AE84CDE-2A47-4D68-8E93-86193F72E4E8} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
 		{C8F97775-D903-4365-A4FF-3DA97E318CD2} = {084CBEEC-5D37-4716-B9C7-D80D6960DFF4}
 		{2A31D7CB-BDCC-4253-BA73-273B6B5E1956} = {8C68059E-F3B1-4D28-A1C9-A5830F53E5D3}
+		{862CA181-BEE6-4870-82D2-B662E527ED8C} = {77B949E9-530E-45A5-9657-20F7D5C6875C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {23D6FBC9-C970-4641-BC1E-2AEA59F51C18}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/UnitOfWorkHangfireFilter.cs

@@ -0,0 +1,45 @@
+using Hangfire.Server;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Threading;
+using Volo.Abp.Uow;
+
+namespace Yi.Framework.BackgroundWorkers.Hangfire;
+
+public class UnitOfWorkHangfireFilter : IServerFilter, ISingletonDependency
+{
+    private const string CurrentJobUow = "HangfireUnitOfWork";
+    private readonly IUnitOfWorkManager _unitOfWorkManager;
+
+    public UnitOfWorkHangfireFilter(IUnitOfWorkManager unitOfWorkManager)
+    {
+        _unitOfWorkManager = unitOfWorkManager;
+    }
+
+    public void OnPerforming(PerformingContext context)
+    {
+        var uow = _unitOfWorkManager.Begin();
+        context.Items.Add(CurrentJobUow, uow);
+    }
+
+    public void OnPerformed(PerformedContext context)
+    {
+        AsyncHelper.RunSync(()=>OnPerformedAsync(context));
+    }
+
+    private async Task OnPerformedAsync(PerformedContext context)
+    {
+        if (context.Items.TryGetValue(CurrentJobUow, out var obj)
+            && obj is IUnitOfWork uow)
+        {
+            if (context.Exception == null && !uow.IsCompleted)
+            {
+                await uow.CompleteAsync();
+            }
+            else
+            {
+                await uow.RollbackAsync();
+            }
+            uow.Dispose();
+        }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/Yi.Framework.BackgroundWorkers.Hangfire.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" Version="$(AbpVersion)" />
+    </ItemGroup>
+
+
+</Project>

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiFrameworkBackgroundWorkersHangfireModule.cs

@@ -0,0 +1,35 @@
+using Hangfire;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.BackgroundWorkers.Hangfire;
+
+namespace Yi.Framework.BackgroundWorkers.Hangfire;
+
+[DependsOn(typeof(AbpBackgroundWorkersHangfireModule))]
+public class YiFrameworkBackgroundWorkersHangfireModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        context.Services.AddConventionalRegistrar(new YiHangfireConventionalRegistrar());
+    }
+
+    public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
+    {
+        //定时任务自动注入，Abp默认只有在Quartz才实现
+        var backgroundWorkerManager = context.ServiceProvider.GetRequiredService<IBackgroundWorkerManager>();
+        var works = context.ServiceProvider.GetServices<IHangfireBackgroundWorker>();
+
+        foreach (var work in works)
+        {
+            //如果为空，默认使用服务器本地utc时间
+            work.TimeZone ??= TimeZoneInfo.Local;
+            await backgroundWorkerManager.AddAsync(work);
+        }
+    }
+
+    public override void OnPreApplicationInitialization(ApplicationInitializationContext context)
+    {
+        var services = context.ServiceProvider;
+        GlobalJobFilters.Filters.Add(services.GetRequiredService<UnitOfWorkHangfireFilter>());
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiHangfireConventionalRegistrar.cs

@@ -0,0 +1,20 @@
+using Volo.Abp.BackgroundWorkers.Hangfire;
+using Volo.Abp.DependencyInjection;
+
+namespace Yi.Framework.BackgroundWorkers.Hangfire;
+
+public class YiHangfireConventionalRegistrar : DefaultConventionalRegistrar
+{
+    protected override bool IsConventionalRegistrationDisabled(Type type)
+    {
+        return !typeof(IHangfireBackgroundWorker).IsAssignableFrom(type) || base.IsConventionalRegistrationDisabled(type);
+    }
+
+    protected override List<Type> GetExposedServiceTypes(Type type)
+    {
+        return new List<Type>()
+            {
+                typeof(IHangfireBackgroundWorker)
+            };
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.BackgroundWorkers.Hangfire/YiTokenAuthorizationFilter.cs

@@ -0,0 +1,122 @@
+using Hangfire.Dashboard;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Users;
+
+namespace Yi.Framework.BackgroundWorkers.Hangfire;
+
+public class YiTokenAuthorizationFilter : IDashboardAsyncAuthorizationFilter, ITransientDependency
+{
+    private const string Bearer = "Bearer: ";
+    private string RequireUser { get; set; } = "cc";
+    private TimeSpan ExpiresTime { get; set; } = TimeSpan.FromMinutes(10);
+    private IServiceProvider _serviceProvider;
+
+    public YiTokenAuthorizationFilter(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public YiTokenAuthorizationFilter SetRequireUser(string userName)
+    {
+        RequireUser = userName;
+        return this;
+    }
+
+    public YiTokenAuthorizationFilter SetExpiresTime(TimeSpan expiresTime)
+    {
+        ExpiresTime = expiresTime;
+        return this;
+    }
+
+    public bool Authorize(DashboardContext context)
+    {
+        var httpContext = context.GetHttpContext();
+        var _currentUser = _serviceProvider.GetRequiredService<ICurrentUser>();
+        //如果验证通过，设置cookies
+        if (_currentUser.IsAuthenticated)
+        {
+            var cookieOptions = new CookieOptions
+            {
+                Expires = DateTimeOffset.Now + ExpiresTime, // 设置 cookie 过期时间,10分钟
+            };
+
+
+            var authorization = httpContext.Request.Headers["Authorization"].ToString();
+            if (!string.IsNullOrWhiteSpace(authorization))
+            {
+                var token = httpContext.Request.Headers["Authorization"].ToString().Substring(Bearer.Length - 1);
+                httpContext.Response.Cookies.Append("Token", token, cookieOptions);
+            }
+
+            if (_currentUser.UserName == RequireUser)
+            {
+                return true;
+            }
+        }
+
+        SetChallengeResponse(httpContext);
+        return false;
+    }
+
+    private void SetChallengeResponse(HttpContext httpContext)
+    {
+        httpContext.Response.StatusCode = 401;
+        httpContext.Response.ContentType = "text/html; charset=utf-8";
+        string html = """
+                      <!DOCTYPE html>
+                      <html lang="zh">
+                      <head>
+                          <meta charset="UTF-8">
+                          <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                          <title>Token 输入</title>
+                          <script>
+                              function sendToken() {
+                                  // 获取输入的 token
+                                  var token = document.getElementById("tokenInput").value;
+                                  // 构建请求 URL
+                                  var url = "/hangfire";
+                                  // 发送 GET 请求
+                                  fetch(url,{
+                                      headers: {
+                                         'Content-Type': 'application/json', // 设置内容类型为 JSON
+                                         'Authorization': 'Bearer '+encodeURIComponent(token), // 设置授权头，例如使用 Bearer token
+                                        },
+                                      })
+                                      .then(response => {
+                                          if (response.ok) {
+                                              return response.text(); // 或使用 response.json() 如果返回的是 JSON
+                                          }
+                                          throw new Error('Network response was not ok.');
+                                      })
+                                      .then(data => {
+                                          // 处理成功返回的数据
+                                           document.open();
+                                           document.write(data);
+                                           document.close();
+                                      })
+                                      .catch(error => {
+                                          // 处理错误
+                                          console.error('There has been a problem with your fetch operation:', error);
+                                          alert("请求失败: " + error.message);
+                                      });
+                              }
+                          </script>
+                      </head>
+                      <body style="text-align: center;">
+                          <h1>Yi-hangfire</h1>
+                          <h1>输入您的Token，我们将验证您是否为管理员</h1>
+                          <input type="text" id="tokenInput" placeholder="请输入 token" />
+                          <button onclick="sendToken()">校验</button>
+                      </body>
+                      </html>
+                      """;
+        httpContext.Response.WriteAsync(html);
+    }
+
+    public Task<bool> AuthorizeAsync(DashboardContext context)
+    {
+        return Task.FromResult(Authorize(context));
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs

@@ -1,4 +1,5 @@
 using SqlSugar;
+using ArgumentException = System.ArgumentException;
 
 namespace Yi.Framework.SqlSugarCore.Abstractions
 {
@@ -53,6 +54,5 @@ namespace Yi.Framework.SqlSugarCore.Abstractions
         /// 开启Saas多租户
         /// </summary>
         public bool EnabledSaasMultiTenancy { get; set; } = false;
-
     }
-}
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbConnectionCreator.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-
-namespace Yi.Framework.SqlSugarCore.Abstractions
-{
-    public interface ISqlSugarDbConnectionCreator
-    {
-        DbConnOptions Options { get; }
-        Action<ISqlSugarClient> OnSqlSugarClientConfig { get; set; }
-        Action<object, DataAfterModel> DataExecuted { get; set; }
-        Action<object, DataFilterModel> DataExecuting { get; set; }
-        Action<string, SugarParameter[]> OnLogExecuting { get; set; }
-        Action<string, SugarParameter[]> OnLogExecuted { get; set; }
-        Action<PropertyInfo, EntityColumnInfo> EntityService { get; set; }
-
-        ConnectionConfig Build(Action<ConnectionConfig>? action = null);
-        void SetDbAop(ISqlSugarClient currentDb);
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContext.cs

@@ -10,14 +10,14 @@ namespace Yi.Framework.SqlSugarCore.Abstractions
 {
     public interface ISqlSugarDbContext
     {
-        //  IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+        /// <summary>
+        /// SqlSugarDb
+        /// </summary>
         ISqlSugarClient SqlSugarClient { get; }
-        DbConnOptions Options { get; }
 
         /// <summary>
         /// 数据库备份
         /// </summary>
         void BackupDataBase();
-        void SetSqlSugarClient(ISqlSugarClient sqlSugarClient);
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/ISqlSugarDbContextDependencies.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using SqlSugar;
+
+namespace Yi.Framework.SqlSugarCore.Abstractions;
+
+public interface ISqlSugarDbContextDependencies
+{
+    /// <summary>
+    /// 执行顺序
+    /// </summary>
+    int ExecutionOrder { get; }
+    
+    void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient);
+    void DataExecuted(object oldValue, DataAfterModel entityInfo);
+    void DataExecuting(object oldValue, DataFilterModel entityInfo);
+
+    void OnLogExecuting(string sql, SugarParameter[] pars);
+    void OnLogExecuted(string sql, SugarParameter[] pars);
+    
+    void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo);
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/DefaultSqlSugarDbContext.cs

@@ -0,0 +1,207 @@
+using System.Collections;
+using System.Reflection;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using SqlSugar;
+using Volo.Abp.Auditing;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Events;
+using Volo.Abp.Guids;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Users;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.SqlSugarCore;
+
+public class DefaultSqlSugarDbContext : SqlSugarDbContext
+{
+
+    protected DbConnOptions Options => LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
+    protected ICurrentUser CurrentUser => LazyServiceProvider.GetRequiredService<ICurrentUser>();
+    protected IGuidGenerator GuidGenerator => LazyServiceProvider.LazyGetRequiredService<IGuidGenerator>();
+    protected ILoggerFactory Logger => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
+    protected ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
+    protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
+    protected virtual bool IsMultiTenantFilterEnabled => DataFilter?.IsEnabled<IMultiTenant>() ?? false;
+    protected virtual bool IsSoftDeleteFilterEnabled => DataFilter?.IsEnabled<ISoftDelete>() ?? false;
+
+    protected IEntityChangeEventHelper EntityChangeEventHelper =>
+        LazyServiceProvider.LazyGetService<IEntityChangeEventHelper>(NullEntityChangeEventHelper.Instance);
+
+    protected override void CustomDataFilter(ISqlSugarClient sqlSugarClient)
+    {
+        if (IsSoftDeleteFilterEnabled)
+        {
+            sqlSugarClient.QueryFilter.AddTableFilter<ISoftDelete>(u => u.IsDeleted == false);
+        }
+
+        if (IsMultiTenantFilterEnabled)
+        {
+            //表达式里只能有具体值，不能运算
+            var expressionCurrentTenant = CurrentTenant.Id ?? null;
+            sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == expressionCurrentTenant);
+        }
+    }
+
+    public override void DataExecuting(object oldValue, DataFilterModel entityInfo)
+    {
+        //审计日志
+        switch (entityInfo.OperationType)
+        {
+            case DataFilterType.UpdateByObject:
+
+                if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModificationTime)))
+                {
+                    if (!DateTime.MinValue.Equals(oldValue))
+                    {
+                        entityInfo.SetValue(DateTime.Now);
+                    }
+                }
+                else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModifierId)))
+                {
+                    if (typeof(Guid?) == entityInfo.EntityColumnInfo.PropertyInfo.PropertyType)
+                    {
+                        if (CurrentUser.Id != null)
+                        {
+                            entityInfo.SetValue(CurrentUser.Id);
+                        }
+                    }
+                }
+
+                break;
+            case DataFilterType.InsertByObject:
+
+                if (entityInfo.PropertyName.Equals(nameof(IEntity<Guid>.Id)))
+                {
+                    //类型为guid
+                    if (typeof(Guid) == entityInfo.EntityColumnInfo.PropertyInfo.PropertyType)
+                    {
+                        //主键为空或者为默认最小值
+                        if (Guid.Empty.Equals(oldValue))
+                        {
+                            entityInfo.SetValue(GuidGenerator.Create());
+                        }
+                    }
+                }
+
+                else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreationTime)))
+                {
+                    //为空或者为默认最小值
+                    if (DateTime.MinValue.Equals(oldValue))
+                    {
+                        entityInfo.SetValue(DateTime.Now);
+                    }
+                }
+                else if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreatorId)))
+                {
+                    //类型为guid
+                    if (typeof(Guid?) == entityInfo.EntityColumnInfo.PropertyInfo.PropertyType)
+                    {
+                        if (CurrentUser.Id is not null)
+                        {
+                            entityInfo.SetValue(CurrentUser.Id);
+                        }
+                    }
+                }
+
+                else if (entityInfo.PropertyName.Equals(nameof(IMultiTenant.TenantId)))
+                {
+                    if (CurrentTenant.Id is not null)
+                    {
+                        entityInfo.SetValue(CurrentTenant.Id);
+                    }
+                }
+
+                break;
+        }
+
+
+        //领域事件
+        switch (entityInfo.OperationType)
+        {
+            case DataFilterType.InsertByObject:
+                if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                {
+                    EntityChangeEventHelper.PublishEntityCreatedEvent(entityInfo.EntityValue);
+                }
+
+                break;
+            case DataFilterType.UpdateByObject:
+                if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                {
+                    //软删除，发布的是删除事件
+                    if (entityInfo.EntityValue is ISoftDelete softDelete)
+                    {
+                        if (softDelete.IsDeleted == true)
+                        {
+                            EntityChangeEventHelper.PublishEntityDeletedEvent(entityInfo.EntityValue);
+                        }
+                    }
+                    else
+                    {
+                        EntityChangeEventHelper.PublishEntityUpdatedEvent(entityInfo.EntityValue);
+                    }
+                }
+
+                break;
+            case DataFilterType.DeleteByObject:
+                if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
+                {
+                    //这里sqlsugar有个特殊，删除会返回批量的结果
+                    if (entityInfo.EntityValue is IEnumerable entityValues)
+                    {
+                        foreach (var entityValue in entityValues)
+                        {
+                            EntityChangeEventHelper.PublishEntityDeletedEvent(entityValue);
+                        }
+                    }
+                }
+
+                break;
+        }
+    }
+
+    public override void OnLogExecuting(string sql, SugarParameter[] pars)
+    {
+        if (Options.EnabledSqlLog)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine();
+            sb.AppendLine("==========Yi-SQL执行:==========");
+            sb.AppendLine(UtilMethods.GetSqlString(DbType.SqlServer, sql, pars));
+            sb.AppendLine("===============================");
+            Logger.CreateLogger<DefaultSqlSugarDbContext>().LogDebug(sb.ToString());
+        }
+    }
+
+    public override void OnLogExecuted(string sql, SugarParameter[] pars)
+    {
+        if (Options.EnabledSqlLog)
+        {
+            var sqllog = $"=========Yi-SQL耗时{SqlSugarClient.Ado.SqlExecutionTime.TotalMilliseconds}毫秒=====";
+            Logger.CreateLogger<SqlSugarDbContext>().LogDebug(sqllog.ToString());
+        }
+    }
+
+    public override void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo)
+    {
+        if (propertyInfo.Name == nameof(IHasConcurrencyStamp.ConcurrencyStamp)) //带版本号并发更新
+        {
+            entityColumnInfo.IsEnableUpdateVersionValidation = true;
+        }
+
+        if (propertyInfo.PropertyType == typeof(ExtraPropertyDictionary))
+        {
+            entityColumnInfo.IsIgnore = true;
+        }
+
+        if (propertyInfo.Name == nameof(Entity<object>.Id))
+        {
+            entityColumnInfo.IsPrimarykey = true;
+        }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarCoreExtensions.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.SqlSugarCore
+{
+    public static class SqlSugarCoreExtensions
+    {
+        /// <summary>
+        /// 新增db对象，可支持多个
+        /// </summary>
+        /// <param name="service"></param>
+        /// <param name="serviceLifetime"></param>
+        /// <typeparam name="TDbContext"></typeparam>
+        /// <returns></returns>
+        public static IServiceCollection AddYiDbContext<TDbContext>(this IServiceCollection service, ServiceLifetime serviceLifetime = ServiceLifetime.Transient) where TDbContext : class, ISqlSugarDbContextDependencies
+        {
+            service.AddTransient<ISqlSugarDbContextDependencies, TDbContext>();
+            return service;
+        }
+        
+        /// <summary>
+        /// 新增db对象，可支持多个
+        /// </summary>
+        /// <param name="service"></param>
+        /// <param name="options"></param>
+        /// <typeparam name="TDbContext"></typeparam>
+        /// <returns></returns>
+        public static IServiceCollection AddYiDbContext<TDbContext>(this IServiceCollection service, Action<DbConnOptions> options) where TDbContext : class, ISqlSugarDbContextDependencies
+        {
+            service.Configure<DbConnOptions>(options.Invoke);
+            service.AddYiDbContext<TDbContext>();
+            return service;
+        }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs

@@ -1,123 +0,0 @@
-using System.Reflection;
-using Microsoft.Extensions.Options;
-using SqlSugar;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.SqlSugarCore
-{
-
-    public class SqlSugarDbConnectionCreator: ISqlSugarDbConnectionCreator,ITransientDependency
-    {
-        public SqlSugarDbConnectionCreator(IOptions<DbConnOptions> options)
-        {
-            Options = options.Value;
-        }
-        public DbConnOptions Options { get; }
-
-        public void SetDbAop(ISqlSugarClient currentDb)
-        {
-            currentDb.Aop.OnLogExecuting = this.OnLogExecuting;
-            currentDb.Aop.OnLogExecuted = this.OnLogExecuted;
-            currentDb.Aop.DataExecuting = this.DataExecuting;
-            currentDb.Aop.DataExecuted = this.DataExecuted;
-            OnSqlSugarClientConfig(currentDb);
-        }
-
-
-
-        public ConnectionConfig Build(Action<ConnectionConfig>? action=null)
-        {
-            var dbConnOptions = Options;
-            #region 组装options
-            if (dbConnOptions.DbType is null)
-            {
-                throw new ArgumentException("DbType配置为空");
-            }
-            var slavaConFig = new List<SlaveConnectionConfig>();
-            if (dbConnOptions.EnabledReadWrite)
-            {
-                if (dbConnOptions.ReadUrl is null)
-                {
-                    throw new ArgumentException("读写分离为空");
-                }
-
-                var readCon = dbConnOptions.ReadUrl;
-
-                readCon.ForEach(s =>
-                {
-                    //如果是动态saas分库，这里的连接串都不能写死，需要动态添加，这里只配置共享库的连接
-                    slavaConFig.Add(new SlaveConnectionConfig() { ConnectionString = s });
-                });
-            }
-            #endregion
-
-            #region 组装连接config
-            var connectionConfig = new ConnectionConfig()
-            {
-                ConfigId= ConnectionStrings.DefaultConnectionStringName,
-                DbType = dbConnOptions.DbType ?? DbType.Sqlite,
-                ConnectionString = dbConnOptions.Url,
-                IsAutoCloseConnection = true,
-                SlaveConnectionConfigs = slavaConFig,
-                //设置codefirst非空值判断
-                ConfigureExternalServices = new ConfigureExternalServices
-                {
-                    // 处理表
-                    EntityNameService = (type, entity) =>
-                    {
-                        if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_'))
-                            entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName);// 驼峰转下划线
-                    },
-                    EntityService = (c, p) =>
-                    {
-                        if (new NullabilityInfoContext()
-                        .Create(c).WriteState is NullabilityState.Nullable)
-                        {
-                            p.IsNullable = true;
-                        }
-
-                        if (dbConnOptions.EnableUnderLine && !p.IsIgnore && !p.DbColumnName.Contains('_'))
-                            p.DbColumnName = UtilMethods.ToUnderLine(p.DbColumnName);// 驼峰转下划线
-
-                        EntityService(c, p);
-                    }
-                },
-                //这里多租户有个坑，无效的
-                AopEvents = new AopEvents
-                {
-                    DataExecuted = DataExecuted,
-                    DataExecuting = DataExecuting,
-                    OnLogExecuted = OnLogExecuted,
-                    OnLogExecuting = OnLogExecuting
-                }
-
-            };
-
-            if (action is not null)
-            {
-                action.Invoke(connectionConfig);
-            }
-            #endregion
-            return connectionConfig;
-        }
-        [DisablePropertyInjection]
-        public Action<ISqlSugarClient> OnSqlSugarClientConfig { get; set; }
-
-        [DisablePropertyInjection]
-        public Action<object, DataAfterModel> DataExecuted { get; set; }
-
-        [DisablePropertyInjection]
-        public Action<object, DataFilterModel> DataExecuting { get; set; }
-
-        [DisablePropertyInjection]
-        public Action<string, SugarParameter[]> OnLogExecuting { get; set; }
-
-        [DisablePropertyInjection]
-        public Action<string, SugarParameter[]> OnLogExecuted { get; set; }
-
-        [DisablePropertyInjection]
-        public Action<PropertyInfo, EntityColumnInfo> EntityService { get; set; }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContext.cs

@@ -1,362 +1,43 @@
-using System.Collections;
-using System.Reflection;
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
+using System.Reflection;
 using SqlSugar;
-using Volo.Abp.Auditing;
-using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Entities.Events;
-using Volo.Abp.Guids;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Users;
 using Yi.Framework.SqlSugarCore.Abstractions;
-using Check = Volo.Abp.Check;
 
-namespace Yi.Framework.SqlSugarCore
+namespace Yi.Framework.SqlSugarCore;
+
+public abstract class SqlSugarDbContext : ISqlSugarDbContextDependencies
 {
-    public class SqlSugarDbContext : ISqlSugarDbContext
+    //属性注入
+    public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+    protected ISqlSugarClient SqlSugarClient { get;private set; }
+    public int ExecutionOrder => 0;
+
+    public void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient)
     {
-        /// <summary>
-        /// SqlSugar 客户端
-        /// </summary>
-        public ISqlSugarClient SqlSugarClient { get; private set; }
-
-        protected ICurrentUser CurrentUser => LazyServiceProvider.GetRequiredService<ICurrentUser>();
-        private IAbpLazyServiceProvider LazyServiceProvider { get; }
-
-        private IGuidGenerator GuidGenerator => LazyServiceProvider.LazyGetRequiredService<IGuidGenerator>();
-        private ILoggerFactory Logger => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
-        private ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
-        protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
-        protected virtual bool IsMultiTenantFilterEnabled => DataFilter?.IsEnabled<IMultiTenant>() ?? false;
-
-        protected virtual bool IsSoftDeleteFilterEnabled => DataFilter?.IsEnabled<ISoftDelete>() ?? false;
-
-        private IEntityChangeEventHelper EntityChangeEventHelper => LazyServiceProvider.LazyGetService<IEntityChangeEventHelper>(NullEntityChangeEventHelper.Instance);
-        public DbConnOptions Options => LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
-
-        private ISerializeService SerializeService=> LazyServiceProvider.LazyGetRequiredService<ISerializeService>();
-        
-        public void SetSqlSugarClient(ISqlSugarClient sqlSugarClient)
-        {
-            SqlSugarClient = sqlSugarClient;
-        }
-        public SqlSugarDbContext(IAbpLazyServiceProvider lazyServiceProvider)
-        {
-            LazyServiceProvider = lazyServiceProvider;
-            var connectionCreator = LazyServiceProvider.LazyGetRequiredService<ISqlSugarDbConnectionCreator>();
-            connectionCreator.OnSqlSugarClientConfig = OnSqlSugarClientConfig;
-            connectionCreator.EntityService = EntityService;
-            connectionCreator.DataExecuting = DataExecuting;
-            connectionCreator.DataExecuted = DataExecuted;
-            connectionCreator.OnLogExecuting = OnLogExecuting;
-            connectionCreator.OnLogExecuted = OnLogExecuted;
-            SqlSugarClient = new SqlSugarClient(connectionCreator.Build(action: options =>
-            {
-                options.ConnectionString = GetCurrentConnectionString();
-                options.DbType = GetCurrentDbType();
-            }));
-            //统一使用aop处理
-            connectionCreator.SetDbAop(SqlSugarClient);
-            //替换默认序列化器
-            SqlSugarClient.CurrentConnectionConfig.ConfigureExternalServices.SerializeService = SerializeService;
-        }
-
-        /// <summary>
-        /// db切换多库支持
-        /// </summary>
-        /// <returns></returns>
-        protected virtual string GetCurrentConnectionString()
-        {
-            var connectionStringResolver = LazyServiceProvider.LazyGetRequiredService<IConnectionStringResolver>();
-            var connectionString = connectionStringResolver.ResolveAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                Check.NotNull(Options.Url, "dbUrl未配置");
-            }
-            return connectionString!;
-        }
-
-        protected virtual DbType GetCurrentDbType()
-        {
-            if (CurrentTenant.Name is not null)
-            {
-                var dbTypeFromTenantName = GetDbTypeFromTenantName(CurrentTenant.Name);
-                if (dbTypeFromTenantName is not null)
-                {
-                    return dbTypeFromTenantName.Value;
-                }
-            }
-            Check.NotNull(Options.DbType, "默认DbType未配置！");
-            return Options.DbType!.Value;
-        }
-
-        //根据租户name进行匹配db类型:  Test_Sqlite，[来自AI]
-        private DbType? GetDbTypeFromTenantName(string name)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return null;
-            }
-
-            // 查找下划线的位置
-            int underscoreIndex = name.LastIndexOf('_');
-
-            if (underscoreIndex == -1 || underscoreIndex == name.Length - 1)
-            {
-                return null;
-            }
-
-            // 提取 枚举 部分
-            string enumString = name.Substring(underscoreIndex + 1);
-
-            // 尝试将 尾缀 转换为枚举
-            if (Enum.TryParse<DbType>(enumString, out DbType result))
-            {
-                return result;
-            }
-
-            // 条件不满足时返回 null
-            return null;
-        }
-
-
-
-        /// <summary>
-        /// 上下文对象扩展
-        /// </summary>
-        /// <param name="sqlSugarClient"></param>
-        protected virtual void OnSqlSugarClientConfig(ISqlSugarClient sqlSugarClient)
-        {
-            //需自定义扩展
-            if (IsSoftDeleteFilterEnabled)
-            {
-                sqlSugarClient.QueryFilter.AddTableFilter<ISoftDelete>(u => u.IsDeleted == false);
-            }
-            if (IsMultiTenantFilterEnabled)
-            {
-                //表达式里只能有具体值，不能运算
-                var expressionCurrentTenant = CurrentTenant.Id ?? null;
-                sqlSugarClient.QueryFilter.AddTableFilter<IMultiTenant>(u => u.TenantId == expressionCurrentTenant);
-            }
-            CustomDataFilter(sqlSugarClient);
-        }
-        protected virtual void CustomDataFilter(ISqlSugarClient sqlSugarClient)
-        {
-
-        }
-        protected virtual void DataExecuted(object oldValue, DataAfterModel entityInfo)
-        {
-
-        }
-
-        /// <summary>
-        /// 数据
-        /// </summary>
-        /// <param name="oldValue"></param>
-        /// <param name="entityInfo"></param>
-        protected virtual void DataExecuting(object oldValue, DataFilterModel entityInfo)
-        {
-            //审计日志
-            switch (entityInfo.OperationType)
-            {
-                case DataFilterType.UpdateByObject:
-
-                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModificationTime)))
-                    {
-                        if (!DateTime.MinValue.Equals(oldValue))
-                        {
-                            entityInfo.SetValue(DateTime.Now);
-                        }
-                    }
-                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.LastModifierId)))
-                    {
-                        if (CurrentUser.Id != null)
-                        {
-                            entityInfo.SetValue(CurrentUser.Id);
-                        }
-                    }
-                    break;
-                case DataFilterType.InsertByObject:
-                    if (entityInfo.PropertyName.Equals(nameof(IEntity<Guid>.Id)))
-                    {
-                        //主键为空或者为默认最小值
-                        if (Guid.Empty.Equals(oldValue))
-                        {
-                            entityInfo.SetValue(GuidGenerator.Create());
-                        }
-                    }
-
-                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreationTime)))
-                    {
-                        //为空或者为默认最小值
-                        if (DateTime.MinValue.Equals(oldValue))
-                        {
-                            entityInfo.SetValue(DateTime.Now);
-                        }
-                    }
-                    if (entityInfo.PropertyName.Equals(nameof(IAuditedObject.CreatorId)))
-                    {
-                        if (CurrentUser.Id is not null)
-                        {
-                            entityInfo.SetValue(CurrentUser.Id);
-                        }
-                    }
-                    
-                    if (entityInfo.PropertyName.Equals(nameof(IMultiTenant.TenantId)))
-                    {
-                        if (CurrentTenant.Id is not null)
-                        {
-                            entityInfo.SetValue(CurrentTenant.Id);
-                        }
-                    }
-                    break;
-            }
-
-
-            //领域事件
-            switch (entityInfo.OperationType)
-            {
-                case DataFilterType.InsertByObject:
-                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-                    {
-                        EntityChangeEventHelper.PublishEntityCreatedEvent(entityInfo.EntityValue);
-                    }
-                    break;
-                case DataFilterType.UpdateByObject:
-                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-                    {
-                        //软删除，发布的是删除事件
-                        if (entityInfo.EntityValue is ISoftDelete softDelete)
-                        {
-                            if (softDelete.IsDeleted == true)
-                            {
-                                EntityChangeEventHelper.PublishEntityDeletedEvent(entityInfo.EntityValue);
-                            }
-                        }
-                        else
-                        {
-                            EntityChangeEventHelper.PublishEntityUpdatedEvent(entityInfo.EntityValue);
-                        }
-
-                    }
-                    break;
-                case DataFilterType.DeleteByObject:
-                    if (entityInfo.PropertyName == nameof(IEntity<object>.Id))
-                    {
-                        //这里sqlsugar有个特殊，删除会返回批量的结果
-                        if (entityInfo.EntityValue is IEnumerable entityValues)
-                        {
-                            foreach (var entityValue in entityValues)
-                            {
-
-                                EntityChangeEventHelper.PublishEntityDeletedEvent(entityValue);
-                            }
-                        }
-                    }
-                    break;
-            }
-
-        }
-
-        /// <summary>
-        /// 日志
-        /// </summary>
-        /// <param name="sql"></param>
-        /// <param name="pars"></param>
-        protected virtual void OnLogExecuting(string sql, SugarParameter[] pars)
-        {
-            if (Options.EnabledSqlLog)
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.AppendLine();
-                sb.AppendLine("==========Yi-SQL执行:==========");
-                sb.AppendLine(UtilMethods.GetSqlString(DbType.SqlServer, sql, pars));
-                sb.AppendLine("===============================");
-                Logger.CreateLogger<SqlSugarDbContext>().LogDebug(sb.ToString());
-            }
-
-        }
-
-        /// <summary>
-        /// 日志
-        /// </summary>
-        /// <param name="sql"></param>
-        /// <param name="pars"></param>
-        protected virtual void OnLogExecuted(string sql, SugarParameter[] pars)
-        {
-            if (Options.EnabledSqlLog)
-            {
-                var sqllog = $"=========Yi-SQL耗时{SqlSugarClient.Ado.SqlExecutionTime.TotalMilliseconds}毫秒=====";
-                Logger.CreateLogger<SqlSugarDbContext>().LogDebug(sqllog.ToString());
-            }
-        }
-
-        /// <summary>
-        /// 实体配置
-        /// </summary>
-        /// <param name="property"></param>
-        /// <param name="column"></param>
-        protected virtual void EntityService(PropertyInfo property, EntityColumnInfo column)
-        {
-            if (property.Name == nameof(IHasConcurrencyStamp.ConcurrencyStamp)) //带版本号并发更新
-            {
-                // column.IsOnlyIgnoreInsert = true;
-                // column.IsOnlyIgnoreUpdate = true;
-                column.IsEnableUpdateVersionValidation = true;
-            }
-            if (property.PropertyType == typeof(ExtraPropertyDictionary))
-            {
-                column.IsIgnore = true;
-            }
-            if (property.Name == nameof(Entity<object>.Id))
-            {
-                column.IsPrimarykey = true;
-            }
-        }
-
-        public void BackupDataBase()
-        {
-            string directoryName = "database_backup";
-            string fileName = DateTime.Now.ToString($"yyyyMMdd_HHmmss") + $"_{SqlSugarClient.Ado.Connection.Database}";
-            if (!Directory.Exists(directoryName))
-            {
-                Directory.CreateDirectory(directoryName);
-            }
-            switch (Options.DbType)
-            {
-                case DbType.MySql:
-                    //MySql
-                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database, $"{Path.Combine(directoryName, fileName)}.sql");//mysql 只支持.net core
-                    break;
-
-
-                case DbType.Sqlite:
-                    //Sqlite
-                    SqlSugarClient.DbMaintenance.BackupDataBase(null, $"{fileName}.db"); //sqlite 只支持.net core
-                    break;
-
-
-                case DbType.SqlServer:
-                    //SqlServer
-                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database, $"{Path.Combine(directoryName, fileName)}.bak"/*服务器路径*/);//第一个参数库名 
-                    break;
-
-
-                default:
-                    throw new NotImplementedException("其他数据库备份未实现");
-
-            }
-
-
-
-
-
-        }
+        SqlSugarClient = sqlSugarClient;
+        CustomDataFilter(sqlSugarClient);
     }
-}
+    protected virtual void CustomDataFilter(ISqlSugarClient sqlSugarClient)
+    {
+    }
+    
+    public virtual void DataExecuted(object oldValue, DataAfterModel entityInfo)
+    {
+    }
+
+    public virtual void DataExecuting(object oldValue, DataFilterModel entityInfo)
+    {
+    }
+
+    public virtual void OnLogExecuting(string sql, SugarParameter[] pars)
+    {
+    }
+
+    public virtual void OnLogExecuted(string sql, SugarParameter[] pars)
+    {
+    }
+
+    public virtual void EntityService(PropertyInfo propertyInfo, EntityColumnInfo entityColumnInfo)
+    {
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbContextFactory.cs

@@ -0,0 +1,287 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using SqlSugar;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Threading;
+using Volo.Abp.Users;
+using Yi.Framework.SqlSugarCore.Abstractions;
+using Check = Volo.Abp.Check;
+
+namespace Yi.Framework.SqlSugarCore
+{
+    public class SqlSugarDbContextFactory : ISqlSugarDbContext
+    {
+        /// <summary>
+        /// SqlSugar 客户端
+        /// </summary>
+        public ISqlSugarClient SqlSugarClient { get; private set; }
+
+        private IAbpLazyServiceProvider LazyServiceProvider { get; }
+
+        private ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
+        public DbConnOptions Options => LazyServiceProvider.LazyGetRequiredService<IOptions<DbConnOptions>>().Value;
+
+        private ISerializeService SerializeService => LazyServiceProvider.LazyGetRequiredService<ISerializeService>();
+
+        private IEnumerable<ISqlSugarDbContextDependencies> SqlSugarDbContextDependencies =>
+            LazyServiceProvider.LazyGetRequiredService<IEnumerable<ISqlSugarDbContextDependencies>>();
+
+        private static readonly ConcurrentDictionary<string, ConnectionConfig> ConnectionConfigCache = new();
+
+        public SqlSugarDbContextFactory(IAbpLazyServiceProvider lazyServiceProvider)
+        {
+            LazyServiceProvider = lazyServiceProvider;
+
+            var connectionString = GetCurrentConnectionString();
+
+            //获取连接配置操作，需要进行缓存
+            var connectionConfig = ConnectionConfigCache.GetOrAdd(connectionString, (_) =>
+                BuildConnectionConfig(action: options =>
+                {
+                    options.ConnectionString = connectionString;
+                    options.DbType = GetCurrentDbType();
+                }));
+            SqlSugarClient = new SqlSugarClient(connectionConfig);
+            //生命周期，以下都可以直接使用sqlsugardb了
+
+            // Aop及多租户连接字符串和类型，需要单独设置
+            // Aop操作不能进行缓存
+            SetDbAop(SqlSugarClient);
+        }
+
+        /// <summary>
+        /// 构建Aop-sqlsugaraop在多租户模式中，需单独设置
+        /// </summary>
+        /// <param name="sqlSugarClient"></param>
+        protected virtual void SetDbAop(ISqlSugarClient sqlSugarClient)
+        {
+            //替换默认序列化器
+            sqlSugarClient.CurrentConnectionConfig.ConfigureExternalServices.SerializeService = SerializeService;
+
+            //将所有，ISqlSugarDbContextDependencies进行累加
+            Action<string, SugarParameter[]> onLogExecuting = null;
+            Action<string, SugarParameter[]> onLogExecuted = null;
+            Action<object, DataFilterModel> dataExecuting = null;
+            Action<object, DataAfterModel> dataExecuted = null;
+            Action<ISqlSugarClient> onSqlSugarClientConfig = null;
+
+            foreach (var dependency in SqlSugarDbContextDependencies.OrderBy(x => x.ExecutionOrder))
+            {
+                onLogExecuting += dependency.OnLogExecuting;
+                onLogExecuted += dependency.OnLogExecuted;
+                dataExecuting += dependency.DataExecuting;
+                dataExecuted += dependency.DataExecuted;
+
+                onSqlSugarClientConfig += dependency.OnSqlSugarClientConfig;
+            }
+
+            //最先存放db操作
+            onSqlSugarClientConfig(sqlSugarClient);
+
+            sqlSugarClient.Aop.OnLogExecuting =onLogExecuting;
+            sqlSugarClient.Aop.OnLogExecuted = onLogExecuted;
+
+            sqlSugarClient.Aop.DataExecuting =dataExecuting;
+            sqlSugarClient.Aop.DataExecuted =dataExecuted;
+        }
+
+        /// <summary>
+        /// 构建连接配置
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException"></exception>
+        protected virtual ConnectionConfig BuildConnectionConfig(Action<ConnectionConfig>? action = null)
+        {
+            var dbConnOptions = Options;
+
+            #region 组装options
+
+            if (dbConnOptions.DbType is null)
+            {
+                throw new ArgumentException("DbType配置为空");
+            }
+
+            var slavaConFig = new List<SlaveConnectionConfig>();
+            if (dbConnOptions.EnabledReadWrite)
+            {
+                if (dbConnOptions.ReadUrl is null)
+                {
+                    throw new ArgumentException("读写分离为空");
+                }
+
+                var readCon = dbConnOptions.ReadUrl;
+
+                readCon.ForEach(s =>
+                {
+                    //如果是动态saas分库，这里的连接串都不能写死，需要动态添加，这里只配置共享库的连接
+                    slavaConFig.Add(new SlaveConnectionConfig() { ConnectionString = s });
+                });
+            }
+
+            #endregion
+
+            #region 组装连接config
+
+            var connectionConfig = new ConnectionConfig()
+            {
+                ConfigId = ConnectionStrings.DefaultConnectionStringName,
+                DbType = dbConnOptions.DbType ?? DbType.Sqlite,
+                ConnectionString = dbConnOptions.Url,
+                IsAutoCloseConnection = true,
+                SlaveConnectionConfigs = slavaConFig,
+                //设置codefirst非空值判断
+                ConfigureExternalServices = new ConfigureExternalServices
+                {
+                    // 处理表
+                    EntityNameService = (type, entity) =>
+                    {
+                        if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_'))
+                            entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线
+                    },
+                    EntityService = (c, p) =>
+                    {
+                        if (new NullabilityInfoContext()
+                                .Create(c).WriteState is NullabilityState.Nullable)
+                        {
+                            p.IsNullable = true;
+                        }
+
+                        if (dbConnOptions.EnableUnderLine && !p.IsIgnore && !p.DbColumnName.Contains('_'))
+                            p.DbColumnName = UtilMethods.ToUnderLine(p.DbColumnName); // 驼峰转下划线
+
+                        //将所有，ISqlSugarDbContextDependencies的EntityService进行累加
+                        //额外的实体服务需要这里配置，
+
+                        Action<PropertyInfo, EntityColumnInfo> entityService = null;
+                        foreach (var dependency in SqlSugarDbContextDependencies.OrderBy(x => x.ExecutionOrder))
+                        {
+                            entityService += dependency.EntityService;
+                        }
+
+                        entityService(c, p);
+                    }
+                },
+                //这里多租户有个坑，这里配置是无效的
+                // AopEvents = new AopEvents
+                // {
+                //     DataExecuted = DataExecuted,
+                //     DataExecuting = DataExecuting,
+                //     OnLogExecuted = OnLogExecuted,
+                //     OnLogExecuting = OnLogExecuting
+                // }
+            };
+
+            if (action is not null)
+            {
+                action.Invoke(connectionConfig);
+            }
+
+            #endregion
+
+            return connectionConfig;
+        }
+
+        /// <summary>
+        /// db切换多库支持
+        /// </summary>
+        /// <returns></returns>
+        protected virtual string GetCurrentConnectionString()
+        {
+            var connectionStringResolver = LazyServiceProvider.LazyGetRequiredService<IConnectionStringResolver>();
+            var connectionString =
+                AsyncHelper.RunSync(() => connectionStringResolver.ResolveAsync());
+
+            if (string.IsNullOrWhiteSpace(connectionString))
+            {
+                Check.NotNull(Options.Url, "dbUrl未配置");
+            }
+
+            return connectionString!;
+        }
+
+        protected virtual DbType GetCurrentDbType()
+        {
+            if (CurrentTenant.Name is not null)
+            {
+                var dbTypeFromTenantName = GetDbTypeFromTenantName(CurrentTenant.Name);
+                if (dbTypeFromTenantName is not null)
+                {
+                    return dbTypeFromTenantName.Value;
+                }
+            }
+
+            Check.NotNull(Options.DbType, "默认DbType未配置！");
+            return Options.DbType!.Value;
+        }
+
+        //根据租户name进行匹配db类型:  Test_Sqlite，[来自AI]
+        private DbType? GetDbTypeFromTenantName(string name)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                return null;
+            }
+
+            // 查找下划线的位置
+            int underscoreIndex = name.LastIndexOf('_');
+
+            if (underscoreIndex == -1 || underscoreIndex == name.Length - 1)
+            {
+                return null;
+            }
+
+            // 提取 枚举 部分
+            string enumString = name.Substring(underscoreIndex + 1);
+
+            // 尝试将 尾缀 转换为枚举
+            if (Enum.TryParse<DbType>(enumString, out DbType result))
+            {
+                return result;
+            }
+
+            // 条件不满足时返回 null
+            return null;
+        }
+
+
+        public virtual void BackupDataBase()
+        {
+            string directoryName = "database_backup";
+            string fileName = DateTime.Now.ToString($"yyyyMMdd_HHmmss") + $"_{SqlSugarClient.Ado.Connection.Database}";
+            if (!Directory.Exists(directoryName))
+            {
+                Directory.CreateDirectory(directoryName);
+            }
+
+            switch (Options.DbType)
+            {
+                case DbType.MySql:
+                    //MySql
+                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database,
+                        $"{Path.Combine(directoryName, fileName)}.sql"); //mysql 只支持.net core
+                    break;
+
+
+                case DbType.Sqlite:
+                    //Sqlite
+                    SqlSugarClient.DbMaintenance.BackupDataBase(null, $"{fileName}.db"); //sqlite 只支持.net core
+                    break;
+
+
+                case DbType.SqlServer:
+                    //SqlServer
+                    SqlSugarClient.DbMaintenance.BackupDataBase(SqlSugarClient.Ado.Connection.Database,
+                        $"{Path.Combine(directoryName, fileName)}.bak" /*服务器路径*/); //第一个参数库名 
+                    break;
+
+
+                default:
+                    throw new NotImplementedException("其他数据库备份未实现");
+            }
+        }
+    }
+}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlsugarCoreExtensions.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.SqlSugarCore
-{
-    public static class SqlsugarCoreExtensions
-    {
-        public static IServiceCollection AddYiDbContext<DbContext>(this IServiceCollection service, ServiceLifetime serviceLifetime = ServiceLifetime.Transient) where DbContext : class, ISqlSugarDbContext
-        {
-            service.Replace(new ServiceDescriptor(typeof(ISqlSugarDbContext), typeof(DbContext), serviceLifetime));
-            return service;
-        }
-        public static IServiceCollection TryAddYiDbContext<DbContext>(this IServiceCollection service, ServiceLifetime serviceLifetime = ServiceLifetime.Transient) where DbContext : class, ISqlSugarDbContext
-        {
-            service.TryAdd(new ServiceDescriptor(typeof(ISqlSugarDbContext), typeof(DbContext), serviceLifetime));
-            return service;
-        }
-
-
-        public static IServiceCollection AddYiDbContext<DbContext>(this IServiceCollection service, Action<DbConnOptions> options) where DbContext : class, ISqlSugarDbContext
-        {
-
-            service.Configure<DbConnOptions>(ops =>
-            {
-                options.Invoke(ops);
-            });
-            service.AddYiDbContext<DbContext>();
-            return service;
-        }
-    }
-}

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Uow/UnitOfWorkSqlsugarDbContextProvider.cs

@@ -13,8 +13,6 @@ namespace Yi.Framework.SqlSugarCore.Uow
 {
     public class UnitOfWorkSqlsugarDbContextProvider<TDbContext> : ISugarDbContextProvider<TDbContext> where TDbContext : ISqlSugarDbContext
     {
-        private readonly ISqlSugarDbConnectionCreator _dbConnectionCreator;
-
         public ILogger<UnitOfWorkSqlsugarDbContextProvider<TDbContext>> Logger { get; set; }
         public IServiceProvider ServiceProvider { get; set; }
 
@@ -28,8 +26,7 @@ namespace Yi.Framework.SqlSugarCore.Uow
             IUnitOfWorkManager unitOfWorkManager,
             IConnectionStringResolver connectionStringResolver,
             ICancellationTokenProvider cancellationTokenProvider,
-            ICurrentTenant currentTenant,
-            ISqlSugarDbConnectionCreator dbConnectionCreator
+            ICurrentTenant currentTenant
         )
         {
             UnitOfWorkManager = unitOfWorkManager;
@@ -37,7 +34,6 @@ namespace Yi.Framework.SqlSugarCore.Uow
             CancellationTokenProvider = cancellationTokenProvider;
             CurrentTenant = currentTenant;
             Logger = NullLogger<UnitOfWorkSqlsugarDbContextProvider<TDbContext>>.Instance;
-            _dbConnectionCreator = dbConnectionCreator;
         }
 
         //private static object _databaseApiLock = new object();

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs

@@ -6,12 +6,9 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using SqlSugar;
-using Volo.Abp;
-using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Modularity;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.SqlSugarCore.Repositories;
 using Yi.Framework.SqlSugarCore.Uow;
@@ -28,7 +25,7 @@ namespace Yi.Framework.SqlSugarCore
             var section = configuration.GetSection("DbConnOptions");
             Configure<DbConnOptions>(section);
 
-            service.TryAddScoped<ISqlSugarDbContext, SqlSugarDbContext>();
+            service.TryAddScoped<ISqlSugarDbContext, SqlSugarDbContextFactory>();
 
             //不开放sqlsugarClient
             //service.AddTransient<ISqlSugarClient>(x => x.GetRequiredService<ISqlsugarDbContext>().SqlSugarClient);
@@ -47,6 +44,7 @@ namespace Yi.Framework.SqlSugarCore
             //将默认db传递给abp连接字符串模块
             Configure<AbpDbConnectionOptions>(x => { x.ConnectionStrings.Default = dbConfig.Url; });
 
+             context.Services.AddYiDbContext<DefaultSqlSugarDbContext>();
             return Task.CompletedTask;
         }
 
@@ -72,7 +70,6 @@ namespace Yi.Framework.SqlSugarCore
 
 
             logger.LogInformation(sb.ToString());
-            //Todo：准备支持多租户种子数据及CodeFirst
 
             if (options.EnabledCodeFirst)
             {

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogCacheJob.cs

@@ -1,8 +1,8 @@
 using FreeRedis;
+using Hangfire;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
-using Quartz;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
@@ -15,23 +15,27 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.Bbs.Application.Jobs;
 
-public class AccessLogCacheJob : QuartzBackgroundWorkerBase
+public class AccessLogCacheJob : HangfireBackgroundWorkerBase
 {
     private readonly ILocalEventBus _localEventBus;
 
     public AccessLogCacheJob(ILocalEventBus localEventBus)
     {
         _localEventBus = localEventBus;
-        JobDetail = JobBuilder.Create<AccessLogCacheJob>().WithIdentity(nameof(AccessLogCacheJob))
-            .Build();
+        RecurringJobId = "访问日志写入缓存";
+        //每10秒执行一次，将本地缓存转入redis，防止丢数据
+        CronExpression = "*/10 * * * * *";
+        //
+        // JobDetail = JobBuilder.Create<AccessLogCacheJob>().WithIdentity(nameof(AccessLogCacheJob))
+        //     .Build();
 
         //每10秒执行一次，将本地缓存转入redis，防止丢数据
-        Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogCacheJob))
-            .WithSimpleSchedule((schedule) => { schedule.WithInterval(TimeSpan.FromSeconds(10)).RepeatForever();; })
-            .Build();
+        // Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogCacheJob))
+        //     .WithSimpleSchedule((schedule) => { schedule.WithInterval(TimeSpan.FromSeconds(10)).RepeatForever();; })
+        //     .Build();
     }
-
-    public override async Task Execute(IJobExecutionContext context)
+    
+    public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
         await _localEventBus.PublishAsync(new AccessLogResetArgs());
     }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogStoreJob.cs

@@ -1,11 +1,9 @@
 using FreeRedis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
-using Quartz;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Shared.Caches;
 using Yi.Framework.Bbs.Domain.Shared.Enums;
@@ -13,7 +11,7 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.Bbs.Application.Jobs;
 
-public class AccessLogStoreJob : QuartzBackgroundWorkerBase
+public class AccessLogStoreJob : HangfireBackgroundWorkerBase
 {
     private readonly ISqlSugarRepository<AccessLogAggregateRoot> _repository;
 
@@ -45,18 +43,23 @@ public class AccessLogStoreJob : QuartzBackgroundWorkerBase
     public AccessLogStoreJob(ISqlSugarRepository<AccessLogAggregateRoot> repository)
     {
         _repository = repository;
-        JobDetail = JobBuilder.Create<AccessLogStoreJob>().WithIdentity(nameof(AccessLogStoreJob))
-            .Build();
+
         
+        RecurringJobId = "访问日志写入数据库";
         //每分钟执行一次
-        Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogStoreJob))
-            .WithCronSchedule("0 * * * * ?")
-            .Build();
+        CronExpression = "0 * * * * ?";
+        // JobDetail = JobBuilder.Create<AccessLogStoreJob>().WithIdentity(nameof(AccessLogStoreJob))
+        //     .Build();
+        // //每分钟执行一次
+        // Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogStoreJob))
+        //     .WithCronSchedule("0 * * * * ?")
+        //     .Build();
         
     
     }
+    
 
-    public override async Task Execute(IJobExecutionContext context)
+    public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
         if (EnableRedisCache)
         {

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AssignmentExpireTimeOutJob.cs

@@ -1,5 +1,4 @@
-using Quartz;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Yi.Framework.Bbs.Domain.Managers;
 
 namespace Yi.Framework.Bbs.Application.Jobs;
@@ -7,20 +6,25 @@ namespace Yi.Framework.Bbs.Application.Jobs;
 /// <summary>
 /// 每日任务job
 /// </summary>
-public class AssignmentExpireTimeOutJob : QuartzBackgroundWorkerBase
+public class AssignmentExpireTimeOutJob : HangfireBackgroundWorkerBase
 {
     private readonly AssignmentManager _assignmentManager;
 
     public AssignmentExpireTimeOutJob(AssignmentManager assignmentManager)
     {
         _assignmentManager = assignmentManager;
-        JobDetail = JobBuilder.Create<AssignmentExpireTimeOutJob>().WithIdentity(nameof(AssignmentExpireTimeOutJob)).Build();
-        //每个小时整点执行一次
-        Trigger = TriggerBuilder.Create().WithIdentity(nameof(AssignmentExpireTimeOutJob)).WithCronSchedule("0 0 * * * ?")
-            .Build();
+        
+        RecurringJobId = "每日任务系统超时检测";
+        //每分钟执行一次
+        CronExpression = "0 * * * * ?";
+        //
+        // JobDetail = JobBuilder.Create<AssignmentExpireTimeOutJob>().WithIdentity(nameof(AssignmentExpireTimeOutJob)).Build();
+        // //每个小时整点执行一次
+        // Trigger = TriggerBuilder.Create().WithIdentity(nameof(AssignmentExpireTimeOutJob)).WithCronSchedule("0 0 * * * ?")
+        //     .Build();
     }
-
-    public override async Task Execute(IJobExecutionContext context)
+    
+    public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
         await _assignmentManager.ExpireTimeoutAsync();
     }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/InterestRecordsJob.cs

@@ -1,20 +1,24 @@
-using Quartz;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Yi.Framework.Bbs.Domain.Managers;
 
 namespace Yi.Framework.Bbs.Application.Jobs
 {
-    public class InterestRecordsJob : QuartzBackgroundWorkerBase
+    public class InterestRecordsJob : HangfireBackgroundWorkerBase
     {
         private BankManager _bankManager;
         public InterestRecordsJob(BankManager bankManager)
         {
             _bankManager = bankManager;
-            JobDetail = JobBuilder.Create<InterestRecordsJob>().WithIdentity(nameof(InterestRecordsJob)).Build();
-
+            
+            RecurringJobId = "银行利息积分刷新";
             //每个小时整点执行一次
-
-            Trigger = TriggerBuilder.Create().WithIdentity(nameof(InterestRecordsJob)).WithCronSchedule("0 0 * * * ?").Build();
+            CronExpression = "0 0 * * * ?";
+            
+            // JobDetail = JobBuilder.Create<InterestRecordsJob>().WithIdentity(nameof(InterestRecordsJob)).Build();
+            //
+            // //每个小时整点执行一次
+            //
+            // Trigger = TriggerBuilder.Create().WithIdentity(nameof(InterestRecordsJob)).WithCronSchedule("0 0 * * * ?").Build();
 
             //测试
             //            Trigger = TriggerBuilder.Create().WithIdentity(nameof(InterestRecordsJob))
@@ -23,7 +27,8 @@ namespace Yi.Framework.Bbs.Application.Jobs
             //    .RepeatForever())
             //.Build();
         }
-        public override async Task Execute(IJobExecutionContext context)
+
+        public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
             //创建一个记录，莫得了
             await _bankManager.GetCurrentInterestRate();

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/BbsUserInfoService.cs

@@ -27,13 +27,19 @@ namespace Yi.Framework.Bbs.Application.Services
                 var userEntity = await _bbsUserManager._userRepository.GetFirstAsync(x => x.UserName == userNameOrUserId);
                 if (userEntity == null)
                 {
-                    throw new Volo.Abp.UserFriendlyException("该用户不存在");
+                    throw new UserFriendlyException("该用户不存在");
                 }
                 userId= userEntity.Id;
             }
 
             var output =await _bbsUserManager.GetBbsUserInfoAsync(userId);
-
+           
+            //不是自己
+            if (CurrentUser.Id != output.Id)
+            {
+                output.Phone = null;
+                output.Email=null;
+            }
             return output!;
         }
     }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs

@@ -136,6 +136,11 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
         [Authorize]
         public override async Task<CommentGetOutputDto> CreateAsync(CommentCreateInputVo input)
         {
+            if (string.IsNullOrWhiteSpace(input.Content)|| input.Content=="<p><br></p>")
+            {
+                throw new UserFriendlyException("评论不能为空");
+            }
+            
             var discuess = await _discussRepository.GetFirstAsync(x => x.Id == input.DiscussId);
             if (discuess is null)
             {

Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/UserMessageManager.cs

@@ -78,7 +78,12 @@ namespace Yi.Framework.ChatHub.Domain.Managers
         public async Task<ChatOnlineUserCacheItem?> GetUserAsync(Guid userId)
         {
             var key = new ChatOnlineUserCacheKey(CacheKeyPrefix);
-            var cacheUser = System.Text.Json.JsonSerializer.Deserialize<ChatOnlineUserCacheItem>(await RedisClient.HGetAsync(key.GetKey(), key.GetField(userId)));
+           var cacheUserOrNull= await RedisClient.HGetAsync(key.GetKey(), key.GetField(userId));
+           if (cacheUserOrNull is null)
+           {
+               return null;
+           }
+            var cacheUser = System.Text.Json.JsonSerializer.Deserialize<ChatOnlineUserCacheItem>(cacheUserOrNull);
             return cacheUser;
         }
     }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Jobs/BackupDataBaseJob.cs

@@ -6,16 +6,14 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Quartz;
-using Quartz.Logging;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Domain.Repositories;
 using Yi.Framework.Rbac.Domain.Shared.Options;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.Rbac.Application.Jobs
 {
-    public class BackupDataBaseJob : QuartzBackgroundWorkerBase
+    public class BackupDataBaseJob: HangfireBackgroundWorkerBase
     {
         private ISqlSugarDbContext _dbContext;
         private IOptions<RbacOptions> _options;
@@ -24,13 +22,12 @@ namespace Yi.Framework.Rbac.Application.Jobs
 
             _options = options;
             _dbContext = dbContext;
-            JobDetail = JobBuilder.Create<BackupDataBaseJob>().WithIdentity(nameof(BackupDataBaseJob)).Build();
-
+            
+            RecurringJobId = "数据库备份";
             //每天00点与24点进行备份
-            Trigger = TriggerBuilder.Create().WithIdentity(nameof(BackupDataBaseJob)).WithCronSchedule("0 0 0,12 * * ? ").Build();
-            //Trigger = TriggerBuilder.Create().WithIdentity(nameof(BackupDataBaseJob)).WithSimpleSchedule(x=>x.WithIntervalInSeconds(10)).Build();
+            CronExpression = "0 0 0,12 * * ? ";
         }
-        public override Task Execute(IJobExecutionContext context)
+        public override Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
             if (_options.Value.EnableDataBaseBackup)
             {

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs

@@ -20,14 +20,15 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
     /// </summary>
     public class AuthService : YiCrudAppService<AuthAggregateRoot, AuthOutputDto, Guid, AuthGetListInput>
     {
-        private HttpContext HttpContext { get; set; }
+        private HttpContext? HttpContext { get; set; }
         private ILogger<AuthService> _logger;
         private ISqlSugarRepository<AuthAggregateRoot, Guid> _repository;
         private IAccountManager _accountManager;
         public AuthService(IAccountManager accountManager, IHttpContextAccessor httpContextAccessor, ILogger<AuthService> logger, ISqlSugarRepository<AuthAggregateRoot, Guid> repository) : base(repository)
         {
             _logger = logger;
-            HttpContext = httpContextAccessor.HttpContext ?? throw new ApplicationException("未注册Http");
+            //可能为空
+            HttpContext = httpContextAccessor.HttpContext;
             _repository = repository;
             _accountManager = accountManager;
         }
@@ -79,6 +80,10 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
 
         private async Task<(string, string)> GetOpenIdAndNameAsync(string scheme)
         {
+            if (HttpContext is null)
+            {
+                throw new AggregateException("HttpContext 参数为空");
+            }
             var authenticateResult = await HttpContext.AuthenticateAsync(scheme);
             if (!authenticateResult.Succeeded)
             {

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/TaskService.cs

@@ -1,220 +0,0 @@
-using System.Reflection;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Quartz;
-using Quartz.Impl.Matchers;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Timing;
-using Yi.Framework.Rbac.Application.Contracts.Dtos.Task;
-using Yi.Framework.Rbac.Application.Contracts.IServices;
-using Yi.Framework.Rbac.Domain.Shared.Enums;
-
-namespace Yi.Framework.Rbac.Application.Services.Monitor
-{
-    public class TaskService : ApplicationService, ITaskService
-    {
-        private readonly ISchedulerFactory _schedulerFactory;
-        private readonly IClock _clock;
-        public TaskService(ISchedulerFactory schedulerFactory, IClock clock)
-        {
-            _clock = clock;
-            _schedulerFactory = schedulerFactory;
-        }
-
-
-        /// <summary>
-        /// 单查job
-        /// </summary>
-        /// <param name="jobId"></param>
-        /// <returns></returns>
-        [HttpGet("task/{jobId}")]
-        public async Task<TaskGetOutput> GetAsync([FromRoute] string jobId)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-
-            var jobDetail = await scheduler.GetJobDetail(new JobKey(jobId));
-            var trigger = (await scheduler.GetTriggersOfJob(new JobKey(jobId))).First();
-            //状态
-            var state = await scheduler.GetTriggerState(trigger.Key);
-
-
-            var output = new TaskGetOutput
-            {
-                JobId = jobDetail.Key.Name,
-                GroupName = jobDetail.Key.Group,
-                JobType = jobDetail.JobType.Name,
-                Properties = Newtonsoft.Json.JsonConvert.SerializeObject(jobDetail.JobDataMap),
-                Concurrent = !jobDetail.ConcurrentExecutionDisallowed,
-                Description = jobDetail.Description,
-                LastRunTime = _clock.Normalize(trigger.GetPreviousFireTimeUtc()?.DateTime ?? DateTime.MinValue),
-                NextRunTime = _clock.Normalize(trigger.GetNextFireTimeUtc()?.DateTime ?? DateTime.MinValue),
-                AssemblyName = jobDetail.JobType.Assembly.GetName().Name,
-                Status = state.ToString()
-            };
-
-            if (trigger is ISimpleTrigger simple)
-            {
-                output.TriggerArgs = Math.Round(simple.RepeatInterval.TotalMinutes, 2).ToString() + "分钟";
-                output.Type = JobTypeEnum.Millisecond;
-                output.Millisecond = simple.RepeatInterval.TotalMilliseconds;
-            }
-            else if (trigger is ICronTrigger cron)
-            {
-                output.TriggerArgs = cron.CronExpressionString!;
-                output.Type = JobTypeEnum.Cron;
-                output.Cron = cron.CronExpressionString;
-            }
-            return output;
-        }
-
-        /// <summary>
-        /// 多查job
-        /// </summary>
-        /// <returns></returns>
-        public async Task<PagedResultDto<TaskGetListOutput>> GetListAsync([FromQuery] TaskGetListInput input)
-        {
-            var items = new List<TaskGetOutput>();
-
-            var scheduler = await _schedulerFactory.GetScheduler();
-
-            var groups = await scheduler.GetJobGroupNames();
-
-            foreach (var groupName in groups)
-            {
-                foreach (var jobKey in await scheduler.GetJobKeys(GroupMatcher<JobKey>.GroupEquals(groupName)))
-                {
-                    string jobName = jobKey.Name;
-                    string jobGroup = jobKey.Group;
-                    var triggers = (await scheduler.GetTriggersOfJob(jobKey)).First();
-                    items.Add(await GetAsync(jobName));
-                }
-            }
-
-
-            var output = items.Skip((input.SkipCount - 1) * input.MaxResultCount).Take(input.MaxResultCount)
-                .OrderByDescending(x => x.LastRunTime)
-                .ToList();
-            return new PagedResultDto<TaskGetListOutput>(items.Count(), output.Adapt<List<TaskGetListOutput>>());
-        }
-
-        /// <summary>
-        /// 创建job
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public async Task CreateAsync(TaskCreateInput input)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-
-            //设置启动时执行一次，然后最大只执行一次
-
-
-            //jobBuilder
-            var jobClassType = Assembly.Load(input.AssemblyName).GetTypes().Where(x => x.Name == input.JobType).FirstOrDefault();
-
-            if (jobClassType is null)
-            {
-                throw new UserFriendlyException($"程序集：{input.AssemblyName}，{input.JobType} 不存在");
-            }
-
-            var jobBuilder = JobBuilder.Create(jobClassType).WithIdentity(new JobKey(input.JobId, input.GroupName))
-                .WithDescription(input.Description);
-            if (!input.Concurrent)
-            {
-                jobBuilder.DisallowConcurrentExecution();
-            }
-
-            //triggerBuilder
-            TriggerBuilder triggerBuilder = null;
-            switch (input.Type)
-            {
-                case JobTypeEnum.Cron:
-                    triggerBuilder =
-                       TriggerBuilder.Create()
-                       .WithCronSchedule(input.Cron);
-
-
-
-
-                    break;
-                case JobTypeEnum.Millisecond:
-                    triggerBuilder =
-                     TriggerBuilder.Create().StartNow()
-                                            .WithSimpleSchedule(x => x
-                                            .WithInterval(TimeSpan.FromMilliseconds(input.Millisecond ?? 10000))
-                                            .RepeatForever()
-                                            );
-                    break;
-            }
-
-            //作业计划,单个jobBuilder与多个triggerBuilder组合
-            await scheduler.ScheduleJob(jobBuilder.Build(), triggerBuilder.Build());
-        }
-
-        /// <summary>
-        /// 移除job
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public async Task DeleteAsync(IEnumerable<string> id)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-            await scheduler.DeleteJobs(id.Select(x => new JobKey(x)).ToList());
-        }
-
-        /// <summary>
-        /// 暂停job
-        /// </summary>
-        /// <param name="jobId"></param>
-        /// <returns></returns>
-        [HttpPut]
-        public async Task PauseAsync(string jobId)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-            await scheduler.PauseJob(new JobKey(jobId));
-        }
-
-        /// <summary>
-        /// 开始job
-        /// </summary>
-        /// <param name="jobId"></param>
-        /// <returns></returns>
-        [HttpPut]
-        public async Task StartAsync(string jobId)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-            await scheduler.ResumeJob(new JobKey(jobId));
-        }
-
-        /// <summary>
-        /// 更新job
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public async Task UpdateAsync(string id, TaskUpdateInput input)
-        {
-            await DeleteAsync(new List<string>() { id });
-            await CreateAsync(input.Adapt<TaskCreateInput>());
-        }
-
-        [HttpPost("task/run-once/{id}")]
-        public async Task RunOnceAsync([FromRoute] string id)
-        {
-            var scheduler = await _schedulerFactory.GetScheduler();
-            var jobDetail = await scheduler.GetJobDetail(new JobKey(id));
-
-            var jobBuilder = JobBuilder.Create(jobDetail.JobType).WithIdentity(new JobKey(Guid.NewGuid().ToString()));
-            //设置启动时执行一次，然后最大只执行一次
-            var trigger = TriggerBuilder.Create().WithIdentity(Guid.NewGuid().ToString()).StartNow()
-                .WithSimpleSchedule(x => x
-               .WithIntervalInHours(1)
-                .WithRepeatCount(1))
-              .Build();
-
-            await scheduler.ScheduleJob(jobBuilder.Build(), trigger);
-        }
-    }
-}

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj

@@ -10,13 +10,15 @@
   <ItemGroup>
 	  <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
 	  <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
-	  <PackageReference Include="Volo.Abp.BackgroundWorkers.Quartz" Version="$(AbpVersion)" />
+	  <PackageReference Include="Volo.Abp.BackgroundJobs.Hangfire" Version="$(AbpVersion)" />
+	 
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Ddd.Application\Yi.Framework.Ddd.Application.csproj" />
     <ProjectReference Include="..\Yi.Framework.Rbac.Application.Contracts\Yi.Framework.Rbac.Application.Contracts.csproj" />
     <ProjectReference Include="..\Yi.Framework.Rbac.Domain\Yi.Framework.Rbac.Domain.csproj" />
+	  <ProjectReference Include="..\..\..\framework\Yi.Framework.BackgroundWorkers.Hangfire\Yi.Framework.BackgroundWorkers.Hangfire.csproj" />
   </ItemGroup>
 
 </Project>

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Modularity;
 using Yi.Framework.Ddd.Application;
 using Yi.Framework.Rbac.Application.Contracts;
@@ -16,8 +16,7 @@ namespace Yi.Framework.Rbac.Application
         typeof(YiFrameworkRbacDomainModule),
 
 
-        typeof(YiFrameworkDddApplicationModule),
-       typeof(AbpBackgroundWorkersQuartzModule)
+        typeof(YiFrameworkDddApplicationModule)
         )]
     public class YiFrameworkRbacApplicationModule : AbpModule
     {
@@ -28,7 +27,6 @@ namespace Yi.Framework.Rbac.Application
             service.AddCaptcha(options =>
             {
                 options.CaptchaType = CaptchaType.ARITHMETIC;
-
             });
         }
 

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiFrameworkRbacSqlSugarCoreModule.cs

@@ -15,7 +15,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.TryAddYiDbContext<YiRbacDbContext>();
+            context.Services.AddYiDbContext<YiRbacDbContext>();
         }
     }
 }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/YiRbacDbContext.cs

@@ -1,5 +1,7 @@
-using SqlSugar;
-using Volo.Abp.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+using Volo.Abp.Data;
+using Volo.Abp.Users;
 using Yi.Framework.Rbac.Domain.Authorization;
 using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.Rbac.Domain.Extensions;
@@ -11,19 +13,14 @@ namespace Yi.Framework.Rbac.SqlSugarCore
 {
     public class YiRbacDbContext : SqlSugarDbContext
     {
-        public YiRbacDbContext(IAbpLazyServiceProvider lazyServiceProvider) : base(lazyServiceProvider)
-        {
-        }
-
+        protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
+        protected ICurrentUser CurrentUser => LazyServiceProvider.GetRequiredService<ICurrentUser>();
         protected override void CustomDataFilter(ISqlSugarClient sqlSugarClient)
         {
             if (DataFilter.IsEnabled<IDataPermission>())
             {
                 DataPermissionFilter(sqlSugarClient);
             }
-
-
-            base.CustomDataFilter(sqlSugarClient);
         }
 
 

Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs

@@ -1,15 +1,13 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Quartz;
-using Quartz.Logging;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Data;
 using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Abp.Application.Jobs
 {
-    public class DemoResetJob : QuartzBackgroundWorkerBase
+    public class DemoResetJob  : HangfireBackgroundWorkerBase
     {
         private ISqlSugarDbContext _dbContext;
         private ILogger<DemoResetJob> _logger => LoggerFactory.CreateLogger<DemoResetJob>();
@@ -18,15 +16,15 @@ namespace Yi.Abp.Application.Jobs
         public DemoResetJob(ISqlSugarDbContext dbContext, IDataSeeder dataSeeder, IConfiguration configuration)
         {
             _dbContext = dbContext;
-            JobDetail = JobBuilder.Create<DemoResetJob>().WithIdentity(nameof(DemoResetJob)).Build();
-
-            //每天01点与13点,演示环境进行重置
-            Trigger = TriggerBuilder.Create().WithIdentity(nameof(DemoResetJob)).WithCronSchedule("0 0 1,13 * * ? ").Build();
-           // Trigger = TriggerBuilder.Create().WithIdentity(nameof(DemoResetJob)).WithSimpleSchedule(x=>x.WithIntervalInSeconds(10)).Build();
+            RecurringJobId = "重置demo环境";
+            //每天1点和13点进行重置demo环境
+            CronExpression = "0 0 1,13 * * ?";
+           
             _dataSeeder = dataSeeder;
             _configuration = configuration;
         }
-        public override async Task Execute(IJobExecutionContext context)
+        
+        public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
             //开启演示环境重置功能
             if (_configuration.GetSection("EnableDemoReset").Get<bool>())
@@ -50,7 +48,6 @@ namespace Yi.Abp.Application.Jobs
 
             }
 
-
         }
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs

@@ -1,6 +1,6 @@
-using Quartz;
+using Hangfire;
 using SqlSugar;
-using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.BackgroundWorkers.Hangfire;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Uow;
 using Yi.Framework.Rbac.Domain.Entities;
@@ -11,26 +11,21 @@ namespace Yi.Abp.Application.Jobs
     /// <summary>
     /// 定时任务
     /// </summary>
-    public class TestJob : QuartzBackgroundWorkerBase
+    public class TestJob : HangfireBackgroundWorkerBase
     {
         private ISqlSugarRepository<UserAggregateRoot> _repository;
         public TestJob(ISqlSugarRepository<UserAggregateRoot> repository)
         {
             _repository = repository;
-            JobDetail = JobBuilder.Create<TestJob>().WithIdentity(nameof(TestJob)).Build();
-            Trigger = TriggerBuilder.Create().WithIdentity(nameof(TestJob)).StartNow()
-            .WithSimpleSchedule(x => x
-                .WithIntervalInSeconds(1000 * 60)
-                .RepeatForever())
-            .Build();
+            RecurringJobId = "测试";
+            //每天一次
+            CronExpression = Cron.Daily();
         }
-        public override async Task Execute(IJobExecutionContext context)
+        public override Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
             //定时任务，非常简单
             Console.WriteLine("你好，世界");
-            // var eneities= await _repository.GetListAsync();
-            //var entities=   await _sqlSugarClient.Queryable<UserEntity>().ToListAsync();
-            //await Console.Out.WriteLineAsync(entities.Count().ToString());
+            return Task.CompletedTask;
         }
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj

@@ -3,6 +3,7 @@
 
 
   <ItemGroup>
+    <ProjectReference Include="..\..\framework\Yi.Framework.BackgroundWorkers.Hangfire\Yi.Framework.BackgroundWorkers.Hangfire.csproj" />
     <ProjectReference Include="..\..\framework\Yi.Framework.Ddd.Application\Yi.Framework.Ddd.Application.csproj" />
     <ProjectReference Include="..\..\module\bbs\Yi.Framework.Bbs.Application\Yi.Framework.Bbs.Application.csproj" />
     <ProjectReference Include="..\..\module\chat-hub\Yi.Framework.ChatHub.Application\Yi.Framework.ChatHub.Application.csproj" />

Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs

@@ -1,6 +1,7 @@
 using Volo.Abp.SettingManagement;
 using Yi.Abp.Application.Contracts;
 using Yi.Abp.Domain;
+using Yi.Framework.BackgroundWorkers.Hangfire;
 using Yi.Framework.Bbs.Application;
 using Yi.Framework.ChatHub.Application;
 using Yi.Framework.CodeGen.Application;
@@ -23,7 +24,8 @@ namespace Yi.Abp.Application
         typeof(YiFrameworkCodeGenApplicationModule),
         typeof (YiFrameworkSettingManagementApplicationModule),
 
-        typeof(YiFrameworkDddApplicationModule)
+        typeof(YiFrameworkDddApplicationModule),
+        typeof(YiFrameworkBackgroundWorkersHangfireModule)
         )]
     public class YiAbpApplicationModule : AbpModule
     {

Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiDbContext.cs

@@ -6,10 +6,7 @@ using Yi.Framework.SqlSugarCore;
 
 namespace Yi.Abp.SqlSugarCore
 {
-    public class YiDbContext : YiRbacDbContext
+    public class YiDbContext : SqlSugarDbContext
     {
-        public YiDbContext(IAbpLazyServiceProvider lazyServiceProvider) : base(lazyServiceProvider)
-        {
-        }
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj

@@ -8,6 +8,8 @@
 
 
   <ItemGroup>
+    <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
+    <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />

Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs

@@ -3,27 +3,26 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.RateLimiting;
+using Hangfire;
+using Hangfire.MemoryStorage;
+using Hangfire.Redis.StackExchange;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
-using Newtonsoft.Json.Converters;
+using StackExchange.Redis;
+using Volo.Abp.AspNetCore.Auditing;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.AntiForgery;
-using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Auditing;
 using Volo.Abp.Autofac;
+using Volo.Abp.BackgroundJobs.Hangfire;
 using Volo.Abp.Caching;
-using Volo.Abp.Json;
-using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Swashbuckle;
 using Yi.Abp.Application;
@@ -34,7 +33,7 @@ using Yi.Framework.AspNetCore.Authentication.OAuth.Gitee;
 using Yi.Framework.AspNetCore.Authentication.OAuth.QQ;
 using Yi.Framework.AspNetCore.Microsoft.AspNetCore.Builder;
 using Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection;
-using Yi.Framework.AspNetCore.UnifyResult;
+using Yi.Framework.BackgroundWorkers.Hangfire;
 using Yi.Framework.Bbs.Application;
 using Yi.Framework.Bbs.Application.Extensions;
 using Yi.Framework.ChatHub.Application;
@@ -57,6 +56,8 @@ namespace Yi.Abp.Web
         typeof(AbpSwashbuckleModule),
         typeof(AbpAspNetCoreSerilogModule),
         typeof(AbpAuditingModule),
+        typeof(YiFrameworkBackgroundWorkersHangfireModule),
+        typeof(AbpBackgroundJobsHangfireModule),
         typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
         typeof(YiFrameworkAspNetCoreModule),
         typeof(YiFrameworkAspNetCoreAuthenticationOAuthModule)
@@ -70,13 +71,18 @@ namespace Yi.Abp.Web
             var configuration = context.Services.GetConfiguration();
             var host = context.Services.GetHostingEnvironment();
             var service = context.Services;
+
             //请求日志
             Configure<AbpAuditingOptions>(optios =>
             {
                 //默认关闭，开启会有大量的审计日志
                 optios.IsEnabled = true;
-                //审计日志过滤器
-                optios.AlwaysLogSelectors.Add(x => Task.FromResult(!x.Url.StartsWith("/api/app/file/")));
+            });
+            //忽略审计日志路径
+            Configure<AbpAspNetCoreAuditingOptions>(options =>
+            {
+                options.IgnoredUrls.Add("/api/app/file/");
+                options.IgnoredUrls.Add("/hangfire");
             });
 
             //采用furion格式的规范化api，默认不开启，使用abp优雅的方式
@@ -97,7 +103,8 @@ namespace Yi.Abp.Web
                     options => options.RemoteServiceName = "bbs");
                 options.ConventionalControllers.Create(typeof(YiFrameworkChatHubApplicationModule).Assembly,
                     options => options.RemoteServiceName = "chat-hub");
-                options.ConventionalControllers.Create(typeof(YiFrameworkTenantManagementApplicationModule).Assembly,
+                options.ConventionalControllers.Create(
+                    typeof(YiFrameworkTenantManagementApplicationModule).Assembly,
                     options => options.RemoteServiceName = "tenant-management");
                 options.ConventionalControllers.Create(typeof(YiFrameworkCodeGenApplicationModule).Assembly,
                     options => options.RemoteServiceName = "code-gen");
@@ -112,7 +119,7 @@ namespace Yi.Abp.Web
             //     options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
             //     options.SerializerSettings.Converters.Add(new StringEnumConverter());
             // });
-            
+
             //请使用微软的，注意abp date又包了一层，采用DefaultJsonTypeInfoResolver统一覆盖
             Configure<JsonOptions>(options =>
             {
@@ -167,10 +174,30 @@ namespace Yi.Abp.Web
                 options.TenantResolvers.Add(new HeaderTenantResolveContributor());
                 //options.TenantResolvers.Add(new HeaderTenantResolveContributor());
                 //options.TenantResolvers.Add(new CookieTenantResolveContributor());
-
                 //options.TenantResolvers.RemoveAll(x => x.Name == CookieTenantResolveContributor.ContributorName);
             });
 
+            //配置Hangfire定时任务存储，开启redis后，优先使用redis
+            var redisConfiguration = configuration["Redis:Configuration"];
+            var redisEnabled = configuration["Redis:IsEnabled"];
+            context.Services.AddHangfire(config=>
+            {
+                if (redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled))
+                {
+                    config.UseRedisStorage(
+                        ConnectionMultiplexer.Connect(redisConfiguration),
+                        new RedisStorageOptions()
+                        {
+                            InvisibilityTimeout = TimeSpan.FromHours(1), //JOB允许执行1小时
+                            Prefix = "Yi:HangfireJob:"
+                        }).WithJobExpirationTimeout(TimeSpan.FromHours(1));
+                }
+                else
+                {
+                    config.UseMemoryStorage();
+                }
+            });
+
             //速率限制
             //每60秒限制100个请求，滑块添加，分6段
             service.AddRateLimiter(_ =>
@@ -228,11 +255,19 @@ namespace Yi.Abp.Web
                     {
                         OnMessageReceived = context =>
                         {
+                            //优先Query中获取，再去cookies中获取
                             var accessToken = context.Request.Query["access_token"];
                             if (!string.IsNullOrEmpty(accessToken))
                             {
                                 context.Token = accessToken;
                             }
+                            else
+                            {
+                                if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken))
+                                {
+                                    context.Token = cookiesToken;
+                                }
+                            }
 
                             return Task.CompletedTask;
                         }
@@ -276,11 +311,12 @@ namespace Yi.Abp.Web
             //授权
             context.Services.AddAuthorization();
 
+
             return Task.CompletedTask;
         }
 
 
-        public override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
+        public override async Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
         {
             var service = context.ServiceProvider;
             var env = context.GetEnvironment();
@@ -335,10 +371,15 @@ namespace Yi.Abp.Web
             //日志记录
             app.UseAbpSerilogEnrichers();
 
+            //Hangfire定时任务面板，可配置授权，意框架支持jwt
+            app.UseAbpHangfireDashboard("/hangfire",
+                options =>
+                {
+                    options.AsyncAuthorization = new[] { new YiTokenAuthorizationFilter(app.ApplicationServices) };
+                });
+
             //终节点
             app.UseConfiguredEndpoints();
-
-            return Task.CompletedTask;
         }
     }
 }

Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/YiFrameworkRbacTestModule.cs

@@ -2,8 +2,6 @@
 using Volo.Abp.Auditing;
 using Volo.Abp.Autofac;
 using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.BackgroundWorkers.Quartz;
-using Volo.Abp.Domain.Repositories;
 using Yi.Framework.Rbac.Application;
 using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.Rbac.Domain.Managers;
@@ -24,10 +22,11 @@ namespace Yi.Framework.Rbac.Test
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpBackgroundWorkerQuartzOptions>(options =>
-            {
-                options.IsAutoRegisterEnabled = false;
-            });
+
+            // Configure<AbpBackgroundWorkerQuartzOptions>(options =>
+            // {
+            //     options.IsAutoRegisterEnabled = false;
+            // });
             Configure<AbpBackgroundWorkerOptions> (options =>
             {
                 options.IsEnabled = false; //禁用作业执行
@@ -35,7 +34,6 @@ namespace Yi.Framework.Rbac.Test
             Configure<DbConnOptions>(options =>
             {
                 options.Url = $"DataSource=yi-rbac-test-{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.db";
-
             });
         }
 

Yi.Bbs.Vue3/src/views/start/Index.vue

@@ -16,7 +16,8 @@ const form = reactive({
 });
 const installText = "> dotnet tool install -g Yi.Abp.Tool";
 const cloneText = "> yi-abp clone ";
-
+const listText="> yi-abp new list ";
+const helpText="> yi-abp -h ";
 const nugetData=reactive({
     versions:"0.0.0",
     downloadNumber:0
@@ -40,7 +41,9 @@ const dbData = [
 
 
 const typeData = [{ name: '模块', key: 'module', value: 'module' },
-{ name: '模块', key: 'project', value: 'project' }]
+{ name: '模块', key: 'module', value: 'module' },
+  { name: '模块', key: 'module', value: 'module' },
+  { name: '模块', key: 'module', value: 'module' }]
 const addModuleComputed=computed(()=>{
 
     return `> yi-abp add-module ${form.name}`;
@@ -139,6 +142,19 @@ onUnmounted(() => {
 
 
                     <LableCheck v-model="form.isCsf" title="创建解决方案文件夹" text="指定项目是放在输出文件夹中的新文件夹中，还是直接放在输出文件夹中。" />
+                   <p>默认勾选</p>
+
+                  <h4>模板库</h4>
+                  <p>现在已经支持公开模板库，地址：https://gitee.com/ccnetcore/yi-template</p>
+                  <p>每个分支代表一个模板，你可以通过提交pr，或联系管理员上传你自定义的模板</p>
+                  <CodeBox  v-model="listText" />
+                  <p>通过以上命令，可查询当前可用模板</p>
+
+
+                  <h4>帮助</h4>
+                  <p>更详细的实时帮助，可执行帮助命令</p>
+                  <CodeBox  v-model="helpText" />
+                  <p>如还有疑惑，或错误，可在社区对应板块发布问题</p>
                 </div>
                 <div class="content-body-right">
 
@@ -191,7 +207,7 @@ onUnmounted(() => {
     }
 
     &-body {
-        height: 1400px;
+        height: 1800px;
         padding: 48px;
         background-color: #fff;
         border-radius: 12px;

Yi.RuoYi.Vue3/src/layout/index.vue

@@ -41,12 +41,12 @@ const { width, height } = useWindowSize();
 const WIDTH = 992; // refer to Bootstrap's responsive design
 
 watchEffect(() => {
-  if (device.value === 'mobile' && sidebar.value.opened) {
-    useAppStore().closeSideBar({ withoutAnimation: false })
-  }
+  //if (device.value === 'mobile' && sidebar.value.opened) {
+  //  useAppStore().closeSideBar({ withoutAnimation: false })
+  // }
   if (width.value - 1 < WIDTH) {
     useAppStore().toggleDevice('mobile')
-    useAppStore().closeSideBar({ withoutAnimation: true })
+  //  useAppStore().closeSideBar({ withoutAnimation: true })
   } else {
     useAppStore().toggleDevice('desktop')
   }

Yi.RuoYi.Vue3/src/utils/ruoyi.js

@@ -61,11 +61,11 @@ export function addDateRange(params, dateRange, propName) {
   if (typeof (propName) === 'undefined') {
     // search.params['beginTime'] = dateRange[0];
     // search.params['endTime'] = dateRange[1];
-    search.startTime=dateRange[0];
-    search.endTime=dateRange[1];
+    search.startTime=parseTime(dateRange[0]);
+    search.endTime=parseTime(dateRange[1]);
   } else {
-    search.params['start' + propName] = dateRange[0];
-    search.params['end' + propName] = dateRange[1];
+    search.params['start' + propName] = parseTime(dateRange[0]);
+    search.params['end' + propName] = parseTime(dateRange[1]);
   }
   return search;
 }