From db08e993dfcdfc3711584ca8911e19e5d24f0bff Mon Sep 17 00:00:00 2001
From: zsmygitee <274725822@qq.com>
Date: Tue, 11 Jun 2024 06:56:02 +0000
Subject: [PATCH 1/7] =?UTF-8?q?update=20Yi.Abp.Net8/framework/Yi.Framework?=
 =?UTF-8?q?.Core/Helper/MimeHelper.cs.=20=20=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E3=80=82=20=E5=90=8E=E7=BC=80=E5=90=8D=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zsmygitee <274725822@qq.com>
---
 Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<string> ImageType { get; set; } = new List<string>
         {
-            ".jpg",".png",".jpge"
+            ".jpg",".png",".jpeg"
         };
 
         private static Hashtable _mimeMappingTable;

From 1c5be591058cc9fdf63f152564eea731a61a3370 Mon Sep 17 00:00:00 2001
From: tyjctl <419999127@qq.com>
Date: Fri, 14 Jun 2024 10:08:41 +0000
Subject: [PATCH 2/7] =?UTF-8?q?update=20Yi.RuoYi.Vue3/src/components/DictT?=
 =?UTF-8?q?ag/index.vue.=20=E4=BF=AE=E5=A4=8DEL-tag=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=AF=AF=E4=BC=A0=E5=80=BC=E5=AF=BC=E8=87=B4=E7=9A=84vue=20war?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tyjctl <419999127@qq.com>
---
 Yi.RuoYi.Vue3/src/components/DictTag/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
         <span
-          v-if="item.elTagType == 'default' || item.elTagType == ''"
+          v-if="item.elTagType == 'default' || item.elTagType == ''|| item.elTagType == null"
           :key="item.value"
           :index="index"
           :class="item.elTagClass"
@@ -13,7 +13,7 @@
           :disable-transitions="true"
           :key="item.value + ''"
           :index="index"
-          :type="item.elTagType === 'primary' ? '' : item.elTagType"
+          :type="item.elTagType"
           :class="item.elTagClass"
         >{{ item.label }}</el-tag>
       </template>

From 08de00f640cc5a0f0f4ff70c847402c8c819d6e5 Mon Sep 17 00:00:00 2001
From: tyjctl <419999127@qq.com>
Date: Fri, 14 Jun 2024 10:29:46 +0000
Subject: [PATCH 3/7] =?UTF-8?q?update=20Yi.RuoYi.Vue3/src/layout/component?=
 =?UTF-8?q?s/IframeToggle/index.vue.=20vue3=20transition-group=20=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81mode=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=B6=88?=
 =?UTF-8?q?=E9=99=A4vue=20warn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tyjctl <419999127@qq.com>
---
 Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue b/Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue
index 2e07fe88..b72a717b 100644
--- a/Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue
+++ b/Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition-group name="fade-transform" mode="out-in">
+  <transition-group name="fade-transform">
     <inner-link
       v-for="(item, index) in tagsViewStore.iframeViews"
       :key="item.path"

From 1c84757d1dec8c7b3b3f494e9856a20b4a6ca9a0 Mon Sep 17 00:00:00 2001
From: tyjctl <419999127@qq.com>
Date: Fri, 21 Jun 2024 04:03:42 +0000
Subject: [PATCH 4/7] =?UTF-8?q?update=20Yi.RuoYi.Vue3/src/layout/component?=
 =?UTF-8?q?s/Sidebar/SidebarItem.vue.=20=E4=BF=AE=E5=A4=8D=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8A=98=E5=8F=A0=E5=90=8E=E7=9A=84=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tyjctl <419999127@qq.com>
---
 Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue
index c423fb18..759a665a 100644
--- a/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue
+++ b/Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue
@@ -9,7 +9,7 @@
       </app-link>
     </template>
 
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta && item.meta.icon" />
         <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>

From 0aa532ffa4db03b4f9f7573fcb9e72aa04c9ea0d Mon Sep 17 00:00:00 2001
From: tyjctl <419999127@qq.com>
Date: Fri, 5 Jul 2024 02:07:21 +0000
Subject: [PATCH 5/7] =?UTF-8?q?update=20Yi.Abp.Net8/module/rbac/Yi.Framewo?=
 =?UTF-8?q?rk.Rbac.Application/Services/System/UserService.cs.=20=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9D=83=E9=99=90=E4=B8=8D=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=BB=BA=E7=94=A8=E6=88=B7=E6=B2=A1=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tyjctl <419999127@qq.com>
---
 .../Services/System/UserService.cs                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
         /// <param name="input"></param>
         /// <returns></returns>
         [OperLog("更新用户", OperEnum.Update)]
-        [Permission("system:user:update")]
+        [Permission("system:user:edit")]
         public async override Task<UserGetOutputDto> UpdateAsync(Guid id, UserUpdateInputVo input)
         {
             if (input.UserName == UserConst.Admin || input.UserName == UserConst.TenantAdmin)

From 1b180ed60c3001944504654779064669066c0606 Mon Sep 17 00:00:00 2001
From: tyjctl <419999127@qq.com>
Date: Fri, 5 Jul 2024 02:17:13 +0000
Subject: [PATCH 6/7] =?UTF-8?q?update=20Yi.Abp.Net8/module/rbac/Yi.Framewo?=
 =?UTF-8?q?rk.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs.=20=E7=A7=8D?=
 =?UTF-8?q?=E5=AD=90=E6=95=B0=E6=8D=AE=E8=8F=9C=E5=8D=95=E8=A1=A5=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tyjctl <419999127@qq.com>
---
 .../DataSeeds/MenuDataSeed.cs                     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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())
             {

From 8bf01451a8852c55d6e624638e9030ed6b9dbd69 Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@hytch.com>
Date: Fri, 5 Jul 2024 17:40:02 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E6=B1=87=E7=8E=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.Bbs.Domain/Managers/BankManager.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

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
         /// <returns></returns>
         private async Task<InterestRecordsAggregateRoot> 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;