From af2fd572d57b0d1c4e79d3fecdadf57bc7a2a7f6 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Fri, 12 Jul 2024 23:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=80=BC=E8=8B=A5Key=E7=BB=8F=E8=BF=87URL?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=88=99=E8=BF=9B=E8=A1=8C=E8=A7=A3=E7=A0=81?=
 =?UTF-8?q?=20=202=E3=80=81=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE=E8=BD=AC?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=20=203=E3=80=81=E5=8D=87=E7=BA=A7npm?=
 =?UTF-8?q?=E5=8C=85=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs        | 12 ++++++------
 .../Admin.NET.Core/Service/Cache/SysCacheService.cs  |  4 ++++
 Web/package.json                                     |  6 +++---
 Web/src/views/system/database/database.ts            |  5 +++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
index 95848948..3e0d5661 100644
--- a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
+++ b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs
@@ -70,7 +70,7 @@ public class EnumToDictJob : IJob
             });
             try
             {
-                db.Ado.BeginTran();
+                db.BeginTran();
 
                 if (uSysDictType.Count > 0)
                     await db.Updateable(uSysDictType).ExecuteCommandAsync(stoppingToken);
@@ -78,11 +78,11 @@ public class EnumToDictJob : IJob
                 if (uSysDictData.Count > 0)
                     await db.Updateable(uSysDictData).ExecuteCommandAsync(stoppingToken);
 
-                db.Ado.CommitTran();
+                db.CommitTran();
             }
             catch (Exception error)
             {
-                db.Ado.RollbackTran();
+                db.RollbackTran();
                 Log.Error($"{context.Trigger.Description}更新枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
                 throw new Exception($"{context.Trigger.Description}更新枚举转换字典入库错误");
             }
@@ -123,7 +123,7 @@ public class EnumToDictJob : IJob
             });
             try
             {
-                db.Ado.BeginTran();
+                db.BeginTran();
 
                 if (iDictType.Count > 0)
                     await db.Insertable(iDictType).ExecuteCommandAsync(stoppingToken);
@@ -131,11 +131,11 @@ public class EnumToDictJob : IJob
                 if (iDictData.Count > 0)
                     await db.Insertable(iDictData).ExecuteCommandAsync(stoppingToken);
 
-                db.Ado.CommitTran();
+                db.CommitTran();
             }
             catch (Exception error)
             {
-                db.Ado.RollbackTran();
+                db.RollbackTran();
                 Log.Error($"{context.Trigger.Description}新增枚举转换字典入库错误：" + _jsonSerializer.Serialize(error));
                 throw new Exception($"{context.Trigger.Description}新增枚举转换字典入库错误");
             }
diff --git a/Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs b/Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs
index 6ddead17..46c79d2a 100644
--- a/Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs
@@ -144,6 +144,10 @@ public class SysCacheService : IDynamicApiController, ISingleton
     [DisplayName("获取缓存值")]
     public object GetValue(string key)
     {
+        // 若Key经过URL编码则进行解码
+        if (Regex.IsMatch(key, @"%[0-9a-fA-F]{2}"))
+            key = HttpUtility.UrlDecode(key);
+
         return _cacheProvider.Cache == Cache.Default
             ? _cacheProvider.Cache.Get<object>($"{_cacheOptions.Prefix}{key}")
             : _cacheProvider.Cache.Get<string>($"{_cacheOptions.Prefix}{key}");
diff --git a/Web/package.json b/Web/package.json
index 2e26ea50..60a66464 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -31,7 +31,7 @@
 		"echarts": "^5.5.1",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.7.6",
+		"element-plus": "^2.7.7",
 		"exceljs": "^4.4.0",
 		"ezuikit": "^1.0.0",
 		"ezuikit-js": "^8.0.5",
@@ -68,8 +68,8 @@
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
 		"vuedraggable": "4.0.3",
-		"vxe-pc-ui": "^4.0.61",
-		"vxe-table": "^4.7.48",
+		"vxe-pc-ui": "^4.0.64",
+		"vxe-table": "^4.7.49",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.5",
 		"xe-utils": "^3.5.28",
diff --git a/Web/src/views/system/database/database.ts b/Web/src/views/system/database/database.ts
index c99a0bde..4bbd5d69 100644
--- a/Web/src/views/system/database/database.ts
+++ b/Web/src/views/system/database/database.ts
@@ -104,4 +104,9 @@ export const dataTypeList = [
 		hasLength: false,
 		hasDecimalDigits: false,
 	},
+	{
+		value: 'boolean',
+		hasLength: false,
+		hasDecimalDigits: false,
+	},
 ];