From 76019141f138fc615a1a7e19bb484115b04ddebd Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Wed, 21 May 2025 10:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=81=E7=A7=BBHost?=
=?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=80=E4=BA=9B=E4=B8=8D=E5=BF=85?=
=?UTF-8?q?=E8=A6=81=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...CollectBusMigrationHostModule.Configure.cs | 37 ++-----------------
.../CollectBusMigrationHostModule.cs | 2 +-
.../Hangfire/JobRetryLastFilter.cs | 29 ---------------
.../JiShe.CollectBus.Migration.Host.csproj | 2 +
4 files changed, 6 insertions(+), 64 deletions(-)
delete mode 100644 web/JiShe.CollectBus.Migration.Host/Hangfire/JobRetryLastFilter.cs
diff --git a/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs
index 33c2b3a..5816f03 100644
--- a/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs
+++ b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs
@@ -1,7 +1,4 @@
-//using Hangfire;
-//using Hangfire.Redis.StackExchange;
-using JiShe.CollectBus.Migration.Host.Hangfire;
-using JiShe.CollectBus.Migration.Host.HealthChecks;
+using JiShe.CollectBus.Migration.Host.HealthChecks;
using JiShe.CollectBus.Migration.Host.Swaggers;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
@@ -12,7 +9,6 @@ using StackExchange.Redis;
using System.Text;
using Volo.Abp.AspNetCore.Auditing;
using Volo.Abp.Auditing;
-using Volo.Abp.BackgroundJobs;
using Volo.Abp.Caching;
using Volo.Abp.Modularity;
@@ -21,33 +17,6 @@ namespace JiShe.CollectBus.Migration.Host
{
public partial class CollectBusMigrationHostModule
{
- ///
- /// Configures the hangfire.
- ///
- /// The context.
- //private void ConfigureHangfire(ServiceConfigurationContext context)
- //{
- // var redisStorageOptions = new RedisStorageOptions()
- // {
- // Db = context.Services.GetConfiguration().GetValue("Redis:HangfireDB")
- // };
-
- // Configure(options => { options.IsJobExecutionEnabled = false; });
-
- // context.Services.AddHangfire(config =>
- // {
- // config.UseRedisStorage(
- // context.Services.GetConfiguration().GetValue("Redis:Configuration"), redisStorageOptions)
- // .WithJobExpirationTimeout(TimeSpan.FromDays(7));
- // var delaysInSeconds = new[] { 10, 60, 60 * 3 }; // 重试时间间隔
- // const int Attempts = 3; // 重试次数
- // config.UseFilter(new AutomaticRetryAttribute() { Attempts = Attempts, DelaysInSeconds = delaysInSeconds });
- // //config.UseFilter(new AutoDeleteAfterSuccessAttribute(TimeSpan.FromDays(7)));
- // config.UseFilter(new JobRetryLastFilter(Attempts));
- // });
- // context.Services.AddHangfireServer();
- //}
-
///
/// Configures the JWT authentication.
///
@@ -179,8 +148,8 @@ namespace JiShe.CollectBus.Migration.Host
(
options =>
{
- options.IsEnabled = true;
- options.EntityHistorySelectors.AddAllEntities();
+ options.IsEnabled = false;
+ //options.EntityHistorySelectors.AddAllEntities();
options.ApplicationName = "JiShe.CollectBus.Migration";
}
);
diff --git a/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs
index 0f90aa7..49f311a 100644
--- a/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs
+++ b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs
@@ -86,7 +86,7 @@ namespace JiShe.CollectBus.Migration.Host
}
//app.UseAuditing();
app.UseAbpSerilogEnrichers();
- app.UseUnitOfWork();
+ //app.UseUnitOfWork();
//app.UseHangfireDashboard("/hangfire", new DashboardOptions
//{
// IgnoreAntiforgeryToken = true
diff --git a/web/JiShe.CollectBus.Migration.Host/Hangfire/JobRetryLastFilter.cs b/web/JiShe.CollectBus.Migration.Host/Hangfire/JobRetryLastFilter.cs
deleted file mode 100644
index 83d68ae..0000000
--- a/web/JiShe.CollectBus.Migration.Host/Hangfire/JobRetryLastFilter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Hangfire.Common;
-using Hangfire.States;
-using Serilog;
-
-namespace JiShe.CollectBus.Migration.Host.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("最后一次重试");
- }
- }
- }
-}
diff --git a/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj b/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj
index d201582..747a5c8 100644
--- a/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj
+++ b/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj
@@ -46,6 +46,8 @@
+
+