g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!56 恢复插件隔离

Browse Source 
* 恢复插件域
This commit is contained in:
Diego2098
2025-01-02 04:03:14 +00:00
parent ec5ff0a07f
commit a3e9ecf30f
17 changed files with 440 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Directory.Build.props
View File

@@ -2,9 +2,9 @@
<PropertyGroup>
<AdminVersion>7.2.0.59</AdminVersion>
<GatewayVersion>7.2.1.2</GatewayVersion>
<PluginVersion>9.0.2.68</PluginVersion>
<ProPluginVersion>9.0.2.87</ProPluginVersion>
<GatewayVersion>7.2.1.8</GatewayVersion>
<PluginVersion>9.0.3.1</PluginVersion>
<ProPluginVersion>9.0.3.1</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

11
src/Gateway/ThingsGateway.Gateway.Application/Model/VariableRunTime.cs
View File

@@ -12,6 +12,7 @@ using BootstrapBlazor.Components;
using Mapster;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using ThingsGateway.Core.Json.Extension;
@@ -182,7 +183,15 @@ public class VariableRunTime : Variable, IVariable
{
IsOnline = false;
Set(null, dateTime);
lastErrorMessage = $"{Name} Conversion expression failed：{ex.Message}";
if (ex.StackTrace != null)
{
string stachTrace = string.Join(Environment.NewLine, ex.StackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.None).Take(3));
lastErrorMessage = $"{Name} Conversion expression failed：{ex.Message}{Environment.NewLine}{stachTrace}";
}
else
{
lastErrorMessage = $"{Name} Conversion expression failed：{ex.Message}{Environment.NewLine}";
}
return new($"{Name} Conversion expression failed", ex);
}
}

5
src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/IPluginService.cs
View File

@@ -57,6 +57,11 @@ public interface IPluginService
/// </summary>
public QueryData<PluginOutput> Page(QueryPageOptions options, PluginTypeEnum? pluginTypeEnum = null);
/// <summary>
/// 重载插件
/// </summary>
void Reload();
/// <summary>
/// 添加插件
/// </summary>

321
src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginService.cs
View File

