日志输出修改，版本更新

README.md

@@ -34,5 +34,6 @@ S7Service
 11.底层通信库性能提升  
 12.Core: 支持HTTP、TCP客户端、TCP服务端、UDP、WS客户端、WS服务端、串口、脚本、redis、反射、自定义订阅、虚拟点  
 13.采集订阅模式关闭优化
+15.日志记录优化，更详细的日志记录
 
 

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.12</Version>
+	  <Version>1.0.0.13</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
   <!--<ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.33</Version>
+    <Version>1.0.0.34</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Core/interface/IOrAbstract.cs

@@ -79,7 +79,7 @@ namespace YSAI.Core.@interface
             //消息数据组织
             string message = $"{LogHead} ( {MethodName} {(State ? "成功" : "异常")} ){(string.IsNullOrEmpty(Message) ? "" : $" : {Message}")}";
             //异常则输出日志
-            if (!State) { LogHelper.Error(message, $"{ClassName}.log", Exc); }
+            if (!State) { LogHelper.Error(message, $"{ClassName}{MethodName}.log", Exc); }
             //返回状态
             return new OperateResult(State, message, runTime, RData, RType);
         }

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.12</Version>
+	  <Version>1.0.0.13</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -18,7 +18,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.34" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.34" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.13</Version>
+	  <Version>1.0.0.14</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.12</Version>
+	  <Version>1.0.0.13</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.80" />
     <PackageReference Include="NModbus.Serial" Version="3.0.80" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.13</Version>
+	  <Version>1.0.0.14</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.16</Version>
+	  <Version>1.0.0.17</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.13</Version>
+	  <Version>1.0.0.14</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.34" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.12</Version>
+	  <Version>1.0.0.13</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>
@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test.All/Program.cs

@@ -1,86 +1,10 @@
-using YSAI.Log;
-using YSAI.Unility;
+using System.Text;
+using YSAI.Core.communication.net.tcp.client;
+using YSAI.Core.communication.net.tcp.service;
+using YSAI.Core.data;
+
 
-for (int i = 0; i < 100; i++)
-{
-    int a, b = 0;
-    try
-    {
-        a = 10;
-        //LogHelper.Verbose((new Random().NextDouble() * i).ToString(), "我的家AdcOne.LOG");
-        //LogHelper.Info((new Random().NextDouble() * i).ToString(), "OpcClientOperate.LOG");
-        //LogHelper.Debug((new Random().NextDouble() * i).ToString(), "OpcUaClientOperate.LOG");
-        //LogHelper.Error((new Random().NextDouble() * i).ToString(), "Http.Operate.LOG");
-        //LogHelper.Fatal((new Random().NextDouble() * i).ToString(), "ModbusClientOperate.LOG");
-        //LogHelper.Warning((new Random().NextDouble() * i).ToString(), "ABCDabcd.LOG");
-        double c = a / b;
-    }
-    catch (Exception ex)
-    {
-        aaaa aa = new aaaa();
-        string aaa = aa.ToJson().JsonFormatting();
-        LogHelper.Verbose(aaa, "我的家AdcOne.LOG", ex);
-        LogHelper.Info((new Random().NextDouble() * i).ToString(), "OpcClientOperate.LOG", ex);
-        LogHelper.Debug((new Random().NextDouble() * i).ToString(), "OpcUaClientOperate.LOG", ex);
-        LogHelper.Error((new Random().NextDouble() * i).ToString(), "Http.Operate.LOG", ex);
-        LogHelper.Fatal((new Random().NextDouble() * i).ToString(), "ModbusClientOperate.LOG", ex);
-        LogHelper.Warning((new Random().NextDouble() * i).ToString(), "ABCDabcd.LOG", ex);
-    }
-}
 
-class aaaa
-{
-    /// <summary>
-    /// 服务端IP
-    /// </summary>
-    public string? Ip { get; set; } = "127.0.0.1";
-    /// <summary>
-    /// 服务器端口
-    /// </summary>
-    public int Port { get; set; } = 6688;
-
-    /// <summary>
-    /// 是否需要断开重新连接
-    /// </summary>
-    public bool InterruptReconnection { get; set; } = true;
-    /// <summary>
-    /// 重连间隔(毫秒)
-    /// </summary>
-    public int ReconnectionInterval { get; set; } = 2000;
-
-    /// <summary>
-    /// 超时时间
-    /// </summary>
-    public int Timeout { get; set; } = 1000;
-
-    public List<bbb> abc { get; set; } = new List<bbb> { new bbb(), new bbb(), new bbb(), new bbb(), new bbb(), new bbb() };
-
-    public class bbb
-    {
-        /// <summary>
-        /// 服务端IP
-        /// </summary>
-        public string? Ip { get; set; } = "127.0.0.1";
-        /// <summary>
-        /// 服务器端口
-        /// </summary>
-        public int Port { get; set; } = 6688;
-
-        /// <summary>
-        /// 是否需要断开重新连接
-        /// </summary>
-        public bool InterruptReconnection { get; set; } = true;
-        /// <summary>
-        /// 重连间隔(毫秒)
-        /// </summary>
-        public int ReconnectionInterval { get; set; } = 2000;
-
-        /// <summary>
-        /// 超时时间
-        /// </summary>
-        public int Timeout { get; set; } = 1000;
-    }
-}
 //Console.WriteLine(Encoding.Default.GetString((byte[])ByteTool.HexStringToByteArray("58 44 34 20 53 20 20 20 20 20 20 35 2E 30 32 33 20 67 20 33 20 31 20 30 20 30 0D 0A")));;
 
 //SerialOperate serialOperate = SerialOperate.Instance(new SerialData.Basics
