diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs index e58e406d..3c99663a 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -24,7 +24,6 @@ public partial class AbpProHttpApiHostModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { context.Services - .AddAbpProAuditLog() .AddAbpProAuthentication() .AddAbpProMultiTenancy() diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs deleted file mode 100644 index d1a7b8e5..00000000 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace MyCompanyName.MyProjectName.Extensions.Hangfire; - -public class AutoDeleteAfterSuccessAttributer : JobFilterAttribute, IApplyStateFilter -{ - private readonly TimeSpan _deleteAfter; - - public AutoDeleteAfterSuccessAttributer(TimeSpan timeSpan) - { - _deleteAfter = timeSpan; - } - - public void OnStateApplied(ApplyStateContext context, IWriteOnlyTransaction transaction) - { - context.JobExpirationTimeout = _deleteAfter; - } - - public void OnStateUnapplied(ApplyStateContext context, IWriteOnlyTransaction transaction) - { - - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs deleted file mode 100644 index f51f8c56..00000000 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs +++ /dev/null @@ -1,78 +0,0 @@ -namespace MyCompanyName.MyProjectName.Extensions.Hangfire -{ - /// - /// Cron类型 - /// - public static class CronType - { - /// - /// 周期性为分钟的任务 - /// - /// 执行周期的间隔,默认为每分钟一次 - /// - public static string Minute(int interval = 1) - { - return "1 0/" + interval.ToString() + " * * * ? "; - } - - /// - /// 周期性为小时的任务 - /// - /// 第几分钟开始,默认为第一分钟 - /// 执行周期的间隔,默认为每小时一次 - /// - public static string Hour(int minute = 1, int interval = 1) - { - return "1 " + minute + " 0/" + interval.ToString() + " * * ? "; - } - - /// - /// 周期性为天的任务 - /// - /// 第几小时开始,默认从1点开始 - /// 第几分钟开始,默认从第1分钟开始 - /// 执行周期的间隔,默认为每天一次 - /// - public static string Day(int hour = 1, int minute = 1, int interval = 1) - { - return "1 " + minute.ToString() + " " + hour.ToString() + " 1/" + interval.ToString() + " * ? "; - } - - /// - /// 周期性为周的任务 - /// - /// 星期几开始,默认从星期一点开始 - /// 第几小时开始,默认从1点开始 - /// 第几分钟开始,默认从第1分钟开始 - /// - public static string Week(DayOfWeek dayOfWeek = DayOfWeek.Monday, int hour = 1, int minute = 1) - { - return Cron.Weekly(dayOfWeek, hour, minute); - } - - /// - /// 周期性为月的任务 - /// - /// 几号开始,默认从一号开始 - /// 第几小时开始,默认从1点开始 - /// 第几分钟开始,默认从第1分钟开始 - /// - public static string Month(int day = 1, int hour = 1, int minute = 1) - { - return Cron.Monthly(day, hour, minute); - } - - /// - /// 周期性为年的任务 - /// - /// 几月开始,默认从一月开始 - /// 几号开始,默认从一号开始 - /// 第几小时开始,默认从1点开始 - /// 第几分钟开始,默认从第1分钟开始 - /// - public static string Year(int month = 1, int day = 1, int hour = 1, int minute = 1) - { - return Cron.Yearly(month, day, hour, minute); - } - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs deleted file mode 100644 index e2f1ee6c..00000000 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MyCompanyName.MyProjectName.Extensions.Hangfire -{ - public class CustomHangfireAuthorizeFilter : IDashboardAuthorizationFilter - { - public bool Authorize(DashboardContext context) - { - var _currentUser = context.GetHttpContext().RequestServices.GetRequiredService(); - return _currentUser.IsAuthenticated; - } - } -} diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs deleted file mode 100644 index bb2d0553..00000000 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace MyCompanyName.MyProjectName.Extensions.Hangfire; - -/// -/// 重试最后一次 -/// -public class JobRetryLastFilter : JobFilterAttribute, IElectStateFilter -{ - private int RetryCount { get; } - - public JobRetryLastFilter(int retryCount) - { - RetryCount = retryCount; - } - - - public void OnStateElection(ElectStateContext context) - { - var retryAttempt = context.GetJobParameter("RetryCount"); - if (RetryCount == retryAttempt) - { - Log.Error("最后一次重试"); - } - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs deleted file mode 100644 index 31a9ffab..00000000 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using MyCompanyName.MyProjectName.Jobs; - -namespace MyCompanyName.MyProjectName.Extensions.Hangfire -{ - public static class RecurringJobsExtensions - { - public static void CreateRecurringJob(this ApplicationInitializationContext context) - { - RecurringJob.AddOrUpdate("测试Job", e => e.ExecuteAsync(), CronType.Minute(1), new RecurringJobOptions() - { - TimeZone = TimeZoneInfo.Local - }); - } - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs index 54ea8d4b..ed6b0b0b 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs @@ -14,8 +14,6 @@ global using Hangfire.States; global using Hangfire.Storage; global using Lion.AbpPro; global using MyCompanyName.MyProjectName.EntityFrameworkCore; -global using MyCompanyName.MyProjectName.Extensions; -global using MyCompanyName.MyProjectName.Extensions.Hangfire; global using MyCompanyName.MyProjectName.MultiTenancy; global using Microsoft.AspNetCore.Authentication.JwtBearer; global using Microsoft.AspNetCore.Builder; diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 17847d60..531778e7 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -46,7 +46,7 @@ - + diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index ec6f2499..ae31d154 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -1,8 +1,10 @@ +using Lion.AbpPro.AspNetCore; + namespace MyCompanyName.MyProjectName { [DependsOn( typeof(MyProjectNameHttpApiModule), - typeof(AbpProSharedHostingMicroserviceModule), + typeof(AbpProAspNetCoreModule), typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(MyProjectNameEntityFrameworkCoreModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), @@ -25,6 +27,25 @@ namespace MyCompanyName.MyProjectName ConfigureAuditLog(context); ConfigurationSignalR(context); ConfigurationMultiTenancy(); + + + context.Services + .AddAbpProAuditLog() + .AddAbpProAuthentication() + .AddAbpProMultiTenancy() + .AddAbpProRedis() + .AddAbpProRedisDistributedLocking() + .AddAbpProMiniProfiler() + .AddAbpProCors() + .AddAbpProAntiForgery() + .AddAbpProIdentity() + .AddAbpProBlobStorage() + .AddAbpProSignalR() + .AddAbpProHealthChecks() + .AddAbpProTenantResolvers() + .AddAbpProLocalization() + .AddAbpProExceptions() + .AddAbpProSwagger("AbpPro"); } public override void OnApplicationInitialization(ApplicationInitializationContext context) @@ -71,10 +92,6 @@ namespace MyCompanyName.MyProjectName }); - if (configuration.GetValue("Consul:Enabled", false)) - { - app.UseConsul(); - } } private void ConfigurationSignalR(ServiceConfigurationContext context) diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/AbpProWebGatewayModule.cs b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/AbpProWebGatewayModule.cs index e4005326..254c8d09 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/AbpProWebGatewayModule.cs +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/AbpProWebGatewayModule.cs @@ -1,7 +1,9 @@ +using Lion.AbpPro.AspNetCore; + namespace Lion.AbpPro.WebGateway { [DependsOn( - typeof(AbpProSharedHostingGatewayModule))] + typeof(AbpProAspNetCoreModule))] public class AbpProWebGatewayModule : AbpModule { private const string DefaultCorsPolicyName = "Default"; diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj index 454f29ec..1a4dde84 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs index 049ef7d0..f92c1d20 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs @@ -23,7 +23,6 @@ global using Microsoft.EntityFrameworkCore.Design; global using Microsoft.EntityFrameworkCore.Storage; global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.DependencyInjection; -global using MySqlConnector; global using Volo.Abp; global using Volo.Abp.AuditLogging; global using Volo.Abp.BackgroundJobs;