diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj index 00568df7..a6aeafc1 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Yi.Framework.DigitalCollectibles.Application.csproj @@ -3,7 +3,6 @@ - diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj index 81a3a0d9..ad7f52c5 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj @@ -18,7 +18,6 @@ - diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs index c06f32cd..7cb4828e 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/YiFrameworkRbacApplicationModule.cs @@ -1,12 +1,7 @@ using Lazy.Captcha.Core.Generator; using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.BackgroundWorkers; -using Volo.Abp.BackgroundWorkers.Hangfire; -using Volo.Abp.Modularity; using Yi.Framework.Ddd.Application; using Yi.Framework.Rbac.Application.Contracts; -using Yi.Framework.Rbac.Application.Jobs; using Yi.Framework.Rbac.Domain; namespace Yi.Framework.Rbac.Application diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj index b63ee650..1e3004b7 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj @@ -3,7 +3,6 @@ - diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs index 679cfa36..10a5ec75 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs @@ -1,7 +1,6 @@ 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; @@ -26,8 +25,7 @@ namespace Yi.Abp.Application typeof(YiFrameworkCodeGenApplicationModule), typeof (YiFrameworkSettingManagementApplicationModule), - typeof(YiFrameworkDddApplicationModule), - typeof(YiFrameworkBackgroundWorkersHangfireModule) + typeof(YiFrameworkDddApplicationModule) )] public class YiAbpApplicationModule : AbpModule { diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/DemoResetJob.cs similarity index 92% rename from Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/DemoResetJob.cs index 86c60a08..56305321 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/DemoResetJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/DemoResetJob.cs @@ -1,11 +1,9 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Volo.Abp.BackgroundWorkers.Hangfire; +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 +namespace Yi.Abp.Web.Jobs { public class DemoResetJob : HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/TestJob.cs similarity index 86% rename from Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/TestJob.cs index 9c098146..fc243337 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Jobs/TestJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/TestJob.cs @@ -1,15 +1,12 @@ using Hangfire; -using SqlSugar; using Volo.Abp.BackgroundWorkers.Hangfire; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Uow; using Yi.Framework.Rbac.Domain.Entities; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Abp.Application.Jobs +namespace Yi.Abp.Web.Jobs { /// - /// 定时任务 + /// 定时任务Test,Job可单独拆成一个Host单独允许 /// public class TestJob : HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogCacheJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogCacheJob.cs similarity index 70% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogCacheJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogCacheJob.cs index ea1cce02..9ca90b0a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogCacheJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogCacheJob.cs @@ -1,19 +1,8 @@ -using FreeRedis; -using Hangfire; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Options; -using Volo.Abp.BackgroundWorkers.Hangfire; -using Volo.Abp.Caching; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities; +using Volo.Abp.BackgroundWorkers.Hangfire; using Volo.Abp.EventBus.Local; -using Yi.Framework.Bbs.Domain.Entities; -using Yi.Framework.Bbs.Domain.Shared.Caches; -using Yi.Framework.Bbs.Domain.Shared.Enums; using Yi.Framework.Bbs.Domain.Shared.Etos; -using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.Bbs.Application.Jobs; +namespace Yi.Abp.Web.Jobs.bbs; public class AccessLogCacheJob : HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogStoreJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogStoreJob.cs similarity index 97% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogStoreJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogStoreJob.cs index 4a64d011..29f94f1a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogStoreJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AccessLogStoreJob.cs @@ -1,5 +1,4 @@ using FreeRedis; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers.Hangfire; using Volo.Abp.Caching; @@ -9,7 +8,7 @@ using Yi.Framework.Bbs.Domain.Shared.Caches; using Yi.Framework.Bbs.Domain.Shared.Enums; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.Bbs.Application.Jobs; +namespace Yi.Abp.Web.Jobs.bbs; public class AccessLogStoreJob : HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AssignmentExpireTimeOutJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AssignmentExpireTimeOutJob.cs similarity index 95% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AssignmentExpireTimeOutJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AssignmentExpireTimeOutJob.cs index 1238c979..aaff6f3a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AssignmentExpireTimeOutJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/AssignmentExpireTimeOutJob.cs @@ -1,7 +1,7 @@ using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.Bbs.Domain.Managers; -namespace Yi.Framework.Bbs.Application.Jobs; +namespace Yi.Abp.Web.Jobs.bbs; /// /// 每日任务job diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/InterestRecordsJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/InterestRecordsJob.cs similarity index 96% rename from Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/InterestRecordsJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/InterestRecordsJob.cs index 85bfafdd..052c7e82 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/InterestRecordsJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/bbs/InterestRecordsJob.cs @@ -1,7 +1,7 @@ using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.Bbs.Domain.Managers; -namespace Yi.Framework.Bbs.Application.Jobs +namespace Yi.Abp.Web.Jobs.bbs { public class InterestRecordsJob : HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoPassInGoodsJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoPassInGoodsJob.cs similarity index 90% rename from Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoPassInGoodsJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoPassInGoodsJob.cs index f41ae580..03ff06d0 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoPassInGoodsJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoPassInGoodsJob.cs @@ -1,8 +1,7 @@ -using Microsoft.Extensions.Logging; -using Volo.Abp.BackgroundWorkers.Hangfire; +using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.DigitalCollectibles.Domain.Managers; -namespace Yi.Framework.DigitalCollectibles.Application.Jobs; +namespace Yi.Abp.Web.Jobs.digital_collectibles; /// /// 自动下架商品 /// diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoRefreshMiningPoolJob.cs similarity index 96% rename from Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoRefreshMiningPoolJob.cs index 1e9237f2..f5cb4efa 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoRefreshMiningPoolJob.cs @@ -1,7 +1,7 @@ using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.DigitalCollectibles.Domain.Managers; -namespace Yi.Framework.DigitalCollectibles.Application.Jobs; +namespace Yi.Abp.Web.Jobs.digital_collectibles; /// /// 自动刷新填满矿池 diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoUpdateCollectiblesValueJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoUpdateCollectiblesValueJob.cs similarity index 92% rename from Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoUpdateCollectiblesValueJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoUpdateCollectiblesValueJob.cs index 936a1d90..46b52d98 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoUpdateCollectiblesValueJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoUpdateCollectiblesValueJob.cs @@ -1,7 +1,7 @@ using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.DigitalCollectibles.Domain.Managers; -namespace Yi.Framework.DigitalCollectibles.Application.Jobs; +namespace Yi.Abp.Web.Jobs.digital_collectibles; /// /// 自动更新藏品价值 diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/OnHookAutoMiningJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/OnHookAutoMiningJob.cs similarity index 89% rename from Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/OnHookAutoMiningJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/OnHookAutoMiningJob.cs index e4eb842d..6df2f6cf 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/OnHookAutoMiningJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/OnHookAutoMiningJob.cs @@ -1,8 +1,7 @@ -using Microsoft.Extensions.Logging; -using Volo.Abp.BackgroundWorkers.Hangfire; +using Volo.Abp.BackgroundWorkers.Hangfire; using Yi.Framework.DigitalCollectibles.Domain.Managers; -namespace Yi.Framework.DigitalCollectibles.Application.Jobs; +namespace Yi.Abp.Web.Jobs.digital_collectibles; /// /// 处理挂机挖矿定时任务 diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Jobs/BackupDataBaseJob.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/rbac/BackupDataBaseJob.cs similarity index 78% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Jobs/BackupDataBaseJob.cs rename to Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/rbac/BackupDataBaseJob.cs index 88398f87..174ed2be 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Jobs/BackupDataBaseJob.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/rbac/BackupDataBaseJob.cs @@ -1,17 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; +using Microsoft.Extensions.Options; 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 +namespace Yi.Abp.Web.Jobs.rbac { public class BackupDataBaseJob: HangfireBackgroundWorkerBase { diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj index 5be942ee..d85ce09d 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj @@ -29,6 +29,7 @@ + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index fb3d8bf6..9a116727 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -58,15 +58,16 @@ namespace Yi.Abp.Web typeof(YiAbpApplicationModule), typeof(AbpAspNetCoreMultiTenancyModule), typeof(AbpAspNetCoreMvcModule), - typeof(AbpAutofacModule), + typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpAuditingModule), - typeof(YiFrameworkBackgroundWorkersHangfireModule), - typeof(AbpBackgroundJobsHangfireModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(YiFrameworkAspNetCoreModule), - typeof(YiFrameworkAspNetCoreAuthenticationOAuthModule) + typeof(YiFrameworkAspNetCoreAuthenticationOAuthModule), + + typeof(YiFrameworkBackgroundWorkersHangfireModule), + typeof(AbpAutofacModule) )] public class YiAbpWebModule : AbpModule { diff --git a/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj b/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj index 0dd3078b..3995f426 100644 --- a/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj +++ b/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj @@ -12,8 +12,10 @@ Always - true - PreserveNewest + + + Always + Always @@ -38,7 +40,9 @@ - + + + diff --git a/Yi.Abp.Net8/test/Yi.Abp.Test/YiAbpTestModule.cs b/Yi.Abp.Net8/test/Yi.Abp.Test/YiAbpTestModule.cs index 31fd9bf7..ec42fc11 100644 --- a/Yi.Abp.Net8/test/Yi.Abp.Test/YiAbpTestModule.cs +++ b/Yi.Abp.Net8/test/Yi.Abp.Test/YiAbpTestModule.cs @@ -1,5 +1,10 @@ -using Volo.Abp.Auditing; +using Hangfire; +using Hangfire.MemoryStorage; +using StackExchange.Redis; +using Volo.Abp.Auditing; using Volo.Abp.Autofac; +using Volo.Abp.BackgroundJobs.Hangfire; +using Volo.Abp.BackgroundWorkers; using Yi.Abp.Application; using Yi.Abp.SqlsugarCore; @@ -8,14 +13,14 @@ namespace Yi.Abp.Test [DependsOn( typeof(YiAbpSqlSugarCoreModule), typeof(YiAbpApplicationModule), - - typeof(AbpAutofacModule), - typeof(AbpAuditingModule) + + typeof(AbpAutofacModule) )] public class YiAbpTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { + Configure(options=>options.IsEnabled=false); } } }