@@ -171,53 +95,53 @@ class aaaa
 //}
 
 
-//TcpServiceOperate tcpServiceOperate = TcpServiceOperate.Instance(new TcpServiceData.Basics
-//{
-//    Ip = "127.0.0.1",
-//    Port = 8888,
-//    MaxNumber = 1000
-//});
+TcpServiceOperate tcpServiceOperate = TcpServiceOperate.Instance(new TcpServiceData.Basics
+{
+    Ip = "127.0.0.1",
+    Port = 12345,
+    MaxNumber = 1000
+});
 
-//tcpServiceOperate.OnEvent += WsServiceOperate_OnEvent;
-//OperateResult operateResult = tcpServiceOperate.On();
-//Console.WriteLine(operateResult.Message);
+tcpServiceOperate.OnEvent += WsServiceOperate_OnEvent;
+OperateResult operateResult = tcpServiceOperate.On();
+Console.WriteLine(operateResult.Message);
 
 
-//TcpClientOperate wsClientOperate = TcpClientOperate.Instance(new TcpClientData.Basics
-//{
-//    Ip = "127.0.0.1",
-//    Port = 8888,
-//    InterruptReconnection = true
-//});
-//wsClientOperate.OnEvent += WsServiceOperate_OnEvent;
-//operateResult = wsClientOperate.On();
-//Console.WriteLine(operateResult.Message);
+TcpClientOperate wsClientOperate = TcpClientOperate.Instance(new TcpClientData.Basics
+{
+    Ip = "127.0.0.1",
+    Port = 1234,
+    InterruptReconnection = true
+});
+wsClientOperate.OnEvent += WsServiceOperate_OnEvent;
+operateResult = wsClientOperate.On();
+Console.WriteLine(operateResult.Message);
 
 
-//while (true)
-//{
-//    for (int i = 0; i < 1; i++)
-//    {
-//        string str = Console.ReadLine();
+while (true)
+{
+    for (int i = 0; i < 1; i++)
+    {
+        string str = Console.ReadLine();
 
-//        operateResult = tcpServiceOperate.Send(Encoding.Default.GetBytes(str));
-//        Console.WriteLine(operateResult.Message);
+        operateResult = tcpServiceOperate.Send(Encoding.Default.GetBytes(str));
+        Console.WriteLine(operateResult.Message);
 
-//        operateResult = wsClientOperate.Send(Encoding.Default.GetBytes(str));
-//        Console.WriteLine(operateResult.Message);
-//    }
+        operateResult = wsClientOperate.Send(Encoding.Default.GetBytes(str));
+        Console.WriteLine(operateResult.Message);
+    }
 
-//    Console.ReadLine();
-//    operateResult = tcpServiceOperate.Off();
-//    Console.WriteLine(operateResult.Message);
-//    operateResult = wsClientOperate.Off();
-//    Console.WriteLine(operateResult.Message);
-//}
+    Console.ReadLine();
+    operateResult = tcpServiceOperate.Off();
+    Console.WriteLine(operateResult.Message);
+    operateResult = wsClientOperate.Off();
+    Console.WriteLine(operateResult.Message);
+}
 
-//void WsServiceOperate_OnEvent(object? sender, EventResult e)
-//{
-//    Console.WriteLine("事件数据：" + e.Message);
-//}
+void WsServiceOperate_OnEvent(object? sender, EventResult e)
+{
+    Console.WriteLine("事件数据：" + e.Message);
+}
 
 //WsServiceOperate wsServiceOperate = WsServiceOperate.Instance(new WsServiceData.Basics
 //{

src/YSAI.DAQ/YSAI.Test.All/YSAI.Test.All.csproj

@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YSAI.Log\YSAI.Log.csproj" />
-    <ProjectReference Include="..\YSAI.Unility\YSAI.Unility.csproj" />
+    <ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
   </ItemGroup>
 
 </Project>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.33" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.34" />
   </ItemGroup>
 
   <ItemGroup>