From 14f3c312650fa695bf3924a32e31604620a48de7 Mon Sep 17 00:00:00 2001
From: "2248356998 qq.com" <2248356998@qq.com>
Date: Tue, 14 Oct 2025 22:22:06 +0800
Subject: [PATCH] build: 10.11.102

---
 .../ThingsGateway.Common.csproj                    |  2 +-
 .../Common/ExpiringDictionary.cs                   | 14 +++++++++-----
 .../ThingsGateway.SqlSugar.csproj                  |  2 +-
 src/Directory.Build.props                          |  6 +++---
 .../Variable/VariableRow.razor.cs                  |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
index f2009f12d..48d8cecb6 100644
--- a/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
+++ b/src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
@@ -14,7 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.7" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-		<PackageReference Include="BootstrapBlazor" Version="9.11.1" />
+		<PackageReference Include="BootstrapBlazor" Version="9.11.2" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Admin/ThingsGateway.NewLife.X/Common/ExpiringDictionary.cs b/src/Admin/ThingsGateway.NewLife.X/Common/ExpiringDictionary.cs
index e20ed8780..732227dcb 100644
--- a/src/Admin/ThingsGateway.NewLife.X/Common/ExpiringDictionary.cs
+++ b/src/Admin/ThingsGateway.NewLife.X/Common/ExpiringDictionary.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
 
 using ThingsGateway.NewLife.Threading;
 namespace ThingsGateway.NewLife;
@@ -51,18 +52,20 @@ public class ExpiringDictionary<TKey, TValue> : IDisposable
             return rs;
         }
     }
+    private ConcurrentDictionary<TKey, CacheItem> _dict;
 
-    private ConcurrentDictionary<TKey, CacheItem> _dict = new();
     private readonly TimerX _cleanupTimer;
     private int defaultExpire = 60;
-    public ExpiringDictionary(int expire = 60)
+    IEqualityComparer<TKey>? comparer;
+    public ExpiringDictionary(int expire = 60, IEqualityComparer<TKey>? comparer = null)
     {
         defaultExpire = expire;
+        this.comparer = comparer;
+        _dict = new ConcurrentDictionary<TKey, CacheItem>(comparer);
+
         _cleanupTimer = new TimerX(TimerClear, null, 10000, 10000) { Async = true };
     }
 
-
-
     public bool TryAdd(TKey key, TValue value)
     {
         if (_dict.TryGetValue(key, out var item))
@@ -109,7 +112,7 @@ public class ExpiringDictionary<TKey, TValue> : IDisposable
     private void Clear(object? state)
     {
         var data = _dict;
-        _dict = new();
+        _dict = new(comparer);
         data.Clear();
     }
     private void TimerClear(object? state)
@@ -143,3 +146,4 @@ public class ExpiringDictionary<TKey, TValue> : IDisposable
         _cleanupTimer.Dispose();
     }
 }
+
diff --git a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
index 236abb739..c48a183cc 100644
--- a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
+++ b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
@@ -31,7 +31,7 @@
 		<PackageReference Include="Npgsql" Version="9.0.4" />
 		<PackageReference Include="CsvHelper" Version="33.1.0" />
 		<PackageReference Include="TDengine.Connector" Version="3.1.9" />
-		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
+		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.26.0" />
 		<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.28" />
 		<PackageReference Include="System.Data.Common" Version="4.3.0" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 83aaa70a3..fd8148b7a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.11.101</PluginVersion>
-		<ProPluginVersion>10.11.101</ProPluginVersion>
-		<DefaultVersion>10.11.101</DefaultVersion>
+		<PluginVersion>10.11.102</PluginVersion>
+		<ProPluginVersion>10.11.102</ProPluginVersion>
+		<DefaultVersion>10.11.102</DefaultVersion>
 		<AuthenticationVersion>10.11.6</AuthenticationVersion>
 		<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
 		<NET8Version>8.0.20</NET8Version>
diff --git a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRow.razor.cs b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRow.razor.cs
index 9abcf91a2..8c0b08be8 100644
--- a/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRow.razor.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRow.razor.cs
@@ -57,7 +57,7 @@ public partial class VariableRow : IDisposable
     /// <param name="col"></param>
     /// <param name="item"></param>
     /// <returns></returns>
-    protected RenderFragment GetValue(ITableColumn col, VariableRuntime item) => builder =>
+    protected static RenderFragment GetValue(ITableColumn col, VariableRuntime item) => builder =>
     {
         if (col.Template != null)
         {