refactor： 降低sqlite依赖

fix: taos connection dispose
refactor: opcua AddSubscriptionAsync 添加延时和重试

src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj

@@ -45,9 +45,7 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
-	</ItemGroup>
+
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 

src/Admin/ThingsGateway.SqlSugar/TDengine/Core/TDengineConnection.cs

@@ -73,7 +73,7 @@ namespace TDengineAdo
 
         protected override void Dispose(bool disposing)
         {
-            connection.Dispose();
+            connection?.Dispose();
         }
 
 

src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj

@@ -24,7 +24,8 @@
 	<ItemGroup>
 		<PackageReference Include="SqlSugarCore.Dm" Version="8.8.0" />
 		<PackageReference Include="SqlSugarCore.Kdbndp" Version="9.3.7.613" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.20" />
+		<!--<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />-->
 		<PackageReference Include="MySqlConnector" Version="2.4.0" />
 		<PackageReference Include="Npgsql" Version="9.0.3" />
 		<PackageReference Include="CsvHelper" Version="33.1.0" />

src/Directory.Build.props

@@ -1,10 +1,10 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.9.1</PluginVersion>
-		<ProPluginVersion>10.9.1</ProPluginVersion>
-		<AuthenticationVersion>2.9.0</AuthenticationVersion>
-		<SourceGeneratorVersion>10.9.1</SourceGeneratorVersion>
+		<PluginVersion>10.9.3</PluginVersion>
+		<ProPluginVersion>10.9.3</ProPluginVersion>
+		<AuthenticationVersion>2.9.1</AuthenticationVersion>
+		<SourceGeneratorVersion>10.9.3</SourceGeneratorVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
 		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>
@@ -26,7 +26,7 @@
 		<AnalysisModeStyle>None</AnalysisModeStyle>
 
 		<NoWarn>
-			CS8603;CS8618;CS1591;CS8625;CS8602;CS8604;CS8600;CS8601;CS8714;CS8619;CS8629;CS8765;CS8634;CS8621;CS8767;CS8633;CS8620;CS8610;CS8631;CS8605;CS8622;CS8613;NU5100;NU5104;NU1903;NU1902;CA1813;CA1852;CA1822;CA2100;CA2008;CA1812;CA1508;CA1512;CA1513;CA1810;CA1814;CA1815;CA1835;CA1819;CA1823;CA2002;CA5350;CA5351;CA5358;CA5384;CA5392;CA1805;CA1851;CA1510;CA5401;CA2022;CA1848;CA2000;CA5394;CA3003;CA1515;CA1849;CA1863;CA5400
+			CS8603;CS8618;CS1591;CS8625;CS8602;CS8604;CS8600;CS8601;CS8714;CS8619;CS8629;CS8765;CS8634;CS8621;CS8767;CS8633;CS8620;CS8610;CS8631;CS8605;CS8622;CS8613;NU5100;NU5104;NU1903;NU1902;CA1813;CA1852;CA1822;CA2100;CA2008;CA1812;CA1508;CA1512;CA1513;CA1810;CA1814;CA1815;CA1835;CA1819;CA1823;CA2002;CA5350;CA5351;CA5358;CA5384;CA5392;CA1805;CA1851;CA1510;CA5401;CA2022;CA1848;CA2000;CA5394;CA3003;CA1515;CA1849;CA1863;CA5400;NETSDK1206
 		</NoWarn>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 		<LangVersion>13.0</LangVersion>

src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs

@@ -127,23 +127,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
             LogMessage?.LogWarning(ex, string.Format(AppResource.GetMethodError, ex.Message));
         }
 
-
-        if (VariableTasks.Count > 0)
-        {
-            foreach (var item in VariableTasks)
-            {
-                item.Stop();
-                TaskSchedulerLoop.Remove(item);
-            }
-
-            VariableTasks = AddVariableTask(cancellationToken);
-
-            foreach (var item in VariableTasks)
-            {
-                TaskSchedulerLoop.Add(item);
-                item.Start();
-            }
-        }
+        RefreshVariableTasks(cancellationToken);
 
         // 根据标签获取方法信息的局部函数
         List<VariableMethod> GetMethod(IEnumerable<VariableRuntime> tag)
