Shun 2 лет назад
Родитель
Сommit
4579ab13b5
26 измененных файлов с 33 добавлено и 29 удалено
  1. 5 8
      src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs
  2. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll
  3. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb
  4. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll
  5. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.dll
  6. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.dll
  7. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.pdb
  8. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.dll
  9. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.dll
  10. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.pdb
  11. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.dll
  12. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.dll
  13. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.pdb
  14. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.dll
  15. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.dll
  16. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.pdb
  17. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.dll
  18. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.dll
  19. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.pdb
  20. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.dll
  21. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.dll
  22. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.pdb
  23. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.dll
  24. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.dll
  25. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.pdb
  26. 28 21
      src/YSAI.DAQ/YSAI.Test.Console/Program.cs

+ 5 - 8
src/YSAI.DAQ/YSAI.Kafka/KafkaOperate.cs

@@ -350,13 +350,9 @@ namespace YSAI.Kafka
                     producerConfig = new ProducerConfig()
                     producerConfig = new ProducerConfig()
                     {
                     {
                         ClientId = Guid.NewGuid().ToString(),
                         ClientId = Guid.NewGuid().ToString(),
-                        BootstrapServers = basics.BootstrapServers
-                        //,
-                        //SecurityProtocol = basics.SecurityProtocol,
-                        //SaslMechanism = basics.SaslMechanism,
-                        //SaslKerberosServiceName = basics.SaslKerberosServiceName,
-                        //SaslKerberosKeytab = basics.SaslKerberosKeytab,
-                        //SaslKerberosPrincipal = basics.SaslKerberosPrincipal
+                        BootstrapServers = basics.BootstrapServers,
+                        EnableIdempotence=true,
+                        SecurityProtocol = basics.SecurityProtocol
                     };
                     };
                 }
                 }
 
 
@@ -367,7 +363,8 @@ namespace YSAI.Kafka
                     {
                     {
                         BootstrapServers = basics.BootstrapServers,
                         BootstrapServers = basics.BootstrapServers,
                         GroupId = Guid.NewGuid().ToString(),
                         GroupId = Guid.NewGuid().ToString(),
-                        AutoOffsetReset = basics.AutoOffsetReset
+                        AutoOffsetReset = basics.AutoOffsetReset,
+                        SecurityProtocol = basics.SecurityProtocol
                     };
                     };
                 }
                 }
 
 

BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.pdb


+ 28 - 21
src/YSAI.DAQ/YSAI.Test.Console/Program.cs

@@ -16,30 +16,37 @@ using YSAI.S7.client;
 using YSAI.Unility;
 using YSAI.Unility;
 
 
 
 
-
-MqttClientOperate mqttClientOperate = MqttClientOperate.Instance(new MqttClientData.Basics()
+MqttWebSocketServiceOperate mqttWebSocketServiceOperate = MqttWebSocketServiceOperate.Instance(new MqttWebSocketServiceData.Basics() 
 {
 {
-    ServerIPAddress = "127.0.0.1",
-    ServerPort=8881,
-    ServerLoginID="ysai",
-    ServerLoginPassword="ysai",
-    SN = "ysai"
+    HttpPort=11886,
+    Port=1188,
+    
 });
 });
-OperateResult operateResult = mqttClientOperate.On();
-if (!operateResult.State)
-{
-    LogHelper.Warning(operateResult.ToJson());
-}
 
 
-while (true)
-{
-    operateResult = mqttClientOperate.Produce("666", "123");
-    if (!operateResult.State)
-    {
-        LogHelper.Warning(operateResult.ToJson());
-    }
-    Thread.Sleep(1000);
-}
+
+//MqttClientOperate mqttClientOperate = MqttClientOperate.Instance(new MqttClientData.Basics()
+//{
+//    ServerIPAddress = "192.168.2.200",
+//    ServerPort= 5101,
+//    ServerLoginID="ys",
+//    ServerLoginPassword="ys123456",
+//    SN = "ysai"
+//});
+//OperateResult operateResult = mqttClientOperate.On();
+//if (!operateResult.State)
+//{
+//    LogHelper.Warning(operateResult.ToJson());
+//}
+
+//while (true)
+//{
+//    operateResult = mqttClientOperate.Produce("666", "123");
+//    if (!operateResult.State)
+//    {
+//        LogHelper.Warning(operateResult.ToJson());
+//    }
+//    Thread.Sleep(1000);
+//}
 ////对象实例
 ////对象实例
 //S7ClientOperate s7ClientOperate = S7ClientOperate.Instance(new S7ClientData.Basics()
 //S7ClientOperate s7ClientOperate = S7ClientOperate.Instance(new S7ClientData.Basics()
 //{
 //{