gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、增加通知公告租户过滤 2、修复触发器执行结果字段长度 3、修复redis缓存时间空问题 4、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-01-08 21:55:55 +08:00
parent 0bc75bb7d5
commit cd66255bd2
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -49,7 +49,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1158" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1159" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

1
Admin.NET/Admin.NET.Core/Cache/CaptchaDistributedCache.cs
View File

@ -42,6 +42,7 @@ public class CaptchaDistributedCache : IDistributedCache
public void Set(string key, byte[] value, DistributedCacheEntryOptions options) public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
{ {
if (options.AbsoluteExpiration == null) return;
TimeSpan timeDifference = options.AbsoluteExpiration.Value.Subtract(DateTimeOffset.Now); TimeSpan timeDifference = options.AbsoluteExpiration.Value.Subtract(DateTimeOffset.Now);
_cacheProvider.Cache.Set(GetKey(key), value, (int)timeDifference.TotalSeconds); _cacheProvider.Cache.Set(GetKey(key), value, (int)timeDifference.TotalSeconds);
} }

9
Admin.NET/Admin.NET.Core/Entity/SysJobTriggerRecord.cs
View File

@ -52,16 +52,15 @@ public partial class SysJobTriggerRecord : EntityBaseId
public TriggerStatus Status { get; set; } = TriggerStatus.Ready; public TriggerStatus Status { get; set; } = TriggerStatus.Ready;
/// <summary> /// <summary>
/// 本次执行结果 /// 执行结果
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "本次执行结果", Length = 128)] [SugarColumn(ColumnDescription = "执行结果", ColumnDataType = StaticConfig.CodeFirst_BigString)]
[MaxLength(128)]
public string? Result { get; set; } public string? Result { get; set; }
/// <summary> /// <summary>
/// 本次执行耗时 /// 执行耗时
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "本次执行耗时")] [SugarColumn(ColumnDescription = "执行耗时")]
public long ElapsedTime { get; set; } public long ElapsedTime { get; set; }
/// <summary> /// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
View File

@ -12,7 +12,7 @@ namespace Admin.NET.Core;
[SugarTable(null, "系统通知公告表")] [SugarTable(null, "系统通知公告表")]
[SysTable] [SysTable]
[SugarIndex("index_{table}_T", nameof(Type), OrderByType.Asc)] [SugarIndex("index_{table}_T", nameof(Type), OrderByType.Asc)]
public partial class SysNotice : EntityBase public partial class SysNotice : EntityTenant
{ {
/// <summary> /// <summary>
/// 标题 /// 标题

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.01.06", "lastBuildTime": "2025.01.08",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -38,7 +38,7 @@
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",
"element-plus": "^2.9.2", "element-plus": "^2.9.2",
"exceljs": "^4.4.0", "exceljs": "^4.4.0",
"ezuikit-js": "^8.1.3", "ezuikit-js": "^8.1.4",
"gcoord": "^1.0.6", "gcoord": "^1.0.6",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"js-table2excel": "^1.1.2", "js-table2excel": "^1.1.2",
@ -74,8 +74,8 @@
"vue-router": "^4.5.0", "vue-router": "^4.5.0",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.65", "vxe-pc-ui": "^4.3.67",
"vxe-table": "^4.10.1", "vxe-table": "^4.10.3",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
"xe-utils": "^3.7.0", "xe-utils": "^3.7.0",
@ -93,7 +93,7 @@
"@vitejs/plugin-vue": "^5.2.1", "@vitejs/plugin-vue": "^5.2.1",
"@vitejs/plugin-vue-jsx": "^4.1.1", "@vitejs/plugin-vue-jsx": "^4.1.1",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.19.1", "code-inspector-plugin": "^0.19.2",
"eslint": "^9.17.0", "eslint": "^9.17.0",
"eslint-plugin-vue": "^9.32.0", "eslint-plugin-vue": "^9.32.0",
"globals": "^15.14.0", "globals": "^15.14.0",