@@ -35,10 +35,15 @@ namespace ThingsGateway.Gateway.Application;
/// </summary>
internal sealed class PluginService : IPluginService
{
/// <summary>
/// 主程序上下文驱动父名称
/// </summary>
public const string DefaultKey = nameof(ThingsGateway);
/// <summary>
/// 插件驱动文件夹名称
/// </summary>
public const string DirName = "Plugins";
public const string DirName = "GatewayPlugins";
private const string _cacheKeyGetPluginOutputs = $"{ThingsGatewayCacheConst.Cache_Prefix}{nameof(PluginService)}{nameof(GetList)}";
private const string SaveEx = ".save";
@@ -63,13 +68,25 @@ internal sealed class PluginService : IPluginService
//创建插件文件夹
Directory.CreateDirectory(AppContext.BaseDirectory.CombinePathWithOs(PluginService.DirName));
//主程序上下文驱动类字典
_driverBaseDict = new(App.EffectiveTypes
.Where(x => (typeof(CollectBase).IsAssignableFrom(x) || typeof(BusinessBase).IsAssignableFrom(x)) && x.IsClass && !x.IsAbstract)
.ToDictionary(a => $"{Path.GetFileNameWithoutExtension(new FileInfo(a.Assembly.Location).Name)}.{a.Name}"));
_defaultDriverBaseDict = new(App.EffectiveTypes
.Where(x => (typeof(CollectBase).IsAssignableFrom(x) || typeof(BusinessBase).IsAssignableFrom(x)) && x.IsClass && !x.IsAbstract)
.ToDictionary(a => $"{Path.GetFileNameWithoutExtension(new FileInfo(a.Assembly.Location).Name)}.{a.Name}"));
DeleteBackup(DirName);
DeleteBackup(AppContext.BaseDirectory);
}
/// <summary>
/// 插件文件名称/插件域
/// </summary>
private ConcurrentDictionary<string, (AssemblyLoadContext AssemblyLoadContext, Assembly Assembly)> _assemblyLoadContextDict { get; } = new();
/// <summary>
/// 主程序上下文中的插件FullName/插件Type
/// </summary>
private System.Collections.ObjectModel.ReadOnlyDictionary<string, Type> _defaultDriverBaseDict { get; }
/// <summary>
/// 插件FullName/插件Type
/// </summary>
@@ -92,8 +109,18 @@ internal sealed class PluginService : IPluginService
// 解析插件名称，获取文件名和类型名
var filtResult = PluginServiceUtil.GetFileNameAndTypeName(pluginName);
// 如果是默认键，则搜索主程序上下文中的类型
if (_defaultDriverBaseDict.TryGetValue(pluginName, out var type))
{
var driver = (DriverBase)Activator.CreateInstance(type);
if (!type.Assembly.Location.IsNullOrEmpty())
driver.Directory = Path.GetDirectoryName(type.Assembly.Location);
return driver;
}
// 构建插件目录路径
var dir = AppContext.BaseDirectory.CombinePathWithOs(DirName);
var dir = AppContext.BaseDirectory.CombinePathWithOs(DirName, filtResult.FileName);
// 先判断是否已经拥有插件模块
if (_driverBaseDict.TryGetValue(pluginName, out var value))
@@ -102,11 +129,35 @@ internal sealed class PluginService : IPluginService
driver.Directory = dir;
return driver;
}
else
Assembly assembly = null;
// 根据路径获取DLL文件
var path = dir.CombinePathWithOs($"{filtResult.FileName}.dll");
assembly = GetAssembly(path, filtResult.FileName);
if (assembly != null)
{
// 根据采集/业务类型获取实际插件类
var driverType = assembly.GetTypes()
.Where(x => (typeof(CollectBase).IsAssignableFrom(x) || typeof(BusinessBase).IsAssignableFrom(x)) && x.IsClass && !x.IsAbstract)
.FirstOrDefault(it => it.Name == filtResult.TypeName);
if (driverType != null)
{
var driver = (DriverBase)Activator.CreateInstance(driverType);
_logger?.LogInformation(Localizer[$"LoadTypeSuccess", pluginName]);
_driverBaseDict.TryAdd(pluginName, driverType);
driver.Directory = dir;
return driver;
}
// 抛出异常，插件类型不存在
throw new(Localizer[$"LoadTypeFail1", pluginName]);
}
else
{
// 抛出异常，插件文件不存在
throw new(Localizer[$"LoadTypeFail2", path]);
}
}
finally
{
@@ -288,6 +339,29 @@ internal sealed class PluginService : IPluginService
return query;
}
/// <summary>
/// 移除全部插件
/// </summary>
public void Reload()
{
try
{
_locker.Wait();
_driverBaseDict.Clear();
foreach (var item in _assemblyLoadContextDict)
{
item.Value.AssemblyLoadContext.Unload();
}
GC.Collect();
ClearCache();
_assemblyLoadContextDict.Clear();
}
finally
{
_locker.Release();
}
}
/// <summary>
/// 异步保存驱动程序信息。
/// </summary>
@@ -307,9 +381,24 @@ internal sealed class PluginService : IPluginService
var maxFileSize = 100 * 1024 * 1024; // 最大100MB
// 获取主程序集文件名
//var mainFileName = Path.GetFileNameWithoutExtension(plugin.MainFile.Name);
// 构建插件文件夹绝对路径
var fullDir = AppContext.BaseDirectory.CombinePathWithOs(DirName);
var mainFileName = Path.GetFileNameWithoutExtension(plugin.MainFile.Name);
string fullDir = string.Empty;
bool isDefaultDriver = false;
//判定是否上下文程序集
var defaultDriver = _defaultDriverBaseDict.FirstOrDefault(a => Path.GetFileNameWithoutExtension(new FileInfo(a.Value.Assembly.Location).Name) == mainFileName);
if (defaultDriver.Value != null)
{
var filtResult = PluginServiceUtil.GetFileNameAndTypeName(defaultDriver.Key);
fullDir = Path.GetDirectoryName(filtResult.FileName);
isDefaultDriver = true;
}
else
{
// 构建插件文件夹绝对路径
fullDir = AppContext.BaseDirectory.CombinePathWithOs(DirName, mainFileName);
isDefaultDriver = false;
}
try
{
// 构建主程序集绝对路径
@@ -355,25 +444,56 @@ internal sealed class PluginService : IPluginService
{
throw new(Localizer[$"PluginNotFound"]);
}
assembly = null;
// 将主程序集保存到文件
await MarkSave(fullPath, mainMemoryStream).ConfigureAwait(false);
// 将其他文件保存到文件
foreach (var item in otherFilesStreams)
if (isDefaultDriver)
{
await MarkSave(fullDir.CombinePathWithOs(item.Name), item.MemoryStream).ConfigureAwait(false);
// 将主程序集保存到文件
await MarkSave(fullPath, mainMemoryStream).ConfigureAwait(false);
// 将其他文件保存到文件
foreach (var item in otherFilesStreams)
{
await MarkSave(fullDir.CombinePathWithOs(item.Name), item.MemoryStream).ConfigureAwait(false);
}
}
else
{
// 将主程序集保存到文件
mainMemoryStream.Seek(0, SeekOrigin.Begin);
Directory.CreateDirectory(fullDir);// 创建插件文件夹
using FileStream fs = new(fullPath, FileMode.Create);
await mainMemoryStream.CopyToAsync(fs).ConfigureAwait(false);
// 将其他文件保存到文件
foreach (var item in otherFilesStreams)
{
item.MemoryStream.Seek(0, SeekOrigin.Begin);
using FileStream fs1 = new(fullDir.CombinePathWithOs(item.Name), FileMode.Create);
await item.MemoryStream.CopyToAsync(fs1).ConfigureAwait(false);
await item.MemoryStream.DisposeAsync().ConfigureAwait(false);
}
}
}
finally
{
// 卸载程序集加载上下文并清除缓存
assemblyLoadContext.Unload();
ClearCache();
try
{
// 卸载相同文件的插件域
DeletePlugin(mainFileName);
}
catch
{
}
}
}
finally
@@ -458,7 +578,25 @@ internal sealed class PluginService : IPluginService
lock (this)
{
App.CacheService.Remove(_cacheKeyGetPluginOutputs);
App.CacheService.DelByPattern($"{nameof(PluginService)}_");
//多语言缓存清理
try
{
// 获取私有字段
FieldInfo fieldInfo = typeof(ResourceManagerStringLocalizerFactory).GetField("_localizerCache", BindingFlags.Instance | BindingFlags.NonPublic);
// 获取字段的值
var dictionary = (ConcurrentDictionary<string, ResourceManagerStringLocalizer>)fieldInfo.GetValue(App.StringLocalizerFactory);
foreach (var item in _assemblyLoadContextDict)
{
// 移除特定键
dictionary.RemoveWhere(a => item.Value.Assembly.ExportedTypes.Select(b => b.AssemblyQualifiedName).Contains(a.Key));
}
}
catch
{
}
_ = Task.Run(() =>
{
_dispatchService.Dispatch(new());
@@ -468,6 +606,104 @@ internal sealed class PluginService : IPluginService
#endregion public
/// <summary>
/// 删除插件域，卸载插件
/// </summary>
/// <param name="path">主程序集文件名称</param>
private void DeletePlugin(string path)
{
if (_assemblyLoadContextDict.TryGetValue(path, out var assemblyLoadContext))
{
//移除字典
_driverBaseDict.RemoveWhere(a => path == PluginServiceUtil.GetFileNameAndTypeName(a.Key).FileName);
_assemblyLoadContextDict.Remove(path);
//卸载
assemblyLoadContext.AssemblyLoadContext.Unload();
GC.Collect();
}
}
/// <summary>
/// 获取程序集
/// </summary>
/// <param name="path">插件主文件绝对路径</param>
/// <param name="fileName">插件主文件名称</param>
/// <returns></returns>
private Assembly GetAssembly(string path, string fileName)
{
Assembly assembly = null;
_logger?.LogInformation(Localizer["AddPluginFile", path]);
//全部程序集路径
List<string> paths = new();
Directory.GetFiles(Path.GetDirectoryName(path), "*.dll").ToList().ForEach(a => paths.Add(a));
if (_assemblyLoadContextDict.TryGetValue(fileName, out (AssemblyLoadContext AssemblyLoadContext, Assembly Assembly) value))
{
assembly = value.Assembly;
}
else
{
//新建插件域，并注明可卸载
var assemblyLoadContext = new AssemblyLoadContext(fileName, true);
//获取插件程序集
assembly = GetAssembly(path, paths, assemblyLoadContext);
if (assembly == null)
{
assemblyLoadContext.Unload();
return null;
}
//添加到全局对象
_assemblyLoadContextDict.TryAdd(fileName, (assemblyLoadContext, assembly));
}
return assembly;
}
/// <summary>
/// 获取程序集
/// </summary>
/// <param name="path">主程序的路径</param>
/// <param name="paths">全部文件的路径</param>
/// <param name="assemblyLoadContext">当前插件域</param>
/// <returns></returns>
private Assembly GetAssembly(string path, List<string> paths, AssemblyLoadContext assemblyLoadContext)
{
Assembly assembly = null;
//var cacheId = CommonUtils.GetSingleId();
//foreach (var item in paths)
//{
// var dir = Path.GetDirectoryName(item).CombinePathWithOs($"Cache{cacheId}");
// var cachePath = dir.CombinePath(Path.GetFileName(item));
// Directory.CreateDirectory(dir);
// File.Copy(item, cachePath, true);
//}
foreach (var item in paths)
{
using var fs = new FileStream(item, FileMode.Open);
//var cachePath = Path.GetDirectoryName(item).CombinePathWithOs($"Cache{cacheId}").CombinePath(Path.GetFileName(item));
if (item == path)
{
assembly = assemblyLoadContext.LoadFromStream(fs); //加载主程序集，并获取
//修改为从文件创立，满足roslyn引擎的要求
//assembly = assemblyLoadContext.LoadFromAssemblyPath(cachePath);
}
else
{
try
{
//assemblyLoadContext.LoadFromAssemblyPath(cachePath);
assemblyLoadContext.LoadFromStream(fs); //加载主程序集，并获取
}
catch (Exception ex)
{
_logger?.LogWarning(ex, Localizer[$"LoadOtherFileFail", item]);
}
}
}
return assembly;
}
/// <summary>
/// 获取全部插件信息
/// </summary>
@@ -510,8 +746,8 @@ internal sealed class PluginService : IPluginService
List<PluginOutput> plugins = new List<PluginOutput>();
// 主程序上下文
// 遍历程序集上下文插件驱动字典，生成插件驱动信息
foreach (var item in _driverBaseDict)
// 遍历程序集上下文默认驱动字典，生成默认驱动插件信息
foreach (var item in _defaultDriverBaseDict)
{
if (PluginServiceUtil.IsSupported(item.Value))
{
@@ -531,10 +767,59 @@ internal sealed class PluginService : IPluginService
};
pluginOutput.DeviceCount = App.GetService<IDeviceService>().GetAll().Count(a => a.PluginName == pluginOutput.FullName);//关联设备数量
plugins.Add(pluginOutput);
}
}
// 获取插件文件夹路径列表
string[] folderPaths = Directory.GetDirectories(AppContext.BaseDirectory.CombinePathWithOs(DirName));
// 遍历插件文件夹
foreach (string folderPath in folderPaths)
{
//当前插件文件夹
try
{
var driverMainName = Path.GetFileName(folderPath);
FileInfo fileInfo = new FileInfo(folderPath.CombinePathWithOs($"{driverMainName}.dll")); //插件主程序集名称约定为文件夹名称.dll
DateTime lastWriteTime = fileInfo.LastWriteTime;
// 加载插件程序集并获取其中的驱动类型信息
var assembly = GetAssembly(folderPath.CombinePathWithOs($"{driverMainName}.dll"), driverMainName);
var driverTypes = assembly.GetTypes().Where(x => (typeof(CollectBase).IsAssignableFrom(x) || typeof(BusinessBase).IsAssignableFrom(x)) && x.IsClass && !x.IsAbstract);
// 遍历驱动类型，生成插件信息，并将其添加到插件列表中
foreach (var type in driverTypes)
{
if (PluginServiceUtil.IsSupported(type))
{
// 先判断是否已经拥有插件模块
if (!_driverBaseDict.ContainsKey($"{driverMainName}.{type.Name}"))
{
//添加到字典
_driverBaseDict.TryAdd($"{driverMainName}.{type.Name}", type);
_logger?.LogInformation(Localizer[$"LoadTypeSuccess", PluginServiceUtil.GetFullName(driverMainName, type.Name)]);
}
plugins.Add(
new PluginOutput()
{
Name = type.Name, //类型名称
FileName = $"{driverMainName}", //主程序集名称
PluginType = (typeof(CollectBase).IsAssignableFrom(type)) ? PluginTypeEnum.Collect : PluginTypeEnum.Business,//插件类型
Version = assembly.GetName().Version.ToString(),//插件版本
LastWriteTime = lastWriteTime, //编译时间
EducationPlugin = PluginServiceUtil.IsEducation(type),
}
);
}
}
}
catch (Exception ex)
{
// 记录加载插件失败的日志
_logger?.LogWarning(ex, Localizer[$"LoadPluginFail", Path.GetRelativePath(AppContext.BaseDirectory.CombinePathWithOs(DirName), folderPath)]);
}
}
return plugins.OrderBy(a => a.EducationPlugin).ThenByDescending(a => a.DeviceCount).ToList();
}
}

