版本更新框架调整

src/YSAI.Core/YSAI.Core.csproj

@@ -12,11 +12,12 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <DescriptionType>核心组件</DescriptionType>
     <DescriptionName>Core</DescriptionName>
-    <DescriptionDetails>处理、反射、脚本、订阅、虚拟地址、TCP、UDP、HTTP、WS、串口</DescriptionDetails>
+    <DescriptionDetails>处理、反射、脚本、转发、订阅、虚拟地址、TCP、UDP、HTTP、WS、串口</DescriptionDetails>
     <Description>$(DescriptionType)：$(DescriptionName) ( $(DescriptionDetails) )</Description>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
+    <PackageReference Include="YSAI.Model" Version="23.328.33871" />
+	<PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
   </ItemGroup>
 </Project>

src/YSAI.Core/parse/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YSAI.Core.parse
-{
-    internal class Class1
-    {
-    }
-}

src/YSAI.Reflection/ReflectionData.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace YSAI.Reflection
+namespace YSAI.Core.reflection
 {
     /// <summary>
     /// 反射

src/YSAI.Reflection/ReflectionOperate.cs

@@ -4,9 +4,9 @@ using System.Reflection;
 using YSAI.Model.data;
 using YSAI.Model.@interface;
 using YSAI.Unility;
-using static YSAI.Reflection.ReflectionData;
+using static YSAI.Core.reflection.ReflectionData;
 
-namespace YSAI.Reflection
+namespace YSAI.Core.reflection
 {
     /// <summary>
     /// 反射操作
@@ -33,7 +33,7 @@ namespace YSAI.Reflection
         /// </summary>
         /// <param name="basics">基础数据</param>
         /// <returns></returns>
-        public static ReflectionOperate Instance(ReflectionData.Basics basics)
+        public static ReflectionOperate Instance(Basics basics)
         {
             if (ThisObjList.Count >= MaxInstanceCount)
             {
@@ -63,7 +63,7 @@ namespace YSAI.Reflection
         /// 构造函数
         /// </summary>
         /// <param name="Basics">基础数据</param>
-        public ReflectionOperate(ReflectionData.Basics basics)
+        public ReflectionOperate(Basics basics)
         {
             //设置参数
             this.basics = basics;
@@ -72,12 +72,12 @@ namespace YSAI.Reflection
         /// <summary>
         /// 基础数据
         /// </summary>
-        private ReflectionData.Basics basics;
+        private Basics basics;
 
         /// <summary>
         /// 反射状态
         /// </summary>
-        public bool ReflectionState { get; set; }
+        private bool ReflectionState;
 
         /// <summary>
         /// 获取反射状态

src/YSAI.Core/relay/RelayData.cs

@@ -7,7 +7,56 @@
         /// </summary>
         public class Basics
         {
+            /// <summary>
+            /// 库文件统一存放文件夹，绝对路径
+            /// </summary>
+            public string? LibFolder { get; set; } = $"{AppDomain.CurrentDomain.BaseDirectory}/lib/relay";
 
+            /// <summary>
+            /// 库配置文件夹，绝对路径
+            /// </summary>
+            public string? LibConfigFolder { get; set; } = $"{AppDomain.CurrentDomain.BaseDirectory}/config/relay";
+
+            /// <summary>
+            /// 库配置唯一标识符键
+            /// </summary>
+            public string? LibConfigSNKey { get; set; } = "SN";
+
+            /// <summary>
+            /// 动态库监控格式
+            /// </summary>
+            public string? DllWatcherFormat { get; set; } = "YSAI.*.dll";
+
+            /// <summary>
+            /// 配置监控格式
+            /// </summary>
+            public string? ConfigWatcherFormat { get; set; } = "*.Relay.Config.json";
+
+            /// <summary>
+            /// 配置文件名称的格式 * 与配置数据中的SN一致
+            /// 库配置：命名空间 + 类名.SN.Config.json
+            /// </summary>
+            public string? ConfigFileNameFormat { get; set; } = "{0}.*.Relay.Config.json";
+
+            /// <summary>
+            /// 配置替换格式
+            /// </summary>
+            public string? ConfigReplaceFormat { get; set; } = ".Relay.Config.json";
+
+            /// <summary>
+            /// 自动打开，创建实例成功后
+            /// </summary>
+            public bool AutoOn { get; set; } = true;
+
+            /// <summary>
+            /// 任务处理数量
+            /// </summary>
+            public int TaskNumber { get; set; } = 5;
+
+            /// <summary>
+            /// 任务处理完成休眠时间(毫秒)
+            /// </summary>
+            public int TaskHandleInterval { get; set; } = 100;
         }
     }
 }

src/YSAI.DAQ.sln

@@ -135,12 +135,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Redis", "YSAI.Redis\YS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Model", "YSAI.Model\YSAI.Model.csproj", "{2E999BFE-9128-4BAD-9BB5-88C20295BE61}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Reflection", "YSAI.Reflection\YSAI.Reflection.csproj", "{EA604662-0943-4F77-9840-10F770FB0946}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Script", "YSAI.Script\YSAI.Script.csproj", "{80FE38E7-6534-4C54-A4E6-B4DE43BD557F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Relay", "YSAI.Relay\YSAI.Relay.csproj", "{01893D02-B13C-462D-A29F-2584B2D002C5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -371,18 +365,6 @@ Global
 		{2E999BFE-9128-4BAD-9BB5-88C20295BE61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E999BFE-9128-4BAD-9BB5-88C20295BE61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E999BFE-9128-4BAD-9BB5-88C20295BE61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA604662-0943-4F77-9840-10F770FB0946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA604662-0943-4F77-9840-10F770FB0946}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA604662-0943-4F77-9840-10F770FB0946}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA604662-0943-4F77-9840-10F770FB0946}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80FE38E7-6534-4C54-A4E6-B4DE43BD557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80FE38E7-6534-4C54-A4E6-B4DE43BD557F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80FE38E7-6534-4C54-A4E6-B4DE43BD557F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80FE38E7-6534-4C54-A4E6-B4DE43BD557F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01893D02-B13C-462D-A29F-2584B2D002C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01893D02-B13C-462D-A29F-2584B2D002C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01893D02-B13C-462D-A29F-2584B2D002C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01893D02-B13C-462D-A29F-2584B2D002C5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -449,9 +431,6 @@ Global
 		{E3F6DC4A-57F4-436F-86C5-6B2F782AA2C9} = {12CB0510-7B1E-4518-AA3B-412A4D323D42}
 		{F917D5C2-A067-47F3-8E18-1CD2C95FEC29} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
 		{2E999BFE-9128-4BAD-9BB5-88C20295BE61} = {D60224CF-7F12-453B-851E-B5C01F9D2BBE}
-		{EA604662-0943-4F77-9840-10F770FB0946} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
-		{80FE38E7-6534-4C54-A4E6-B4DE43BD557F} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
-		{01893D02-B13C-462D-A29F-2584B2D002C5} = {F23C3553-3FE7-4ECC-9BBA-8C498C3B4398}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.Kafka/YSAI.Kafka.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
-	<PackageReference Include="YSAI.Model" Version="23.328.22745" />
+	<PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
   <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.Model/YSAI.Model.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>23.328.22745</Version>
+    <Version>23.328.35182</Version>
     <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
     <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
     <Authors>Shun</Authors>

src/YSAI.Model/data/AddressDetails.cs

@@ -51,16 +51,14 @@ namespace YSAI.Model.data
         public bool IsEnable { get; set; } = true;
 
         /// <summary>
-        /// 数据转发；
-        /// 转发的配置JSON字符串
+        /// 数据转发参数
         /// </summary>
-        public string? RelayConfig { get; set; }
+        public AddressRelay? AddressRelayParam { get; set; }
 
         /// <summary>
-        /// 数据解析；
-        /// 解析的配置JSON字符串
+        /// 数据解析参数
         /// </summary>
-        public string? ParseConfig { get; set; }
+        public AddressParse? AddressParseParam { get; set; }
 
         /// <summary>
         /// 数据类型

src/YSAI.Model/data/AddressParse.cs

@@ -16,14 +16,29 @@ namespace YSAI.Model.data
         public ParseType ParseType { get; set; }
 
         /// <summary>
-        /// 通过反射得到的内部解析方法
+        /// 反射解析的参数
         /// </summary>
-        public string ReflectionSN { get; set; }
+        public ReflectionParse? ReflectionParseParam { get; set; }
 
         /// <summary>
         /// 通过脚本来执行解析
         /// 脚本基础数据对象
         /// </summary>
-        public object ScriptBasics { get; set; }
+        public object? ScriptBasics { get; set; }
+    }
+    /// <summary>
+    /// 反射解析数据
+    /// </summary>
+    public class ReflectionParse
+    {
+        /// <summary>
+        /// 反射的基础数据
+        /// </summary>
+        public object ReflectionBasics { get; set; }
+
+        /// <summary>
+        /// 需要执行哪个方法的SN
+        /// </summary>
+        public string RSn { get; set; }
     }
 }

src/YSAI.Model/data/AddressRelay.cs

@@ -0,0 +1,25 @@
+namespace YSAI.Model.data
+{
+    /// <summary>
+    /// 地址转发
+    /// </summary>
+    public class AddressRelay
+    {
+        /// <summary>
+        /// 转发的基础数据
+        /// </summary>
+        public object RelayBasics { get; set; }
+        /// <summary>
+        /// 主题
+        /// </summary>
+        public string Topic { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 实例SN，为空则所有打开的转发实例都转发
+        /// </summary>
+        public List<string>? ISns { get; set; }
+    }
+}

src/YSAI.Model/data/AddressValue.cs

@@ -40,8 +40,8 @@ namespace YSAI.Model.data
             this.AddressAnotherName = addressDetails.AddressAnotherName;
             this.AddressPropertyName = addressDetails.AddressPropertyName;
             this.AddressDescribe = addressDetails.AddressDescribe;
-            this.ParseConfig = addressDetails.ParseConfig;
-            this.RelayConfig = addressDetails.RelayConfig;
+            this.AddressParseParam = addressDetails.AddressParseParam;
+            this.AddressRelayParam = addressDetails.AddressRelayParam;
             this.AddressExtendParam = addressDetails.AddressExtendParam;
             this.IsEnable = addressDetails.IsEnable;
             this.AddressDataType = addressDetails.AddressDataType;

src/YSAI.Model/enum/ParseType.cs

@@ -6,13 +6,13 @@
     public enum ParseType
     {
         /// <summary>
-        /// 代码中定义的具体方法解析[入参string][出参string]
+        /// 反射解析，通过反射得到，代码中定义的具体方法解析[入参string][出参string]
         /// </summary>
-        MethodAnalysis,
+        R,
 
         /// <summary>
-        /// 动态脚本解析[入参string][出参string]
+        /// 脚本解析，动态脚本解析[入参string][出参string]
         /// </summary>
-        ScriptAnalysis
+        S
     }
 }

src/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-	<PackageReference Include="YSAI.Model" Version="23.328.22745" />
+	<PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
   <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.NetMQ/YSAI.NetMQ.csproj

@@ -18,6 +18,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NetMQ" Version="4.0.1.13" />
-	<PackageReference Include="YSAI.Model" Version="23.328.22745" />
+	<PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
 </Project>

src/YSAI.Netty/YSAI.Netty.csproj

@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
     <PackageReference Include="DotNetty.Transport" Version="0.7.5" />
-	<PackageReference Include="YSAI.Model" Version="23.328.22745" />
+	<PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
 </Project>

src/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.7.0" />
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
+    <PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
   <!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.Redis/YSAI.Redis.csproj

@@ -17,6 +17,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
+    <PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
 </Project>

src/YSAI.Reflection/YSAI.Reflection.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Version>23.328.31332</Version>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
-    <Authors>Shun</Authors>
-    <Company>YSAI</Company>
-    <Product>SCADA</Product>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DescriptionType>扩展工具</DescriptionType>
-    <DescriptionName>Reflection</DescriptionName>
-    <DescriptionDetails>得到*.exe或*.dll等程序集内部的接口、类、方法、字段、属性、特性、事件等信息，还可以动态创建出类型实例并执行其中的方法</DescriptionDetails>
-    <Description>$(DescriptionType)：$(DescriptionName) ( $(DescriptionDetails) )</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
-  </ItemGroup>
-</Project>

src/YSAI.Relay/RelayData.cs

@@ -1,62 +0,0 @@
-namespace YSAI.Relay
-{
-    public class RelayData
-    {
-        /// <summary>
-        /// 基础数据
-        /// </summary>
-        public class Basics
-        {
-            /// <summary>
-            /// 库文件统一存放文件夹，绝对路径
-            /// </summary>
-            public string? LibFolder { get; set; } = $"{AppDomain.CurrentDomain.BaseDirectory}/lib/relay";
-
-            /// <summary>
-            /// 库配置文件夹，绝对路径
-            /// </summary>
-            public string? LibConfigFolder { get; set; } = $"{AppDomain.CurrentDomain.BaseDirectory}/config/relay";
-
-            /// <summary>
-            /// 库配置唯一标识符键
-            /// </summary>
-            public string? LibConfigSNKey { get; set; } = "SN";
-
-            /// <summary>
-            /// 动态库监控格式
-            /// </summary>
-            public string? DllWatcherFormat { get; set; } = "YSAI.*.dll";
-
-            /// <summary>
-            /// 配置监控格式
-            /// </summary>
-            public string? ConfigWatcherFormat { get; set; } = "*.Relay.Config.json";
-
-            /// <summary>
-            /// 配置文件名称的格式 * 与配置数据中的SN一致
-            /// 库配置：命名空间 + 类名.SN.Config.json
-            /// </summary>
-            public string? ConfigFileNameFormat { get; set; } = "{0}.*.Relay.Config.json";
-
-            /// <summary>
-            /// 配置替换格式
-            /// </summary>
-            public string? ConfigReplaceFormat { get; set; } = ".Relay.Config.json";
-
-            /// <summary>
-            /// 自动打开，创建实例成功后
-            /// </summary>
-            public bool AutoOn { get; set; } = true;
-
-            /// <summary>
-            /// 任务处理数量
-            /// </summary>
-            public int TaskNumber { get; set; } = 5;
-
-            /// <summary>
-            /// 任务处理完成休眠时间(毫秒)
-            /// </summary>
-            public int TaskHandleInterval { get; set; } = 100;
-        }
-    }
-}

src/YSAI.Relay/YSAI.Relay.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Version>23.328.27977</Version>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
-    <Authors>Shun</Authors>
-    <Company>YSAI</Company>
-    <Product>SCADA</Product>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DescriptionType>扩展工具</DescriptionType>
-    <DescriptionName>Relay</DescriptionName>
-    <DescriptionDetails>数据转发，使用已发布的转发库实现数据转发</DescriptionDetails>
-    <Description>$(DescriptionType)：$(DescriptionName) ( $(DescriptionDetails) )</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
-  </ItemGroup>
-</Project>

src/YSAI.Rpc/YSAI.Rpc.csproj

@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Codecs" Version="0.7.5" />
     <PackageReference Include="ImpromptuInterface" Version="8.0.4" />
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
+    <PackageReference Include="YSAI.Model" Version="23.328.33871" />
   </ItemGroup>
 </Project>

src/YSAI.Script/YSAI.Script.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Version>23.328.25741</Version>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Release'">../YSAI.Publish/Release</PackageOutputPath>
-    <PackageOutputPath Condition="'$(Configuration)' == 'Debug'">../YSAI.Publish/Debug</PackageOutputPath>
-    <Authors>Shun</Authors>
-    <Company>YSAI</Company>
-    <Product>SCADA</Product>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DescriptionType>扩展工具</DescriptionType>
-    <DescriptionName>Script</DescriptionName>
-    <DescriptionDetails>通用脚本公共处理处</DescriptionDetails>
-    <Description>$(DescriptionType)：$(DescriptionName) ( $(DescriptionDetails) )</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
-    <PackageReference Include="YSAI.Model" Version="23.328.22745" />
-  </ItemGroup>
-</Project>

src/YSAI.VT/Program.cs

@@ -18,7 +18,7 @@ namespace YSAI.VT
                 //"YSAI.Unility",
                 //"YSAI.Log",
 
-                //"YSAI.Model",
+                "YSAI.Model",
                 //"YSAI.Core",
 
                 //"YSAI.Rpc",