@@ -169,6 +153,26 @@ public abstract class CollectBase : DriverBase, IRpcDriver
         }
     }
 
+    protected void RefreshVariableTasks(CancellationToken cancellationToken)
+    {
+        if (VariableTasks.Count > 0)
+        {
+            foreach (var item in VariableTasks)
+            {
+                item.Stop();
+                TaskSchedulerLoop.Remove(item);
+            }
+
+            VariableTasks = AddVariableTask(cancellationToken);
+
+            foreach (var item in VariableTasks)
+            {
+                TaskSchedulerLoop.Add(item);
+                item.Start();
+            }
+        }
+    }
+
     internal override void ProtectedInitDevice(DeviceRuntime device)
     {
         // 调用基类的初始化方法

src/Plugin/ThingsGateway.Foundation.OpcUa/OpcUaMaster/OpcUaMaster.cs

@@ -274,7 +274,24 @@ public class OpcUaMaster : IDisposable
         }
 
         m_session.AddSubscription(m_subscription);
-        await m_subscription.CreateAsync(cancellationToken).ConfigureAwait(false);
+        try
+        {
+            await m_subscription.CreateAsync(cancellationToken).ConfigureAwait(false);
+            await Task.Delay(100, cancellationToken).ConfigureAwait(false); // allow for subscription to be finished on server?
+        }
+        catch (Exception)
+        {
+            try
+            {
+                await m_subscription.CreateAsync(cancellationToken).ConfigureAwait(false);
+                await Task.Delay(100, cancellationToken).ConfigureAwait(false); // allow for subscription to be finished on server?
+            }
+            catch (Exception)
+            {
+                m_session.RemoveSubscription(m_subscription);
+                throw;
+            }
+        }
 
         m_subscription.AddItems(monitoredItems);
         foreach (var item in m_subscription.MonitoredItems.Where(a => a.Status.Error != null && StatusCode.IsBad(a.Status.Error.StatusCode)))

src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs

@@ -92,14 +92,14 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
         _config.ForType<VariableRuntime, QuestDBNumberHistoryValue>()
           //.Map(dest => dest.Id, src => CommonUtils.GetSingleId())
           .Map(dest => dest.Id, src => src.Id)//Id更改为变量Id
-          .Map(dest => dest.Value, src => ConvertUtility.Convert.ToDecimal(src.Value, 0))
+    .Map(dest => dest.Value, src => src.Value.GetType() == typeof(bool) ? ConvertUtility.Convert.ToBoolean(src.Value, false) ? 1 : 0 : ConvertUtility.Convert.ToDecimal(src.Value, 0))
           .Map(dest => dest.CollectTime, (src) => src.CollectTime < DateTime.MinValue ? utcTime : src.CollectTime)//注意sqlsugar插入时无时区，直接utc时间
           .Map(dest => dest.CreateTime, (src) => DateTime.UtcNow)
           ;//注意sqlsugar插入时无时区，直接utc时间
         _config.ForType<VariableBasicData, QuestDBNumberHistoryValue>()
     //.Map(dest => dest.Id, src => CommonUtils.GetSingleId())
     .Map(dest => dest.Id, src => src.Id)//Id更改为变量Id
-    .Map(dest => dest.Value, src => ConvertUtility.Convert.ToDecimal(src.Value, 0))
+    .Map(dest => dest.Value, src => src.Value.GetType() == typeof(bool) ? ConvertUtility.Convert.ToBoolean(src.Value, false) ? 1 : 0 : ConvertUtility.Convert.ToDecimal(src.Value, 0))
     .Map(dest => dest.CollectTime, (src) => src.CollectTime < DateTime.MinValue ? utcTime : src.CollectTime)//注意sqlsugar插入时无时区，直接utc时间
     .Map(dest => dest.CreateTime, (src) => DateTime.UtcNow)
     ;//注意sqlsugar插入时无时区，直接utc时间

src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.other.cs

