1

src/YSAI.DAQ/YSAI.Core/interface/only/IModbus.cs

@@ -12,7 +12,7 @@ namespace YSAI.Core.@interface.only
     /// <summary>
     /// MODBUS 接口
     /// </summary>
-    public interface IModbus : IOn, IOff, IDisposable
+    public interface IModbusClient : IOn, IOff, IDisposable
     {
         /// <summary>
         /// 读取从1到2000个连续线圈状态。

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test", "YSAI.Test\YSAI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.TestConsole", "YSAI.TestConsole\YSAI.TestConsole.csproj", "{6F261956-DB97-43E4-A982-FBA2FB78AE15}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.RabbitMQ", "YSAI.RabbitMQ\YSAI.RabbitMQ.csproj", "{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,10 @@ Global
 		{6F261956-DB97-43E4-A982-FBA2FB78AE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F261956-DB97-43E4-A982-FBA2FB78AE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F261956-DB97-43E4-A982-FBA2FB78AE15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -95,6 +101,7 @@ Global
 		{FEFEFB3E-30EE-429A-B39D-F39CF1338E38} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{2B2ED6D8-B498-4589-ADAB-4599B9EFFC70} = {0A264424-1AD7-49FA-B813-D96498066479}
 		{439C729E-C66D-492B-A481-0C7F73F04E76} = {0A264424-1AD7-49FA-B813-D96498066479}
+		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F} = {0A264424-1AD7-49FA-B813-D96498066479}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5D5D3927-6714-40C0-84EA-44C5BA4C5E87}

src/YSAI.DAQ/YSAI.Modbus/client/ModbusClientOperate.cs

@@ -25,7 +25,7 @@ namespace YSAI.Modbus.client
     /// <summary>
     /// modbus 操作
     /// </summary>
-    public class ModbusClientOperate : IBase, IModbus
+    public class ModbusClientOperate : IBase, IModbusClient
     {
         private static readonly object Lock = new object();  //锁
         private static List<ModbusClientOperate> ThisObjList = new List<ModbusClientOperate>(); //自身对象集合

src/YSAI.DAQ/YSAI.Modbus/service/ModBusAsciiServer.cs

@@ -166,8 +166,7 @@ namespace YSAI.Modbus.service
                         break;
                 }
             }
-            catch (Exception ex)
-            { }
+            catch { }
         }
     }
 }

src/YSAI.DAQ/YSAI.Modbus/service/ModBusRtuServer.cs

@@ -128,8 +128,7 @@ namespace YSAI.Modbus.service
                         break;
                 }
             }
-            catch (Exception ex)
-            { }
+            catch { }
         }
     }
 }

src/YSAI.DAQ/YSAI.Modbus/service/ModBusTcpServer.cs

@@ -197,12 +197,7 @@ namespace YSAI.Modbus.service
                             break;
                     }
                 }
-                catch (Exception ex)
-                {
-                    //if (newSocket?.Connected ?? false) newSocket?.Shutdown(SocketShutdown.Both);
-                    //newSocket?.Close();
-                    //throw ex;
-                }
+                catch { }
             }
         }
     }

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

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>