diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs index 4489545b..d03bf16b 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -16,7 +16,7 @@ namespace Yi.Framework.Core.Helper public static List ImageType { get; set; } = new List { - ".jpg",".png",".jpge" + ".jpg",".png",".jpeg" }; private static Hashtable _mimeMappingTable; diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs index 40308737..3e2190a0 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs @@ -70,23 +70,12 @@ namespace Yi.Framework.Bbs.Domain.Managers /// private async Task CreateInterestRecordsAsync() { - //获取最新的实体 - var lastEntity = await _interestRepository._DbQueryable.OrderByDescending(x => x.CreationTime).FirstAsync(); decimal oldValue = DefalutRate; - - var thirdPartyValue = await _bankValueProvider.GetValueAsync(); //获取实际值的变化率 decimal changeRate = (thirdPartyValue - _bankValueProvider.StandardValue) / (thirdPartyValue); - - //说明不是第一次 - if (lastEntity is not null) - { - oldValue = lastEntity.Value; - } - //判断市场是否波动 bool isFluctuate = IsMarketVolatility(); //市场波动 @@ -98,7 +87,7 @@ namespace Yi.Framework.Bbs.Domain.Managers //根据上一次的老值进行变化率比较 var currentValue = oldValue + (oldValue * changeRate); - var entity = new InterestRecordsAggregateRoot(thirdPartyValue, currentValue); + var entity = new InterestRecordsAggregateRoot(thirdPartyValue, currentValue, isFluctuate); var output = await _interestRepository.InsertReturnEntityAsync(entity); return output; diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs index bc6cb216..6c84a32d 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs @@ -134,7 +134,7 @@ namespace Yi.Framework.Rbac.Application.Services.System /// /// [OperLog("更新用户", OperEnum.Update)] - [Permission("system:user:update")] + [Permission("system:user:edit")] public async override Task UpdateAsync(Guid id, UserUpdateInputVo input) { if (input.UserName == UserConst.Admin || input.UserName == UserConst.TenantAdmin) diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs index 18861b03..d2652c06 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Data; +using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Yi.Framework.Rbac.Domain.Entities; @@ -718,6 +718,19 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds entities.Add(userRemove); + MenuAggregateRoot userResetPwd = new MenuAggregateRoot(_guidGenerator.Create()) + { + + MenuName = "重置密码", + PermissionCode = "system:user:resetPwd", + MenuType = MenuTypeEnum.Component, + OrderNum = 100, + ParentId = user.Id, + IsDeleted = false + }; + entities.Add(userResetPwd); + + //角色管理 MenuAggregateRoot role = new MenuAggregateRoot(_guidGenerator.Create()) { diff --git a/Yi.RuoYi.Vue3/src/components/DictTag/index.vue b/Yi.RuoYi.Vue3/src/components/DictTag/index.vue index 6df0380b..b9bf2ed4 100644 --- a/Yi.RuoYi.Vue3/src/components/DictTag/index.vue +++ b/Yi.RuoYi.Vue3/src/components/DictTag/index.vue @@ -3,7 +3,7 @@