diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 8f0653be..eb5a34fc 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -49,7 +49,7 @@
-
+
diff --git a/Admin.NET/Admin.NET.Core/Cache/CaptchaDistributedCache.cs b/Admin.NET/Admin.NET.Core/Cache/CaptchaDistributedCache.cs
index 5dcbdc42..0b8508d1 100644
--- a/Admin.NET/Admin.NET.Core/Cache/CaptchaDistributedCache.cs
+++ b/Admin.NET/Admin.NET.Core/Cache/CaptchaDistributedCache.cs
@@ -42,6 +42,7 @@ public class CaptchaDistributedCache : IDistributedCache
public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
{
+ if (options.AbsoluteExpiration == null) return;
TimeSpan timeDifference = options.AbsoluteExpiration.Value.Subtract(DateTimeOffset.Now);
_cacheProvider.Cache.Set(GetKey(key), value, (int)timeDifference.TotalSeconds);
}
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs b/Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs
index d9a86b7d..b77f4aac 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs
@@ -52,16 +52,15 @@ public partial class SysJobTriggerRecord : EntityBaseId
public TriggerStatus Status { get; set; } = TriggerStatus.Ready;
///
- /// 本次执行结果
+ /// 执行结果
///
- [SugarColumn(ColumnDescription = "本次执行结果", Length = 128)]
- [MaxLength(128)]
+ [SugarColumn(ColumnDescription = "执行结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? Result { get; set; }
///
- /// 本次执行耗时
+ /// 执行耗时
///
- [SugarColumn(ColumnDescription = "本次执行耗时")]
+ [SugarColumn(ColumnDescription = "执行耗时")]
public long ElapsedTime { get; set; }
///
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysNotice.cs b/Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
index d8888589..caf76cf5 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
@@ -12,7 +12,7 @@ namespace Admin.NET.Core;
[SugarTable(null, "系统通知公告表")]
[SysTable]
[SugarIndex("index_{table}_T", nameof(Type), OrderByType.Asc)]
-public partial class SysNotice : EntityBase
+public partial class SysNotice : EntityTenant
{
///
/// 标题
diff --git a/Web/package.json b/Web/package.json
index 5a3919d4..183055c9 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
- "lastBuildTime": "2025.01.06",
+ "lastBuildTime": "2025.01.08",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@@ -38,7 +38,7 @@
"echarts-wordcloud": "^2.1.0",
"element-plus": "^2.9.2",
"exceljs": "^4.4.0",
- "ezuikit-js": "^8.1.3",
+ "ezuikit-js": "^8.1.4",
"gcoord": "^1.0.6",
"js-cookie": "^3.0.5",
"js-table2excel": "^1.1.2",
@@ -74,8 +74,8 @@
"vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
- "vxe-pc-ui": "^4.3.65",
- "vxe-table": "^4.10.1",
+ "vxe-pc-ui": "^4.3.67",
+ "vxe-table": "^4.10.3",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
"xe-utils": "^3.7.0",
@@ -93,7 +93,7 @@
"@vitejs/plugin-vue": "^5.2.1",
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vue/compiler-sfc": "^3.5.13",
- "code-inspector-plugin": "^0.19.1",
+ "code-inspector-plugin": "^0.19.2",
"eslint": "^9.17.0",
"eslint-plugin-vue": "^9.32.0",
"globals": "^15.14.0",