From 44f2ecf0367edc93a53068dc0cb0e12a52ed4377 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Sun, 15 Dec 2024 00:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=B8=85=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8C=89=E9=92=AE=E7=BC=93=E5=AD=98=20=202=E3=80=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj              | 2 +-
 Admin.NET/Admin.NET.Core/Const/CommonConst.cs               | 6 +++---
 .../Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs     | 5 ++++-
 Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 3fa3d858..f379b62e 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="MailKit" Version="4.9.0" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
     <PackageReference Include="MiniExcel" Version="1.36.0" />
-    <PackageReference Include="MiniWord" Version="0.9.0" />
+    <PackageReference Include="MiniWord" Version="0.9.2" />
     <PackageReference Include="MQTTnet" Version="4.3.7.1207" />
     <PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.8" />
     <PackageReference Include="NewLife.Redis" Version="6.0.2024.1205" />
diff --git a/Admin.NET/Admin.NET.Core/Const/CommonConst.cs b/Admin.NET/Admin.NET.Core/Const/CommonConst.cs
index b71025af..544b2c87 100644
--- a/Admin.NET/Admin.NET.Core/Const/CommonConst.cs
+++ b/Admin.NET/Admin.NET.Core/Const/CommonConst.cs
@@ -33,12 +33,12 @@ public class CommonConst
     public const string SendErrorMail = "Send:ErrorMail";
 
     /// <summary>
-    /// 事件-新增租户事件
+    /// 事件-增加租户
     /// </summary>
-    public const string InitTenant = "Init:Tenant";
+    public const string InitTenant = "Add:Tenant";
 
     /// <summary>
-    /// 事件-删除租户事件
+    /// 事件-删除租户
     /// </summary>
     public const string DeleteTenant = "Delete:Tenant";
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index 1e476a8f..ac2395cf 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -27,7 +27,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         IOptions<CodeGenOptions> codeGenOptions)
     {
         _db = db;
-        this._codeGetTemplateRep = codeGetTemplateRep;
+        _codeGetTemplateRep = codeGetTemplateRep;
         _codeGenConfigService = codeGenConfigService;
         _viewEngine = viewEngine;
         _codeGenOptions = codeGenOptions.Value;
@@ -713,6 +713,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         }
 
         await _db.Insertable(menus).ExecuteCommandAsync();
+
+        // 删除角色菜单按钮缓存
+        App.GetRequiredService<SysCacheService>().RemoveByPrefixKey(CacheConst.KeyUserApi);
     }
 
     /// <summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
index f5bb5388..840ee077 100644
--- a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
@@ -258,7 +258,7 @@ public class SysTenantService : IDynamicApiController, ITransient
         };
         await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = newRole.Id, MenuIdList = menuIdList });
 
-        //发布新增租户事件
+        // 发布新增租户事件
         await _eventPublisher.PublishAsync(CommonConst.InitTenant, tenant);
     }
 
@@ -302,7 +302,7 @@ public class SysTenantService : IDynamicApiController, ITransient
 
         await _sysPosRep.AsDeleteable().Where(u => u.TenantId == input.Id).ExecuteCommandAsync();
 
-        //发布删除租户事件
+        // 发布删除租户事件
         await _eventPublisher.PublishAsync(CommonConst.DeleteTenant, input);
     }