g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-21 03:01:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

10.7.56

Browse Source
This commit is contained in:
Diego
2025-06-13 13:35:38 +08:00
parent 1c7f8b5cab
commit 003b8a3763
41 changed files with 170 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Admin/ThingsGateway.Admin.Application/Aop/OperDescAttribute.cs
View File

@@ -20,6 +20,7 @@ using System.Collections.Concurrent;
using ThingsGateway.Extension;
using ThingsGateway.FriendlyException;
using ThingsGateway.NewLife.Json.Extension;
using ThingsGateway.SqlSugar;
namespace ThingsGateway.Admin.Application;
@@ -90,13 +91,12 @@ public sealed class OperDescAttribute : MoAttribute
OperDescAttribute.WriteToQueue(log);
}
}
private static SqlSugarClient _db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
/// <summary>
/// 将日志消息写入数据库中
/// </summary>
private static async Task ProcessQueue()
{
var db = DbContext.Db.GetConnectionScopeWithAttr<SysOperateLog>().CopyNew();
var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
while (!appLifetime.ApplicationStopping.IsCancellationRequested)
{
@@ -105,7 +105,7 @@ public sealed class OperDescAttribute : MoAttribute
var data = _logMessageQueue.ToListWithDequeue(); // 从日志队列中获取数据
if (data.Count > 0)
{
await db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);//入库
await _db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);//入库
}
}
catch (Exception ex)

9
src/Admin/ThingsGateway.Admin.Application/Job/Hardware/HardwareJob.cs
View File