2
src/Gateway/ThingsGateway.Gateway.Application/Services/Plugin/PluginServiceUtil.cs
View File

@@ -164,7 +164,7 @@ public static class PluginServiceUtil
else
{
// 如果没有找到 '.'，或者 '.' 是最后一个字符，则返回默认的键和插件名称
return (nameof(ThingsGateway), pluginName);
return (PluginService.DefaultKey, pluginName);
}
}

6
src/Gateway/ThingsGateway.Gateway.Razor/Locales/en-US.json
View File

@@ -1,5 +1,7 @@
{
"ThingsGateway.Gateway.Razor.PluginPage": {
"Reload": "Reload"
},
"ThingsGateway.Gateway.Razor.TcpSessionClientDto": {
"Id": "Id",
@@ -62,7 +64,7 @@
},
"ThingsGateway.Gateway.Razor.SavePlugin": {
"SavePlugin": "Note: Plugins with the same file name will be overwritten",
"SavePlugin1": "Plugin changes will take effect after restarting the software"
"SavePlugin1": "Plugin changes may take effect after restarting the software"
},
"ThingsGateway.Gateway.Razor.BackendLogPage": {

6
src/Gateway/ThingsGateway.Gateway.Razor/Locales/zh-CN.json
View File

@@ -1,5 +1,7 @@
{
"ThingsGateway.Gateway.Razor.PluginPage": {
"Reload": "重载"
},
"ThingsGateway.Gateway.Razor.TcpSessionClientDto": {
"Id": "Id",
"IP": "IP",
@@ -61,7 +63,7 @@
},
"ThingsGateway.Gateway.Razor.SavePlugin": {
"SavePlugin": "注意：文件名称相同的插件将被覆盖",
"SavePlugin1": "插件变动需重启软件后生效"
"SavePlugin1": "插件变动可能需重启软件后生效"
},
"ThingsGateway.Gateway.Razor.BackendLogPage": {

6
src/Gateway/ThingsGateway.Gateway.Razor/Locales/zh-TW.json
View File

@@ -1,5 +1,7 @@
{
"ThingsGateway.Gateway.Razor.PluginPage": {
"Reload": "重載"
},
"ThingsGateway.Gateway.Razor.TcpSessionClientDto": {
"Id": "Id",
"IP": "IP",
@@ -59,7 +61,7 @@
},
"ThingsGateway.Gateway.Razor.SavePlugin": {
"SavePlugin": "注意：文件名稱相同的插件將被覆蓋",
"SavePlugin1": "挿件變動需重啓軟件後生效"
"SavePlugin1": "挿件變動可能需重啓軟件後生效"
},
"ThingsGateway.Gateway.Razor.BackendLogPage": {
"BackendLog": "網關後台日誌",

3
src/Gateway/ThingsGateway.Gateway.Razor/Pages/Config/Plugin/PluginPage.razor
View File

@@ -31,6 +31,9 @@
<TableToolbarButton TItem="PluginOutput" Color="Color.Info" Icon="fa fa-plus" Text="@RazorLocalizer["Add"]"
OnClickCallback="OnAdd" IsShow=@(AuthorizeButton("添加")) />
<TableToolbarButton TItem="PluginOutput" Color="Color.Warning" Icon="fa-solid fa-rotate" Text="@PluginPageLoaclozer["Reload"]"
OnClick="OnReload" IsShow=@(AuthorizeButton("添加")) />
</TableToolbarTemplate>
<TableColumns>
<TableColumn @bind-Field="@context.Name">

8
src/Gateway/ThingsGateway.Gateway.Razor/Pages/Config/Plugin/PluginPage.razor.cs
View File

@@ -54,6 +54,9 @@ public partial class PluginPage
[Inject]
private IStringLocalizer<PluginAddInput> PluginAddInputLoaclozer { get; set; }
[Inject]
private IStringLocalizer<PluginPage> PluginPageLoaclozer { get; set; }
private async Task OnAdd(IEnumerable<PluginOutput> pluginOutputs)
{
var op = new DialogOption()
@@ -76,5 +79,10 @@ public partial class PluginPage
await DialogService.Show(op);
}
private void OnReload()
{
PluginService.Reload();
}
#endregion 添加
}

4
src/Gateway/ThingsGateway.Gateway.Razor/Pages/Config/Variable/VariableEditComponent.razor
View File

@@ -237,8 +237,8 @@ else
<div class="row g-2 mx-1 form-inline">
<div class="col-12 col-md-8">
<label required="true" style="width:20%">@Localizer["ChoiceBusinessDeviceId"]</label>
<Select SkipValidate IsVirtualize @bind-Value="@ChoiceBusinessDeviceId" Items="@BusinessDevices" ShowSearch="true" ShowLabel="false" />
@* <label required="true" style="width:20%">@Localizer["ChoiceBusinessDeviceId"]</label> *@
<Select SkipValidate IsVirtualize @bind-Value="@ChoiceBusinessDeviceId" Items="@BusinessDevices" ShowSearch="true" ShowLabel="true" />
</div>
<div class="col-12 col-md-4">
<Button OnClick="async() =>{

114
src/ThingsGateway.Server/targets/Custom.targets
View File

@@ -1,71 +1,71 @@
<Project>
<ItemGroup>
<PackageReference Include="ThingsGateway.Management" Version="$(ProPluginVersion)" GeneratePathProperty="true"/>
<PackageReference Include="ThingsGateway.RulesEngine" Version="$(ProPluginVersion)" GeneratePathProperty="true"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThingsGateway.Management" Version="$(ProPluginVersion)" GeneratePathProperty="true"/>
<PackageReference Include="ThingsGateway.RulesEngine" Version="$(ProPluginVersion)" GeneratePathProperty="true"/>
</ItemGroup>
<Target Name="_ResolveCopyManagementLocalNuGetPkgXmls" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'=='ThingsGateway.Management' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</ItemGroup>
</Target>
<Target Name="_ResolveCopyRulesEngineLocalNuGetPkgXmls" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'=='ThingsGateway.RulesEngine' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</ItemGroup>
</Target>
<Target Name="_ResolveCopyManagementLocalNuGetPkgXmls" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'=='ThingsGateway.Management' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</ItemGroup>
</Target>
<Target Name="_ResolveCopyRulesEngineLocalNuGetPkgXmls" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'=='ThingsGateway.RulesEngine' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</ItemGroup>
</Target>
<Target Name="CopyManagementNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<ManagementApplicationPackageFiles Include="$(PkgThingsGateway_Management)\Content\SeedData\Management\*.*" />
</ItemGroup>
<PropertyGroup>
<ManagementApplicationFolder>$(TargetDir)SeedData\Management\</ManagementApplicationFolder>
</PropertyGroup>
<RemoveDir Directories="$(ManagementApplicationFolder)" />
<Copy SourceFiles="@(ManagementApplicationPackageFiles)" DestinationFolder="$(ManagementApplicationFolder)%(RecursiveDir)" />
</Target>
<Target Name="CopyRulesEngineNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<RulesEngineApplicationPackageFiles Include="$(PkgThingsGateway_RulesEngine)\Content\SeedData\RulesEngine\*.*" />
</ItemGroup>
<PropertyGroup>
<RulesEngineApplicationFolder>$(TargetDir)SeedData\RulesEngine\</RulesEngineApplicationFolder>
</PropertyGroup>
<RemoveDir Directories="$(RulesEngineApplicationFolder)" />
<Copy SourceFiles="@(RulesEngineApplicationPackageFiles)" DestinationFolder="$(RulesEngineApplicationFolder)%(RecursiveDir)" />
<Target Name="CopyManagementNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<ManagementApplicationPackageFiles Include="$(PkgThingsGateway_Management)\Content\SeedData\Management\*.*" />
</ItemGroup>
<PropertyGroup>
<ManagementApplicationFolder>$(TargetDir)SeedData\Management\</ManagementApplicationFolder>
</PropertyGroup>
<RemoveDir Directories="$(ManagementApplicationFolder)" />
<Copy SourceFiles="@(ManagementApplicationPackageFiles)" DestinationFolder="$(ManagementApplicationFolder)%(RecursiveDir)" />
</Target>
</Target>
<Target Name="CopyRulesEngineNugetPackages" AfterTargets="Build">
<ItemGroup>
<!-- setting up the variable for convenience -->
<RulesEngineApplicationPackageFiles Include="$(PkgThingsGateway_RulesEngine)\Content\SeedData\RulesEngine\*.*" />
</ItemGroup>
<PropertyGroup>
<RulesEngineApplicationFolder>$(TargetDir)SeedData\RulesEngine\</RulesEngineApplicationFolder>
</PropertyGroup>
<RemoveDir Directories="$(RulesEngineApplicationFolder)" />
<Copy SourceFiles="@(RulesEngineApplicationPackageFiles)" DestinationFolder="$(RulesEngineApplicationFolder)%(RecursiveDir)" />
<Target Name="ManagementPostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<ManagementFiles Include="bin\$(Configuration)\$(TargetFramework)\SeedData\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(ManagementFiles)" DestinationFolder="$(PublishDir)SeedData\%(RecursiveDir)" />
</Target>
</Target>
<Target Name="RulesEnginePostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<RulesEngineFiles Include="bin\$(Configuration)\$(TargetFramework)\SeedData\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(RulesEngineFiles)" DestinationFolder="$(PublishDir)SeedData\%(RecursiveDir)" />
<Target Name="ManagementPostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<ManagementFiles Include="bin\$(Configuration)\$(TargetFramework)\SeedData\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(ManagementFiles)" DestinationFolder="$(PublishDir)SeedData\%(RecursiveDir)" />
</Target>
</Target>
<Target Name="RulesEnginePostPublish" AfterTargets="Publish">
<ItemGroup>
<!-- setting up the variable for convenience -->
<RulesEngineFiles Include="bin\$(Configuration)\$(TargetFramework)\SeedData\**" />
</ItemGroup>
<PropertyGroup>
</PropertyGroup>
<Copy SourceFiles="@(RulesEngineFiles)" DestinationFolder="$(PublishDir)SeedData\%(RecursiveDir)" />
</Target>
</Project>

34
src/ThingsGateway.Server/targets/CustomPlugin.targets
View File

@@ -58,27 +58,27 @@
<MainFile3 Include="$(PkgThingsGateway_Plugin_URF_R330)\Main\**" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HJ212PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_BACnetPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_AllenBradleyCipPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DCONPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_EDPF_NTPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_KELID2008PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_LKSISPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MelsecPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OmronPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DKQ_A16DPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_IDR210PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_URF_R330PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_USBScanerPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_SECSPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_TS550PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_VigorPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HJ212PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.HJ212%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_BACnetPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.BACnet%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_AllenBradleyCipPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.AllenBradleyCip%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DCONPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.DCON%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_EDPF_NTPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.EDPF_NT%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_KELID2008PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.KELID2008%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_LKSISPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.LKSIS%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MelsecPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Melsec%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OmronPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Omron%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DKQ_A16DPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.DKQ_A16D%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_IDR210PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.IDR210%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_URF_R330PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.URF_R330%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_USBScanerPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.USBScaner%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_SECSPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.SECS%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_TS550PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.TS550%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_VigorPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Vigor%(RecursiveDir)" />
<Copy SourceFiles="@(MainFile1)" DestinationFolder="$(TargetDir)%(RecursiveDir)" />
<Copy SourceFiles="@(MainFile2)" DestinationFolder="$(TargetDir)%(RecursiveDir)" />

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

@@ -18,14 +18,14 @@
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttYINGKEPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttYINGKEPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.MqttYINGKE%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HUANANSFSKPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_YPSFSKPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_HUANANSFSKPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.HUANANSFSK%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_YPSFSKPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.YPSFSK%(RecursiveDir)" />
</Target>

4
src/ThingsGateway.Server/targets/OtherPlugin1.targets
View File

@@ -11,11 +11,11 @@
<PkgThingsGateway_Plugin_ModbusC1PackageFiles Include="$(PkgThingsGateway_Plugin_ModbusC1)\Content\net6.0\**\*.*" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
</PropertyGroup>
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusC1PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusC1PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.ModbusC1%(RecursiveDir)" />
</Target>

24
src/ThingsGateway.Server/targets/Plugin.targets
View File

@@ -100,21 +100,21 @@
<PkgThingsGateway_Plugin_VariableExpressionPackageFiles Include="$(PkgThingsGateway_Plugin_VariableExpression)\Content\$(CustomTargetFramework)\**\*.*" />
</ItemGroup>
<PropertyGroup>
<PluginFolder>$(TargetDir)Plugins\</PluginFolder>
<PluginFolder>$(TargetDir)GatewayPlugins\</PluginFolder>
</PropertyGroup>
<RemoveDir Directories="$(PluginFolder)" />
<Message Text="将插件复制到插件目录 $(PluginFolder)" Importance="high" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_SiemensS7PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_Dlt645PackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DBPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_KafkaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaNetApiPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcUaPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_RabbitMQPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_VariableExpressionPackageFiles)" DestinationFolder="$(PluginFolder)%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_ModbusPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Modbus%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_SiemensS7PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.SiemensS7%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_Dlt645PackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Dlt645%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_DBPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.DB%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_KafkaPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Kafka%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_MqttPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.Mqtt%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.OpcDa%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcDaNetApiPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.OpcDaNetApi%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_OpcUaPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.OpcUa%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_RabbitMQPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.RabbitMQ%(RecursiveDir)" />
<Copy SourceFiles="@(PkgThingsGateway_Plugin_VariableExpressionPackageFiles)" DestinationFolder="$(PluginFolder)ThingsGateway.Plugin.VariableExpression%(RecursiveDir)" />
</Target>

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.1.3</Version>
<Version>7.2.3.1</Version>
</PropertyGroup>
<ItemGroup>