From cd66255bd241716a3d0c0156554a8dc00a3bde43 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 8 Jan 2025 21:55:55 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E7=A7=9F=E6=88=B7=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=20=202=E3=80=81=E4=BF=AE=E5=A4=8D=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E5=99=A8=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=20=203=E3=80=81=E4=BF=AE=E5=A4=8Dredis?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=97=B6=E9=97=B4=E7=A9=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=204=E3=80=81=E5=8D=87=E7=BA=A7=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/Admin.NET.Core.csproj | 2 +- .../Admin.NET.Core/Cache/CaptchaDistributedCache.cs | 1 + Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs | 9 ++++----- Admin.NET/Admin.NET.Core/Entity/SysNotice.cs | 2 +- Web/package.json | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) 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",