From 81f9fd747385c562fdc69719831a51c0c342c053 Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@hytch.com>
Date: Mon, 4 Nov 2024 18:54:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=9F=BF=E6=B1=A0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Jobs/AutoRefreshMiningPoolJob.cs                  |  1 +
 .../Settings/DigitalCollectiblesSettingProvider.cs    |  5 +----
 .../Managers/MiningPoolManager.cs                     | 11 +++++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs
index da52ee11..0c94aac7 100644
--- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs
+++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Jobs/AutoRefreshMiningPoolJob.cs
@@ -34,6 +34,7 @@ public class AutoRefreshMiningPoolJob : QuartzBackgroundWorkerBase
 
     public override async Task Execute(IJobExecutionContext context)
     {
+        
         //刷新矿池
         await _miningPoolManager.RefreshMiningPoolAsync();
         //刷新用户限制
diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
index ae5dd298..3b5f831a 100644
--- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
+++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
@@ -15,9 +15,6 @@ namespace Yi.Abp.Domain.Shared.Settings
         public override void Define(ISettingDefinitionContext context)
         {
             context.Add(
-                //每日矿池最大上限--控制矿池膨胀率
-                new SettingDefinition("MaxPoolLimit", "100"),
-
                 //每日挖矿最大上限--控制无限挖矿
                 new SettingDefinition("MiningMaxLimit", "36"),
                 
@@ -31,7 +28,7 @@ namespace Yi.Abp.Domain.Shared.Settings
                 new SettingDefinition("MarketTaxRate", "0.02"),
                 
                 //矿池刷新内容
-                new SettingDefinition("PoolData", "60,24,10,3,1")
+                new SettingDefinition("PoolData", "60,26,10,3,1")
             );
         }
     }
diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs
index 638106b4..f4bf728d 100644
--- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs
+++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain/Managers/MiningPoolManager.cs
@@ -1,6 +1,7 @@
 using FreeRedis;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.EventBus.Local;
@@ -333,7 +334,7 @@ public class MiningPoolManager : DomainService
     public async Task RefreshMiningPoolAsync()
     {
         //获取当前最大的限制
-        var maximumPoolLimit = int.Parse(await _settingProvider.GetOrNullAsync("MaxPoolLimit"));
+       // var maximumPoolLimit = int.Parse(await _settingProvider.GetOrNullAsync("MaxPoolLimit"));
         var poolData = (await _settingProvider.GetOrNullAsync("PoolData")).Split(',').Select(x=>int.Parse(x)).ToList();
         DateTime startTime = DateTime.Today.AddHours(10);
         DateTime endTime = startTime.AddDays(1);
@@ -362,12 +363,18 @@ public class MiningPoolManager : DomainService
             });
     }
 
+    /// <summary>
+    /// 缓存前缀
+    /// </summary>
+    private string CacheKeyPrefix => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpDistributedCacheOptions>>()
+        .Value.KeyPrefix;
     /// <summary>
     /// 刷新用户挖矿限制
     /// </summary>
     public async Task RefreshMiningUserLimitAsync()
     {
-        await RedisClient.DelAsync($"{MiningCacheConst.UserMiningLimit}*");
+
+        await RedisClient.DelAsync($"{CacheKeyPrefix}{MiningCacheConst.UserMiningLimit}*");
     }
 
     /// <summary>