From 8ca741792a28d673b1a7a7b2b2e8ae5c446e36cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sat, 19 Oct 2024 22:44:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=96=E7=9F=BF?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/MiningPool/MiningResultOutput.cs | 3 +-- .../Services/CollectiblesService.cs | 2 +- .../Services/MarketService.cs | 3 ++- .../Settings/DigitalCollectiblesSettingProvider.cs | 8 ++++---- .../Managers/MiningPoolManager.cs | 3 +-- .../Services/AccountService.cs | 1 + 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/MiningPool/MiningResultOutput.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/MiningPool/MiningResultOutput.cs index f6e17601..14bc4cd8 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/MiningPool/MiningResultOutput.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application.Contracts/Dtos/MiningPool/MiningResultOutput.cs @@ -5,6 +5,5 @@ namespace Yi.Framework.DigitalCollectibles.Application.Contracts.Dtos.MiningPool public class MiningResultOutput { - - public CollectiblesUserGetOutputDto? Collectibles { get; set; } + public CollectiblesDto? Collectibles{ get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs index 8690f713..8b0f8f11 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/CollectiblesService.cs @@ -40,6 +40,7 @@ public class CollectiblesService : ApplicationService input.StartTime is not null && input.EndTime is not null, u => u.CreationTime >= input.StartTime && u.CreationTime <= input.EndTime) .LeftJoin((u, c) => u.CollectiblesId == c.Id) + .OrderBy((u,c) => c.OrderNum) .GroupBy((u, c) => u.CollectiblesId) .Select((u, c) => new CollectiblesUserGetOutputDto @@ -59,7 +60,6 @@ public class CollectiblesService : ApplicationService }, Number = SqlFunc.AggregateCount(u.CollectiblesId) }) - .OrderBy(dto => dto.Collectibles.OrderNum) .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); return new PagedResultDto(total, output); } diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs index 774b4dd7..4ed1d4c0 100644 --- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs +++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/Services/MarketService.cs @@ -43,6 +43,7 @@ public class MarketService : ApplicationService m => m.CreationTime >= input.StartTime && m.CreationTime <= input.EndTime) .LeftJoin((m, c) => m.CollectiblesId == c.Id) + .OrderByDescending((m, c) => m.CreationTime) .Select((m, c) => new MarketGetListOutputDto @@ -65,7 +66,7 @@ public class MarketService : ApplicationService } } ) - .OrderByDescending(dto => dto.CreationTime) + .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); return new PagedResultDto(total, output); } 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 63926c9c..37eb610e 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 @@ -16,16 +16,16 @@ namespace Yi.Abp.Domain.Shared.Settings { context.Add( //每日矿池最大上限--控制矿池膨胀率 - new SettingDefinition("MaxPoolLimit", "50"), + new SettingDefinition("MaxPoolLimit", "500"), //每日挖矿最大上限--控制无限挖矿 - new SettingDefinition("MiningMaxLimit", "36"), + new SettingDefinition("MiningMaxLimit", "360"), //每次挖矿最小间隔（秒）--控制暴力挖矿 - new SettingDefinition("MiningMinIntervalSeconds", "5"), + new SettingDefinition("MiningMinIntervalSeconds", "1"), //每次挖到矿的概率--控制爆率 - new SettingDefinition("MiningMinProbability", "0.06"), + new SettingDefinition("MiningMinProbability", "0.5"), //交易税率--控制频繁交易 new SettingDefinition("MarketTaxRate", "0.2") 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 aff90054..6c5e6435 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 @@ -166,8 +166,7 @@ public class MiningPoolManager : DomainService CollectiblesId = result.Collectibles.Id, IsRead = false }); - - + return result; } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs index 50e59507..a0bc3dfe 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs @@ -212,6 +212,7 @@ namespace Yi.Framework.Rbac.Application.Services /// 手机验证码 /// /// + [RemoteService(isEnabled:false)] public async Task PostCaptchaPhoneAsync(ValidationPhoneTypeEnum validationPhoneType, PhoneCaptchaImageDto input) {