@@ -20,6 +20,7 @@ using ThingsGateway.NewLife;
using ThingsGateway.NewLife.Caching;
using ThingsGateway.NewLife.Threading;
using ThingsGateway.Schedule;
using ThingsGateway.SqlSugar;
namespace ThingsGateway.Admin.Application;
@@ -60,7 +61,7 @@ public class HardwareJob : IJob, IHardwareJob
var historyHardwareInfos = MemoryCache.Get<List<HistoryHardwareInfo>>(CacheKey);
if (historyHardwareInfos == null)
{
using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
using var db = _db.CopyNew();
historyHardwareInfos = await db.Queryable<HistoryHardwareInfo>().Where(a => a.Date > DateTime.Now.AddDays(-3)).ToListAsync().ConfigureAwait(false);
MemoryCache.Set(CacheKey, historyHardwareInfos);
@@ -70,6 +71,7 @@ public class HardwareJob : IJob, IHardwareJob
private bool error = false;
private DateTime hisInsertTime = default;
private SqlSugarClient _db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
{
@@ -121,7 +123,6 @@ public class HardwareJob : IJob, IHardwareJob
if (DateTime.Now > hisInsertTime.Add(TimeSpan.FromMilliseconds(HardwareInfoOptions.HistoryInterval)))
{
hisInsertTime = DateTime.Now;
using var db = DbContext.Db.GetConnectionScopeWithAttr<HistoryHardwareInfo>().CopyNew();
{
var his = new HistoryHardwareInfo()
{
@@ -132,12 +133,12 @@ public class HardwareJob : IJob, IHardwareJob
CpuUsage = (HardwareInfo.MachineInfo.CpuRate * 100).ToInt(),
Temperature = (HardwareInfo.MachineInfo.Temperature).ToInt(),
};
await db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
await _db.Insertable(his).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
MemoryCache.Remove(CacheKey);
}
var sevenDaysAgo = TimerX.Now.AddDays(-HardwareInfoOptions.DaysAgo);
//删除特定信息
var result = await db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
var result = await _db.Deleteable<HistoryHardwareInfo>(a => a.Date <= sevenDaysAgo).ExecuteCommandAsync(stoppingToken).ConfigureAwait(false);
if (result > 0)
{
MemoryCache.Remove(CacheKey);

2
src/Admin/ThingsGateway.Admin.Application/SeedData/SysRelationSeedData.cs
View File

@@ -18,7 +18,7 @@ public class SysRelationSeedData : ISqlSugarEntitySeedData<SysRelation>
/// <inheritdoc/>
public IEnumerable<SysRelation> SeedData()
{
var db = DbContext.Db.GetConnectionScopeWithAttr<SysRelation>().CopyNew();
using var db = DbContext.Db.GetConnectionScopeWithAttr<SysRelation>().CopyNew();
if (db.Queryable<SysRelation>().Any(a => a.ObjectId == RoleConst.SuperAdminId))
return Enumerable.Empty<SysRelation>();
var data = SeedDataUtil.GetSeedData<SysRelation>(PathExtensions.CombinePathWithOs("SeedData", "Admin", "seed_sys_relation.json"));

10
src/Admin/ThingsGateway.DB/Services/SugarAopService/SugarAopService.cs
View File

@@ -124,16 +124,8 @@ public class SugarAopService : ISugarAopService
//执行时间超过1秒
if (db.Ado.SqlExecutionTime.TotalSeconds > 1)
{
//代码CS文件名
var fileName = db.Ado.SqlStackTrace.FirstFileName;
//代码行数
var fileLine = db.Ado.SqlStackTrace.FirstLine;
//方法名
var FirstMethodName = db.Ado.SqlStackTrace.FirstMethodName;
DbContext.WriteLog($"{fileName}-{FirstMethodName}-{fileLine} 执行时间超过1秒");
DbContext.WriteLog($"SQL执行时间超过1秒");
DbContext.WriteLogWithSql(UtilMethods.GetNativeSql(sql, pars));
}
};
}

4
src/Admin/ThingsGateway.NewLife.X/Common/MachineInfo.cs
View File

@@ -1160,7 +1160,7 @@ public class MachineInfo
public static String GetInfo(String path, String property, String? nameSpace = null)
{
// Linux Mono不支持WMI
if (Runtime.Mono) return "";
if (Runtime.Mono) return string.Empty;
var bbs = new List<String>();
try
@@ -1181,7 +1181,7 @@ public class MachineInfo
catch (Exception ex)
{
if (XTrace.Log.Level <= LogLevel.Debug) XTrace.WriteLine("WMI.GetInfo({0})失败！{1}", path, ex.Message);
return "";
return string.Empty;
}
bbs.Sort();

6
src/Admin/ThingsGateway.NewLife.X/IO/IOHelper.cs
View File

@@ -854,13 +854,13 @@ public static class IOHelper
/// <returns></returns>
public static String ToHex(this Byte[]? data, Int32 offset = 0, Int32 count = -1)
{
if (data == null || data.Length <= 0) return "";
if (data == null || data.Length <= 0) return string.Empty;
if (count < 0)
count = data.Length - offset;
else if (offset + count > data.Length)
count = data.Length - offset;
if (count == 0) return "";
if (count == 0) return string.Empty;
//return BitConverter.ToString(data).Replace("-", null);
// 上面的方法要替换-，效率太低
@@ -883,7 +883,7 @@ public static class IOHelper
/// <returns></returns>
public static String ToHex(this Byte[]? data, String? separate, Int32 groupSize = 0, Int32 maxLength = -1)
{
if (data == null || data.Length <= 0) return "";
if (data == null || data.Length <= 0) return string.Empty;
if (groupSize < 0) groupSize = 0;

4
src/Admin/ThingsGateway.SqlSugar/Sugar/Abstract/EntityMaintenance/EntityMaintenance.cs
View File

@@ -201,9 +201,9 @@ namespace ThingsGateway.SqlSugar
try
{
if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsNoReadXmlDescription == true)
if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsNoReadXmlDescription ?? true == true)
{
return "";
return string.Empty;
}
if (entityType.Assembly.IsDynamic && entityType.Assembly.FullName.StartsWith("Dynamic"))
{

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Entities/ConnMoreSettings.cs
View File

@@ -17,7 +17,7 @@
public int DefaultCacheDurationInSeconds { get; set; }
public bool? TableEnumIsString { get; set; }
public DateTime? DbMinDate { get; set; } = DateTime.MinValue.Date.AddYears(1900 - 1);
public bool IsNoReadXmlDescription { get; set; }
public bool IsNoReadXmlDescription { get; set; } = true;
public bool SqlServerCodeFirstNvarchar { get; set; }
public bool OracleCodeFirstNvarchar2 { get; set; }
public bool SqliteCodeFirstEnableDefaultValue { get; set; }

2
src/Admin/ThingsGateway.SqlSugar/Sugar/ExpressionsToSql/Common/ExpressionTool.cs
View File

@@ -501,7 +501,7 @@ namespace ThingsGateway.SqlSugar
{
return GetFirstTypeNameFromExpression(methodCall.Arguments.FirstOrDefault());
}
return "";
return string.Empty;
}
public static string GetMethodName(Expression expression)

2
src/Admin/ThingsGateway.SqlSugar/Sugar/ExpressionsToSql/ResolveItems/MapperExpressionResolve.cs
View File

@@ -245,7 +245,7 @@ namespace ThingsGateway.SqlSugar
public string GetMemberName(MemberExpression memberExpression)
{
return "";
return string.Empty;
}
private void ExtMapper(MapperExpressionInfo fillInfo, MapperExpressionInfo mappingFild1Info, MapperExpressionInfo mappingFild1Info2, MapperExpressionInfo selectInfo)

2
src/Admin/ThingsGateway.SqlSugar/Sugar/ExpressionsToSql/Subquery/Items/SubAndIF.cs
View File

@@ -47,7 +47,7 @@ namespace ThingsGateway.SqlSugar
var isWhere = Convert.ToBoolean(value);
if (!Convert.ToBoolean(isWhere))
{
return "";
return string.Empty;
}
var argExp = exp.Arguments[1];
var copyContext = this.Context;

2
src/Admin/ThingsGateway.SqlSugar/Sugar/ExpressionsToSql/Subquery/Items/SubWithNoLock.cs
View File

@@ -43,7 +43,7 @@ namespace ThingsGateway.SqlSugar
}
else
{
return "";
return string.Empty;
}
}
}

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Realization/Dm/DbMaintenance/DmDbMaintenance.cs
View File

@@ -576,7 +576,7 @@ WHERE table_name = '" + tableName + "'");
}
else
{
return "";
return string.Empty;
}
}

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Realization/MySql/SqlBuilder/MySqlBlukCopy.cs
View File