@@ -120,30 +120,36 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
                 var stringData = dbInserts.Where(a => (!a.IsNumber && a.Value is not bool));
                 var numberData = dbInserts.Where(a => (a.IsNumber || a.Value is bool));
 
-
-                Stopwatch stopwatch = new();
-                stopwatch.Start();
-                var data = numberData.Adapt<List<QuestDBNumberHistoryValue>>(_config);
-                var result = await _db.Insertable(data).AS(_driverPropertys.NumberTableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
-                stopwatch.Stop();
-
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                if (result > 0)
+                if (numberData.Any())
                 {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.NumberTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+
+                    Stopwatch stopwatch = new();
+                    stopwatch.Start();
+                    var data = numberData.Adapt<List<QuestDBNumberHistoryValue>>(_config);
+                    var result = await _db.Insertable(data).AS(_driverPropertys.NumberTableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
+                    stopwatch.Stop();
+
+                    //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                    if (result > 0)
+                    {
+                        LogMessage?.Trace($"TableName：{_driverPropertys.NumberTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    }
                 }
 
 
-
-                stopwatch.Restart();
-                var strdata = stringData.Adapt<List<QuestDBHistoryValue>>(_config);
-                result = await _db.Insertable(strdata).AS(_driverPropertys.StringTableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
-                stopwatch.Stop();
-
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                if (result > 0)
+                if (stringData.Any())
                 {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.StringTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    Stopwatch stopwatch = new();
+                    stopwatch.Start();
+                    var data = stringData.Adapt<List<QuestDBHistoryValue>>(_config);
+                    var result = await _db.Insertable(data).AS(_driverPropertys.StringTableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
+                    stopwatch.Stop();
+
+                    //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                    if (result > 0)
+                    {
+                        LogMessage?.Trace($"TableName：{_driverPropertys.StringTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    }
                 }
             }
 

src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs

@@ -175,13 +175,13 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
         _config.ForType<VariableRuntime, SQLNumberHistoryValue>()
            //.Map(dest => dest.Id, (src) =>CommonUtils.GetSingleId())
            .Map(dest => dest.Id, src => src.Id)//Id更改为变量Id
-           .Map(dest => dest.Value, src => ConvertUtility.Convert.ToDecimal(src.Value, 0))
+    .Map(dest => dest.Value, src => src.Value.GetType() == typeof(bool) ? ConvertUtility.Convert.ToBoolean(src.Value, false) ? 1 : 0 : ConvertUtility.Convert.ToDecimal(src.Value, 0))
            .Map(dest => dest.CreateTime, (src) => DateTime.Now);
 
         _config.ForType<VariableBasicData, SQLNumberHistoryValue>()
     //.Map(dest => dest.Id, (src) =>CommonUtils.GetSingleId())
     .Map(dest => dest.Id, src => src.Id)//Id更改为变量Id
-    .Map(dest => dest.Value, src => ConvertUtility.Convert.ToDecimal(src.Value, 0))
+    .Map(dest => dest.Value, src => src.Value.GetType() == typeof(bool) ? ConvertUtility.Convert.ToBoolean(src.Value, false) ? 1 : 0 : ConvertUtility.Convert.ToDecimal(src.Value, 0))
     .Map(dest => dest.CreateTime, (src) => DateTime.Now);
 
         if (_businessPropertyWithCacheInterval.BusinessUpdateEnum == BusinessUpdateEnum.Interval && _driverPropertys.IsReadDB)

src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs

@@ -136,30 +136,35 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
                 var stringData = dbInserts.Where(a => (!a.IsNumber && a.Value is not bool));
                 var numberData = dbInserts.Where(a => (a.IsNumber || a.Value is bool));
 
-
-                Stopwatch stopwatch = new();
-                stopwatch.Start();
-                var data = numberData.Adapt<List<SQLNumberHistoryValue>>(_config);
-                var result = await _db.Fastest<SQLNumberHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(data).ConfigureAwait(false);
-                stopwatch.Stop();
-
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                if (result > 0)
+                if (numberData.Any())
                 {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.NumberTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    Stopwatch stopwatch = new();
+                    stopwatch.Start();
+                    var data = numberData.Adapt<List<SQLNumberHistoryValue>>(_config);
+                    var result = await _db.Fastest<SQLNumberHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(data).ConfigureAwait(false);
+                    stopwatch.Stop();
+
+                    //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                    if (result > 0)
+                    {
+                        LogMessage?.Trace($"TableName：{_driverPropertys.NumberTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    }
+
                 }
 
-
-
-                stopwatch.Restart();
-                var strdata = stringData.Adapt<List<SQLHistoryValue>>(_config);
-                result = await _db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(strdata).ConfigureAwait(false);
-                stopwatch.Stop();
-
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                if (result > 0)
+                if (stringData.Any())
                 {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.StringTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    Stopwatch stopwatch = new();
+                    stopwatch.Start();
+                    var data = stringData.Adapt<List<SQLHistoryValue>>(_config);
+                    var result = await _db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(data).ConfigureAwait(false);
+                    stopwatch.Stop();
+
+                    //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                    if (result > 0)
+                    {
+                        LogMessage?.Trace($"TableName：{_driverPropertys.StringTableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                    }
                 }
 
 

src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.other.cs

@@ -123,34 +123,10 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
                 var stringData = dbInserts.Where(a => (!a.IsNumber && a.Value is not bool));
                 var numberData = dbInserts.Where(a => (a.IsNumber || a.Value is bool));
 
-                Stopwatch stopwatch = new();
-                stopwatch.Start();
-                //var result = await db.Insertable(dbInserts).SetTDengineChildTableName((stableName, it) => $"{stableName}_{it.DeviceName}_{it.Name}").ExecuteCommandAsync().ConfigureAwait(false);//不要加分表
-
                 await InserableAsync(numberData, _driverPropertys.NumberTableNameLow, cancellationToken).ConfigureAwait(false);
 
-                stopwatch.Stop();
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                //if (result > 0)
-                {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.NumberTableNameLow}，Count：{dbInserts.Count}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
-                }
-
-
-                stopwatch.Restart();
-                //var result = await db.Insertable(dbInserts).SetTDengineChildTableName((stableName, it) => $"{stableName}_{it.DeviceName}_{it.Name}").ExecuteCommandAsync().ConfigureAwait(false);//不要加分表
-
                 await InserableAsync(stringData, _driverPropertys.StringTableNameLow, cancellationToken).ConfigureAwait(false);
 
-                stopwatch.Stop();
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-                //if (result > 0)
-                {
-                    LogMessage?.Trace($"TableName：{_driverPropertys.StringTableNameLow}，Count：{dbInserts.Count}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
-                }
-
-
-
             }
             return OperResult.Success;
         }
@@ -162,6 +138,13 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
 
     private async Task InserableAsync(IEnumerable<VariableBasicData> dbInserts, string tableName, CancellationToken cancellationToken)
     {
+        if (!dbInserts.Any())
+        {
+            return;
+        }
+        Stopwatch stopwatch = new();
+        stopwatch.Start();
+
         StringBuilder stringBuilder = new();
         stringBuilder.Append($"INSERT INTO");
         //(`id`,`createtime`,`collecttime`,`isonline`,`value`) 
@@ -188,7 +171,15 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
         stringBuilder.Append(';');
         stringBuilder.AppendLine();
 
-        await _db.Ado.ExecuteCommandAsync(stringBuilder.ToString(), default, cancellationToken: cancellationToken).ConfigureAwait(false);
+        var result = await _db.Ado.ExecuteCommandAsync(stringBuilder.ToString(), default, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+
+        stopwatch.Stop();
+        //if (result > 0)
+        {
+            LogMessage?.Trace($"TableName：{tableName}，Count：{result}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+        }
+
     }
     private string GetValue(VariableBasicData src)
     {

src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs

@@ -206,22 +206,8 @@ public class OpcDaMaster : CollectBase
         {
             LogMessage?.LogWarning(ex);
         }
-        if (VariableTasks.Count > 0)
-        {
-            foreach (var item in VariableTasks)
-            {
-                item.Stop();
-                TaskSchedulerLoop.Remove(item);
-            }
 
-            VariableTasks = AddVariableTask(cancellationToken);
-
-            foreach (var item in VariableTasks)
-            {
-                TaskSchedulerLoop.Add(item);
-                item.Start();
-            }
-        }
+        RefreshVariableTasks(cancellationToken);
     }
 
     private Dictionary<string, List<VariableRuntime>> VariableAddresDicts { get; set; } = new();

src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs

@@ -177,6 +177,9 @@ public class OpcUaMaster : CollectBase
                                         LogMessage?.LogInformation($"AddSubscription index  {CurrentDevice.VariableSourceReads.IndexOf(variableSourceRead)}  done");
 
                                     }
+
+                                    await Task.Delay(100, cancellationToken).ConfigureAwait(false); // allow for subscription to be finished on server?
+
                                 }
                                 LogMessage?.LogInformation("AddSubscriptions done");
                                 checkLog = true;
@@ -184,7 +187,7 @@ public class OpcUaMaster : CollectBase
                             catch (Exception ex)
                             {
                                 if (!checkLog)
-                                    LogMessage?.LogWarning(ex, "AddSubscriptions");
+                                    LogMessage?.LogWarning(ex, "AddSubscriptions error");
                                 checkLog = false;
                             }
                             finally
@@ -341,22 +344,8 @@ public class OpcUaMaster : CollectBase
             }
         }
 
-        if (VariableTasks.Count > 0)
-        {
-            foreach (var item in VariableTasks)
-            {
-                item.Stop();
-                TaskSchedulerLoop.Remove(item);
-            }
+        RefreshVariableTasks(cancellationToken);
 
-            VariableTasks = AddVariableTask(cancellationToken);
-
-            foreach (var item in VariableTasks)
-            {
-                TaskSchedulerLoop.Add(item);
-                item.Start();
-            }
-        }
     }
 
     private Dictionary<string, List<VariableRuntime>> VariableAddresDicts { get; set; } = new();

src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj

@@ -67,9 +67,7 @@
 		<!--<PlatformTarget>x86</PlatformTarget>-->
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
-	</ItemGroup>
+
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 

src/ThingsGateway.Photino/ThingsGateway.Photino.csproj

@@ -63,9 +63,7 @@
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
-	</ItemGroup>
+
 
 	<ItemGroup>
 		<Content Include="..\ThingsGateway.Server\Index\GatewayIndex.razor" Link="Index\GatewayIndex.razor" />

src/ThingsGateway.Server/ThingsGateway.Server.csproj

@@ -81,9 +81,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 	
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
-	</ItemGroup>
+
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 
@@ -145,4 +143,5 @@
 
 
 
+
 </Project>

src/ThingsGateway.Server/targets/PluginPublish.targets

@@ -16,12 +16,19 @@
 	</Target>
 
 
-	<Target Name="RemoveXmlDocs" AfterTargets="Build">
+	<Target Name="RemoveXmlDocs1" AfterTargets="Build">
 		<ItemGroup>
-			<XmlFilesToDelete Include="$(OutputPath)*.xml" />
+			<XmlFilesToDelete Include="$(TargetDir)*.xml" />
 		</ItemGroup>
 		<Delete Files="@(XmlFilesToDelete)" />
 	</Target>
-	
 
+	<Target Name="RemoveXmlDocs2" AfterTargets="Publish">
+		<ItemGroup>
+			<XmlFilesToDelete Include="$(PublishDir)*.xml" />
+		</ItemGroup>
+		<Delete Files="@(XmlFilesToDelete)" />
+	</Target>
+
+	
 </Project>

src/Upgrade/ThingsGateway.UpgradeServer/ThingsGateway.UpgradeServer.csproj

@@ -42,9 +42,7 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET9Version)" />
-	</ItemGroup>
+
 	<!--安装服务守护-->
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.1" />

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.9.1</Version>
+    <Version>10.9.3</Version>
   </PropertyGroup>
 
   <ItemGroup>