@@ -144,7 +144,7 @@ namespace ThingsGateway.SqlSugar
public string DataTableToCsvString(DataTable table)
{
if (table.Rows.Count == 0)
return "";
return string.Empty;
StringBuilder sb = new StringBuilder();
DataColumn colum;
foreach (DataRow row in table.Rows)

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Realization/Oracle/DbMaintenance/OracleDbMaintenance.cs
View File

@@ -262,7 +262,7 @@ namespace ThingsGateway.SqlSugar
{
get
{
return "";
return string.Empty;
}
}
#endregion

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Realization/QuestDB/DbMaintenance/QuestDBDbMaintenance.cs
View File

@@ -51,7 +51,7 @@ namespace ThingsGateway.SqlSugar
{
get
{
return "";
return string.Empty;
}
}
protected override string AddColumnToTableSql

6
src/Admin/ThingsGateway.SqlSugar/Sugar/Utilities/UtilConvert.cs
View File

@@ -92,12 +92,12 @@ namespace ThingsGateway.SqlSugar
public static string ObjToString(this object thisValue)
{
if (thisValue != null) return thisValue.ToString().Trim();
return "";
return string.Empty;
}
public static string ObjToStringNoTrim(this object thisValue)
{
if (thisValue != null) return thisValue.ToString();
return "";
return string.Empty;
}
public static string ObjToStringNew(this object thisValue)
{
@@ -110,7 +110,7 @@ namespace ThingsGateway.SqlSugar
return Convert.ToDateTime(thisValue.ToString()).ToString("yyyy-MM-dd");
}
if (thisValue != null) return thisValue.ToString().Trim();
return "";
return string.Empty;
}
public static string ObjToString(this object thisValue, string errorValue)

2
src/Admin/ThingsGateway.SqlSugar/Sugar/Utilities/UtilExtensions.cs
View File

@@ -57,7 +57,7 @@
public static string ObjToString(this object thisValue)
{
if (thisValue != null) return thisValue.ToString().Trim();
return "";
return string.Empty;
}
public static string ObjToString(this object thisValue, string errorValue)

43
src/Admin/ThingsGateway.SqlSugar/Sugar/Utilities/UtilMethods.cs
View File

@@ -893,42 +893,25 @@ namespace ThingsGateway.SqlSugar
return Guid.NewGuid() + "";
}
}
static Type IAsyncStateMachineType = typeof(IAsyncStateMachine);
public static bool IsAsyncMethod(MethodBase method)
{
if (method == null)
{
return false;
}
if (method.DeclaringType != null)
{
if (method.DeclaringType.GetInterfaces().Contains(typeof(IAsyncStateMachine)))
{
return true;
}
}
if (method == null) return false;
if (method.GetCustomAttribute<AsyncStateMachineAttribute>() != null)
return true;
if (method.DeclaringType?.GetInterfaces().Contains(IAsyncStateMachineType) == true)
return true;
// 补救方案：有些 async 方法是动态生成的，名字惯例判断
var name = method.Name;
if (name.Contains("OutputAsyncCausalityEvents"))
{
return true;
}
if (name.Contains("OutputWaitEtwEvents"))
{
return true;
}
if (name.Contains("ExecuteAsync"))
{
return true;
}
//if (method?.DeclaringType?.FullName?.Contains("Furion.InternalApp")==true)
//{
// return false;
//}
Type attType = typeof(AsyncStateMachineAttribute);
var attrib = (AsyncStateMachineAttribute)method.GetCustomAttribute(attType);
return (attrib != null);
return name.EndsWith("ExecuteAsync") || name.Contains("OutputAsyncCausalityEvents") || name.Contains("OutputWaitEtwEvents");
}
public static StackTraceInfo GetStackTrace()
{

2
src/Admin/ThingsGateway.SqlSugar/TDengine/TDengine/DbMaintenance/TDengineDbMaintenance.cs
View File

@@ -29,7 +29,7 @@ namespace ThingsGateway.SqlSugar.TDengine
{
get
{
return "";
return string.Empty;
}
}

4
src/Admin/ThingsGateway.SqlSugar/TDengine/Tools/UtilExtensions.cs
View File

@@ -16,7 +16,7 @@
public static string ObjToStringNoTrim(this object thisValue)
{
if (thisValue != null) return thisValue.ToString();
return "";
return string.Empty;
}
public static string ToLower(this string value, bool isLower)
{
@@ -78,7 +78,7 @@
public static string ObjToString(this object thisValue)
{
if (thisValue != null) return thisValue.ToString().Trim();
return "";
return string.Empty;
}
public static string ObjToString(this object thisValue, string errorValue)

4
src/Directory.Build.props
View File

@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<PluginVersion>10.7.55</PluginVersion>
<ProPluginVersion>10.7.55</ProPluginVersion>
<PluginVersion>10.7.56</PluginVersion>
<ProPluginVersion>10.7.56</ProPluginVersion>
<AuthenticationVersion>2.6.0</AuthenticationVersion>
<NET8Version>8.0.17</NET8Version>
<NET9Version>9.0.6</NET9Version>

12
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarmModel.cs
View File

@@ -23,6 +23,12 @@ public abstract class BusinessBaseWithCacheAlarmModel<VarModel, DevModel, AlarmM
protected ConcurrentQueue<CacheDBItem<AlarmModel>> _memoryAlarmModelQueue = new();
private volatile bool LocalDBCacheAlarmModelInited;
private CacheDB DBCacheAlarm;
protected internal override Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
DBCacheAlarm = LocalDBCacheAlarmModel();
return base.InitChannelAsync(channel, cancellationToken);
}
/// <summary>
/// 入缓存
@@ -161,10 +167,8 @@ public abstract class BusinessBaseWithCacheAlarmModel<VarModel, DevModel, AlarmM
{
while (!cancellationToken.IsCancellationRequested)
{
using var cache = LocalDBCacheAlarmModel();
//循环获取，固定读最大行数量，执行完成需删除行
var varList = await cache.DBProvider.Queryable<CacheDBItem<AlarmModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
var varList = await DBCacheAlarm.DBProvider.Queryable<CacheDBItem<AlarmModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
if (varList.Count > 0)
{
try
@@ -175,7 +179,7 @@ public abstract class BusinessBaseWithCacheAlarmModel<VarModel, DevModel, AlarmM
if (result.IsSuccess)
{
//删除缓存
await cache.DBProvider.Deleteable<CacheDBItem<AlarmModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
await DBCacheAlarm.DBProvider.Deleteable<CacheDBItem<AlarmModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
}
else
break;

13
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheDeviceModel.cs
View File

@@ -24,6 +24,14 @@ public abstract class BusinessBaseWithCacheDeviceModel<VarModel, DevModel> : Bus
private volatile bool LocalDBCacheDevModelInited;
private CacheDB DBCacheDev;
protected internal override Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
DBCacheDev = LocalDBCacheDevModel();
return base.InitChannelAsync(channel, cancellationToken);
}
/// <summary>
/// 入缓存
/// </summary>
@@ -159,10 +167,9 @@ public abstract class BusinessBaseWithCacheDeviceModel<VarModel, DevModel> : Bus
{
while (!cancellationToken.IsCancellationRequested)
{
using var cache = LocalDBCacheDevModel();
//循环获取
var varList = await cache.DBProvider.Queryable<CacheDBItem<DevModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
var varList = await DBCacheDev.DBProvider.Queryable<CacheDBItem<DevModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
if (varList.Count > 0)
{
try
@@ -173,7 +180,7 @@ public abstract class BusinessBaseWithCacheDeviceModel<VarModel, DevModel> : Bus
if (result.IsSuccess)
{
//删除缓存
await cache.DBProvider.Deleteable<CacheDBItem<DevModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
await DBCacheDev.DBProvider.Deleteable<CacheDBItem<DevModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
}
else
break;

22
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheVariableModel.cs
View File

@@ -25,6 +25,16 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
protected volatile bool success = true;
private volatile bool LocalDBCacheVarModelInited;
private volatile bool LocalDBCacheVarModelsInited;
private CacheDB DBCacheVar;
private CacheDB DBCacheVars;
protected internal override Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
DBCacheVar = LocalDBCacheVarModel();
DBCacheVars = LocalDBCacheVarModels();
return base.InitChannelAsync(channel, cancellationToken);
}
protected sealed override BusinessPropertyBase _businessPropertyBase => _businessPropertyWithCache;
protected abstract BusinessPropertyWithCache _businessPropertyWithCache { get; }
@@ -264,8 +274,8 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
while (!cancellationToken.IsCancellationRequested)
{
//循环获取
using var cache = LocalDBCacheVarModel();
var varList = await cache.DBProvider.Queryable<CacheDBItem<VarModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
var varList = await DBCacheVar.DBProvider.Queryable<CacheDBItem<VarModel>>().Take(_businessPropertyWithCache.SplitSize).ToListAsync(cancellationToken).ConfigureAwait(false);
if (varList.Count > 0)
{
try
@@ -276,7 +286,7 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
if (result.IsSuccess)
{
//删除缓存
await cache.DBProvider.Deleteable<CacheDBItem<VarModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
await DBCacheVar.DBProvider.Deleteable<CacheDBItem<VarModel>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
}
else
break;
@@ -325,8 +335,8 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
while (!cancellationToken.IsCancellationRequested)
{
//循环获取
using var cache = LocalDBCacheVarModels();
var varList = await cache.DBProvider.Queryable<CacheDBItem<List<VarModel>>>().FirstAsync(cancellationToken).ConfigureAwait(false);
var varList = await DBCacheVars.DBProvider.Queryable<CacheDBItem<List<VarModel>>>().FirstAsync(cancellationToken).ConfigureAwait(false);
if (varList?.Value?.Count > 0)
{
try
@@ -337,7 +347,7 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
if (result.IsSuccess)
{
//删除缓存
await cache.DBProvider.Deleteable<CacheDBItem<List<VarModel>>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
await DBCacheVars.DBProvider.Deleteable<CacheDBItem<List<VarModel>>>(varList).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
}
else
break;

6
src/Gateway/ThingsGateway.Gateway.Application/Services/Rpc/RpcService.cs
View File

@@ -18,6 +18,7 @@ using System.Collections.Concurrent;
using ThingsGateway.Extension;
using ThingsGateway.Extension.Generic;
using ThingsGateway.NewLife.Json.Extension;
using ThingsGateway.SqlSugar;
using TouchSocket.Core;
@@ -249,12 +250,13 @@ internal sealed class RpcService : IRpcService
return new(results);
}
private SqlSugarClient _db = DbContext.Db.GetConnectionScopeWithAttr<RpcLog>().CopyNew(); // 创建一个新的数据库上下文实例
/// <summary>
/// 异步执行RPC日志插入操作的方法。
/// </summary>
private async Task RpcLogInsertAsync()
{
var db = DbContext.Db.GetConnectionScopeWithAttr<RpcLog>().CopyNew(); // 创建一个新的数据库上下文实例
var appLifetime = App.RootServices!.GetService<IHostApplicationLifetime>()!;
while (!appLifetime.ApplicationStopping.IsCancellationRequested)
{
@@ -264,7 +266,7 @@ internal sealed class RpcService : IRpcService
if (data.Count > 0)
{
// 将数据插入到数据库中
await db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);
await _db.InsertableWithAttr(data).ExecuteCommandAsync(appLifetime.ApplicationStopping).ConfigureAwait(false);
}
}
catch (Exception ex)

2
src/Gateway/ThingsGateway.Gateway.Razor/Pages/RulesEngine/Component/CSharpScriptWidget.razor.cs
View File

@@ -47,7 +47,7 @@ namespace ThingsGateway.Gateway.Razor
return (await expressionNode.ExecuteAsync(new NodeInput(){Value=a==null?a:JToken.Parse(a??string.Empty) },default).ConfigureAwait(false)).JToken?.ToString();
if(Node is IActuatorNode actuatorNode)
return (await actuatorNode.ExecuteAsync(new NodeInput(){Value=a==null?a:JToken.Parse(a??string.Empty) },default).ConfigureAwait(false)).JToken?.ToString();
return "";
return string.Empty;
}) },
{nameof(ScriptEdit.Script),Node.Text },
{nameof(ScriptEdit.ScriptChanged),EventCallback.Factory.Create<string>(this, v =>

2
src/Plugin/ThingsGateway.Foundation.OpcDa/COM/Rcw/ItemProperty.cs
View File

@@ -188,7 +188,7 @@ public struct PropertyID : ISerializable
return $"{Code}";
}
return "";
return string.Empty;
}
private sealed class Names

17
src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
View File

@@ -14,6 +14,7 @@ using Mapster;
using ThingsGateway.Admin.Application;
using ThingsGateway.Foundation;
using ThingsGateway.NewLife;
using ThingsGateway.NewLife.Extension;
using ThingsGateway.Plugin.DB;
using ThingsGateway.SqlSugar;
@@ -45,6 +46,13 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
public override VariablePropertyBase VariablePropertys => _variablePropertys;
protected override BusinessPropertyWithCacheInterval _businessPropertyWithCacheInterval => _driverPropertys;
private SqlSugarClient _db;
protected override void Dispose(bool disposing)
{
_db?.TryDispose();
base.Dispose(disposing);
}
public async Task<SqlSugarPagedList<IDBHistoryValue>> GetDBHistoryValuePagesAsync(DBHistoryValuePageInput input)
{
@@ -60,7 +68,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
_db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
_config = new TypeAdapterConfig();
DateTime utcTime = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
_config.ForType<VariableRuntime, QuestDBHistoryValue>()
@@ -153,20 +161,19 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
protected override async Task ProtectedStartAsync(CancellationToken cancellationToken)
{
var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
db.DbMaintenance.CreateDatabase();
_db.DbMaintenance.CreateDatabase();
//必须为间隔上传
if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
{
DynamicSQLBase? hisModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
hisModel.Logger = LogMessage;
await hisModel.DBInit(db, cancellationToken).ConfigureAwait(false);
await hisModel.DBInit(_db, cancellationToken).ConfigureAwait(false);
}
else
{
db.CodeFirst.As<QuestDBHistoryValue>(_driverPropertys.TableName).InitTables(typeof(QuestDBHistoryValue));
_db.CodeFirst.As<QuestDBHistoryValue>(_driverPropertys.TableName).InitTables(typeof(QuestDBHistoryValue));
}
await base.ProtectedStartAsync(cancellationToken).ConfigureAwait(false);

7
src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.other.cs
View File

@@ -105,14 +105,13 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
{
try
{
var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
db.Ado.CancellationToken = cancellationToken;
_db.Ado.CancellationToken = cancellationToken;
if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
{
var getDeviceModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
getDeviceModel.Logger = LogMessage;
await getDeviceModel.DBInsertable(db, dbInserts, cancellationToken).ConfigureAwait(false);
await getDeviceModel.DBInsertable(_db, dbInserts, cancellationToken).ConfigureAwait(false);
}
else
@@ -120,7 +119,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
Stopwatch stopwatch = new();
stopwatch.Start();
var result = await db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
var result = await _db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
stopwatch.Stop();
//var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);

22
src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
View File

@@ -15,6 +15,7 @@ using Mapster;
using ThingsGateway.Admin.Application;
using ThingsGateway.Debug;
using ThingsGateway.Foundation;
using ThingsGateway.NewLife;
using ThingsGateway.NewLife.Extension;
using ThingsGateway.Plugin.DB;
using ThingsGateway.SqlSugar;
@@ -46,7 +47,12 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
public override VariablePropertyBase VariablePropertys => _variablePropertys;
protected override BusinessPropertyWithCacheInterval _businessPropertyWithCacheInterval => _driverPropertys;
private SqlSugarClient _db;
protected override void Dispose(bool disposing)
{
_db?.TryDispose();
base.Dispose(disposing);
}
public async Task<SqlSugarPagedList<IDBHistoryValue>> GetDBHistoryValuePagesAsync(DBHistoryValuePageInput input)
{
var data = await Query(input).ToPagedListAsync<SQLHistoryValue, IDBHistoryValue>(input.Current, input.Size).ConfigureAwait(false);//分页
@@ -151,6 +157,8 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
_db = SqlDBBusinessDatabaseUtil.GetDb(_driverPropertys);
_config = new TypeAdapterConfig();
_config.ForType<VariableRuntime, SQLHistoryValue>()
//.Map(dest => dest.Id, (src) =>CommonUtils.GetSingleId())
@@ -173,11 +181,9 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
_initRealData = false;
return base.AfterVariablesChangedAsync(cancellationToken);
}
protected override async Task ProtectedStartAsync(CancellationToken cancellationToken)
{
var db = SqlDBBusinessDatabaseUtil.GetDb(_driverPropertys);
db.DbMaintenance.CreateDatabase();
_db.DbMaintenance.CreateDatabase();
//必须为间隔上传
if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
@@ -186,14 +192,14 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
if (_driverPropertys.IsHistoryDB)
{
await hisModel.DBInit(db, cancellationToken).ConfigureAwait(false);
await hisModel.DBInit(_db, cancellationToken).ConfigureAwait(false);
}
}
else
{
if (_driverPropertys.IsHistoryDB)
db.CodeFirst.InitTables(typeof(SQLHistoryValue));
_db.CodeFirst.InitTables(typeof(SQLHistoryValue));
}
if (!_driverPropertys.BigTextScriptRealTable.IsNullOrEmpty())
{
@@ -201,14 +207,14 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
if (_driverPropertys.IsReadDB)
{
await realModel.DBInit(db, cancellationToken).ConfigureAwait(false);
await realModel.DBInit(_db, cancellationToken).ConfigureAwait(false);
}
}
else
{
if (_driverPropertys.IsReadDB)
db.CodeFirst.As<SQLRealValue>(_driverPropertys.ReadDBTableName).InitTables<SQLRealValue>();
_db.CodeFirst.As<SQLRealValue>(_driverPropertys.ReadDBTableName).InitTables<SQLRealValue>();
}
await base.ProtectedStartAsync(cancellationToken).ConfigureAwait(false);

18
src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
View File

@@ -120,22 +120,21 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
{
try
{
var db = SqlDBBusinessDatabaseUtil.GetDb(_driverPropertys);
db.Ado.CancellationToken = cancellationToken;
_db.Ado.CancellationToken = cancellationToken;
if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
{
var getDeviceModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
getDeviceModel.Logger = LogMessage;
await getDeviceModel.DBInsertable(db, dbInserts, cancellationToken).ConfigureAwait(false);
await getDeviceModel.DBInsertable(_db, dbInserts, cancellationToken).ConfigureAwait(false);
}
else
{
Stopwatch stopwatch = new();
stopwatch.Start();
var result = await db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(dbInserts).ConfigureAwait(false);
var result = await _db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(dbInserts).ConfigureAwait(false);
//var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
stopwatch.Stop();
if (result > 0)
@@ -157,15 +156,14 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
{
try
{
var db = SqlDBBusinessDatabaseUtil.GetDb(_driverPropertys);
db.Ado.CancellationToken = cancellationToken;
_db.Ado.CancellationToken = cancellationToken;
if (!_driverPropertys.BigTextScriptRealTable.IsNullOrEmpty())
{
var getDeviceModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptRealTable);
getDeviceModel.Logger = LogMessage;
await getDeviceModel.DBInsertable(db, datas, cancellationToken).ConfigureAwait(false);
await getDeviceModel.DBInsertable(_db, datas, cancellationToken).ConfigureAwait(false);
return OperResult.Success;
}
@@ -176,9 +174,9 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
{
Stopwatch stopwatch = new();
stopwatch.Start();
var ids = (await db.Queryable<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).Select(a => a.Id).ToListAsync(cancellationToken).ConfigureAwait(false)).ToHashSet();
var ids = (await _db.Queryable<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).Select(a => a.Id).ToListAsync(cancellationToken).ConfigureAwait(false)).ToHashSet();
var InsertData = IdVariableRuntimes.Where(a => !ids.Contains(a.Key)).Select(a => a.Value).Adapt<List<SQLRealValue>>();
var result = await db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkCopyAsync(InsertData).ConfigureAwait(false);
var result = await _db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkCopyAsync(InsertData).ConfigureAwait(false);
_initRealData = true;
stopwatch.Stop();
if (result > 0)
@@ -192,7 +190,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
Stopwatch stopwatch = new();
stopwatch.Start();
var result = await db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkUpdateAsync(datas).ConfigureAwait(false);
var result = await _db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkUpdateAsync(datas).ConfigureAwait(false);
stopwatch.Stop();
if (result > 0)

12
src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
View File

@@ -15,6 +15,7 @@ using Mapster;
using ThingsGateway.Admin.Application;
using ThingsGateway.Extension.Generic;
using ThingsGateway.Foundation;
using ThingsGateway.NewLife;
using ThingsGateway.SqlSugar;
using TouchSocket.Core;
@@ -36,8 +37,13 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor
protected override BusinessPropertyWithCache _businessPropertyWithCache => _driverPropertys;
private SqlSugarClient _db;
protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
_db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
_config.ForType<AlarmVariable, HistoryAlarm>().Map(dest => dest.Id, (src) => CommonUtils.GetSingleId());
GlobalData.AlarmChangedEvent -= AlarmWorker_OnAlarmChanged;
@@ -73,15 +79,15 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor
protected override void Dispose(bool disposing)
{
_db?.TryDispose();
GlobalData.AlarmChangedEvent -= AlarmWorker_OnAlarmChanged;
base.Dispose(disposing);
}
protected override Task ProtectedStartAsync(CancellationToken cancellationToken)
{
using var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
db.DbMaintenance.CreateDatabase();
db.CodeFirst.As<HistoryAlarm>(_driverPropertys.TableName).InitTables<HistoryAlarm>();
_db.DbMaintenance.CreateDatabase();
_db.CodeFirst.As<HistoryAlarm>(_driverPropertys.TableName).InitTables<HistoryAlarm>();
return base.ProtectedStartAsync(cancellationToken);
}

7
src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.other.cs
View File

@@ -60,17 +60,16 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor
{
try
{
using var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
int result = 0;
//.SplitTable()
Stopwatch stopwatch = new();
stopwatch.Start();
if (db.CurrentConnectionConfig.DbType == SqlSugar.DbType.QuestDB)
result = await db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
if (_db.CurrentConnectionConfig.DbType == SqlSugar.DbType.QuestDB)
result = await _db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
else
result = await db.Fastest<HistoryAlarm>().AS(_driverPropertys.TableName).PageSize(50000).BulkCopyAsync(dbInserts).ConfigureAwait(false);
result = await _db.Fastest<HistoryAlarm>().AS(_driverPropertys.TableName).PageSize(50000).BulkCopyAsync(dbInserts).ConfigureAwait(false);
stopwatch.Stop();

16
src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
View File

@@ -18,6 +18,7 @@ using System.Reflection;
using ThingsGateway.Admin.Application;
using ThingsGateway.Foundation;
using ThingsGateway.NewLife;
using ThingsGateway.NewLife.Extension;
using ThingsGateway.Plugin.DB;
using ThingsGateway.SqlSugar;
@@ -58,7 +59,11 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
var data = await Query(input).ToPagedListAsync<TDengineDBHistoryValue, IDBHistoryValue>(input.Current, input.Size).ConfigureAwait(false);//分页
return data;
}
protected override void Dispose(bool disposing)
{
_db?.TryDispose();
base.Dispose(disposing);
}
public async Task<List<IDBHistoryValue>> GetDBHistoryValuesAsync(DBHistoryValuePageInput input)
{
var data = await Query(input).ToListAsync().ConfigureAwait(false);
@@ -67,6 +72,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
{
InstanceFactory.RemoveCache();
_db = TDengineDBUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr, _driverPropertys.TableNameLow);
List<Assembly> assemblies = new();
foreach (var item in InstanceFactory.CustomAssemblies)
{
@@ -160,11 +166,11 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
}
return ret;
}
private SqlSugarClient _db;
protected override async Task ProtectedStartAsync(CancellationToken cancellationToken)
{
var db = TDengineDBUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr, _driverPropertys.TableNameLow);
db.DbMaintenance.CreateDatabase();
_db.DbMaintenance.CreateDatabase();
//必须为间隔上传
@@ -172,7 +178,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
{
var hisModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
{
await hisModel.DBInit(db, cancellationToken).ConfigureAwait(false);
await hisModel.DBInit(_db, cancellationToken).ConfigureAwait(false);
}
}
@@ -187,7 +193,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
`isonline` BOOL ,
`value` VARCHAR(255) ) TAGS(`devicename` VARCHAR(100) ,`name` VARCHAR(100))
""";
await db.Ado.ExecuteCommandAsync(sql, default, cancellationToken: cancellationToken).ConfigureAwait(false);
await _db.Ado.ExecuteCommandAsync(sql, default, cancellationToken: cancellationToken).ConfigureAwait(false);
}
await base.ProtectedStartAsync(cancellationToken).ConfigureAwait(false);
}

7
src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.other.cs
View File

@@ -107,14 +107,13 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
{
try
{
var db = TDengineDBUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr, _driverPropertys.TableNameLow);
db.Ado.CancellationToken = cancellationToken;
_db.Ado.CancellationToken = cancellationToken;
if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
{
var getDeviceModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
getDeviceModel.Logger = LogMessage;
await getDeviceModel.DBInsertable(db, dbInserts, cancellationToken).ConfigureAwait(false);
await getDeviceModel.DBInsertable(_db, dbInserts, cancellationToken).ConfigureAwait(false);
}
else
@@ -149,7 +148,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
stringBuilder.Append(';');
stringBuilder.AppendLine();
await db.Ado.ExecuteCommandAsync(stringBuilder.ToString(), default, cancellationToken: cancellationToken).ConfigureAwait(false);
await _db.Ado.ExecuteCommandAsync(stringBuilder.ToString(), default, cancellationToken: cancellationToken).ConfigureAwait(false);
stopwatch.Stop();
//var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);

3
src/ThingsGateway.Server/ThingsGateway.Server.csproj
View File

@@ -38,6 +38,9 @@
<!--打包复制-->
<Import Project="targets\PluginPublish.targets" />
<PropertyGroup>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
<CustomTargetFramework>$(TargetFramework)</CustomTargetFramework>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

6
src/ThingsGateway.Server/targets/Gateway.targets
View File

@@ -22,7 +22,7 @@
</ItemGroup>
<PropertyGroup>
<RulesEngineApplicationFolder>$(TargetDir)SeedData\RulesEngine\</RulesEngineApplicationFolder>
<ManagementApplicationFolder>$(TargetDir)SeedData\SeedData\</ManagementApplicationFolder>
<ManagementApplicationFolder>$(TargetDir)SeedData\Management\</ManagementApplicationFolder>
<GatewayApplicationFolder>$(TargetDir)SeedData\Gateway\</GatewayApplicationFolder>
</PropertyGroup>
<RemoveDir Directories="$(RulesEngineApplicationFolder)" />
@@ -48,4 +48,8 @@
<!--Gateway-->
</Project>

8
src/ThingsGateway.Server/targets/PluginPublish.targets
View File

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

5
src/ThingsGateway.sln
View File

@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "other", "other", "{0B748352
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
..\git_pull.bat = ..\git_pull.bat
PluginVersion.props = PluginVersion.props
Version.props = Version.props
EndProjectSection
@@ -319,8 +318,8 @@ Global
{AFC0BEE4-E682-BCED-F631-99707421015A} = {5948EA23-4B42-4C22-A266-2E0AE5FA575F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
RESX_NeutralResourcesLanguage = zh-Hans
RESX_Rules = {"EnabledRules":[]}
RESX_NeutralResourcesLanguage = zh-Hans
SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
EndGlobalSection
EndGlobal

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>10.7.55</Version>
<Version>10.7.56</Version>
</PropertyGroup>
<ItemGroup>