yandaniu hace 2 días
padre
commit
e407692078
Se han modificado 100 ficheros con 39 adiciones y 18 borrados
  1. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.metadata.v6.1
  2. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.projects.v6.1
  3. BIN
      .vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2
  4. BIN
      .vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2.r1557
  5. BIN
      .vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2.r1611
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/02a3b676-27e4-42a3-b7e4-8147ecc33c40.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/1a5156c2-4afa-4642-b9b2-dbe4d980f2ea.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/416a925b-44cd-48ac-89f9-d25341f10b91.vsidx
  9. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/5e5e0b12-d367-4f78-aab4-7a2fda7fc44b.vsidx
  10. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7d41eef4-37d1-4f06-baa4-9e47dfc685a2.vsidx
  11. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7f02d622-7ee6-4c49-9019-84ec6e560b51.vsidx
  12. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/8746401a-d6c0-4645-b14e-5f76724f0e5e.vsidx
  13. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/8e4604b7-be7c-47b4-a304-7cc550529bc6.vsidx
  14. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9e871312-c94e-421b-bfc0-5f31bbc922a0.vsidx
  15. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9eaf3ec7-a104-4f9e-bc1e-3ed7760dc957.vsidx
  16. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/a68678a8-2980-42ab-aa28-4e73cca27cc0.vsidx
  17. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/aaf909ca-180a-4dfd-8b22-a733080d22fc.vsidx
  18. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/bd7015a5-9762-4f6e-8105-68dd54ae8250.vsidx
  19. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/bf161e1d-8797-4050-a6ae-d1f962729c1a.vsidx
  20. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/bf8f1773-ae1b-4ff5-bef2-40958c636137.vsidx
  21. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/de0fe434-cf11-49b7-be16-3690659f3df0.vsidx
  22. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/fbc7f609-5490-4061-b1dc-8d639bb76634.vsidx
  23. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/fe157948-f3a0-40c3-81d8-6dba070e43e5.vsidx
  24. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/ff0ada04-c3e1-4c8b-a607-923d14368629.vsidx
  25. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2
  26. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2.r1557
  27. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2.r1611
  28. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  29. BIN
      .vs/Ropin.Inspection.Api/v17/.suo.r1557
  30. BIN
      .vs/Ropin.Inspection.Api/v17/.suo.r1611
  31. BIN
      .vs/Ropin.Inspection.Api/v17/fileList.bin
  32. BIN
      .vs/Ropin.Inspection.Api/v17/fileList.bin.r1557
  33. BIN
      .vs/Ropin.Inspection.Api/v17/fileList.bin.r1611
  34. 6 6
      Core.RabbitMQBus.Common/RabbitMQOptions.cs
  35. BIN
      Core.RabbitMQBus.Common/bin/Debug/Core.RabbitMQBus.Common.1.0.0.nupkg
  36. BIN
      Core.RabbitMQBus.Common/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll
  37. BIN
      Core.RabbitMQBus.Common/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb
  38. BIN
      Core.RabbitMQBus.Common/obj/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll
  39. BIN
      Core.RabbitMQBus.Common/obj/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb
  40. 1 1
      Core.RabbitMQBus/EventBus/RabbitMqPublisher.cs
  41. 1 1
      Core.RabbitMQBus/EventBus/RabbitMqSubscriber.cs
  42. BIN
      Core.RabbitMQBus/bin/Debug/Core.RabbitMQBus.1.2.0.nupkg
  43. BIN
      Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll
  44. BIN
      Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb
  45. BIN
      Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.dll
  46. BIN
      Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.pdb
  47. BIN
      Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.csproj.AssemblyReference.cache
  48. BIN
      Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.dll
  49. BIN
      Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.pdb
  50. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  51. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  52. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  53. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  54. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  55. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  56. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  57. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  58. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  59. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  60. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  61. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  62. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.AssemblyReference.cache
  63. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.dll
  64. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.pdb
  65. 3 3
      Ropin.Environmentally.AlarmService/appsettings.Development.json
  66. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Common.dll
  67. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Common.pdb
  68. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  69. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  70. 19 0
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.deps.json
  71. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.dll
  72. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.pdb
  73. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  74. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  75. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  76. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  77. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  78. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  79. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  80. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  81. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  82. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  83. BIN
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/ToolGood.Words.dll
  84. 3 3
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/appsettings.Development.json
  85. 0 0
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250529.txt
  86. 0 0
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250529_error.txt
  87. 0 0
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250530.txt
  88. 0 0
      Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250530_error.txt
  89. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.AssemblyReference.cache
  90. 1 1
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.CoreCompileInputs.cache
  91. 1 0
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.FileListAbsolute.txt
  92. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.dll
  93. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.pdb
  94. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache
  95. 3 2
      Ropin.Environmentally.LedgeService1/log4net.config
  96. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache
  97. 1 1
      Ropin.Environmentally.VideoService/appsettings.Development.json
  98. BIN
      Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.csproj.AssemblyReference.cache
  99. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.AssemblyReference.cache
  100. BIN
      Ropin.IOT.MLService/AccidentPredictionModel.zip

BIN
.vs/ProjectEvaluation/ropin.inspection.api.metadata.v6.1


BIN
.vs/ProjectEvaluation/ropin.inspection.api.projects.v6.1


BIN
.vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2


BIN
.vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2.r1557


BIN
.vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2.r1611


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/ce49806f-793f-49e4-86d5-67a131d04890.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/02a3b676-27e4-42a3-b7e4-8147ecc33c40.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/1a5156c2-4afa-4642-b9b2-dbe4d980f2ea.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/416a925b-44cd-48ac-89f9-d25341f10b91.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/5e5e0b12-d367-4f78-aab4-7a2fda7fc44b.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7d41eef4-37d1-4f06-baa4-9e47dfc685a2.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7f02d622-7ee6-4c49-9019-84ec6e560b51.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/8746401a-d6c0-4645-b14e-5f76724f0e5e.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/8e4604b7-be7c-47b4-a304-7cc550529bc6.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/9e871312-c94e-421b-bfc0-5f31bbc922a0.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/9eaf3ec7-a104-4f9e-bc1e-3ed7760dc957.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/a68678a8-2980-42ab-aa28-4e73cca27cc0.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/cc18723c-21d1-4f38-8e60-47a9bc6e40ed.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/aaf909ca-180a-4dfd-8b22-a733080d22fc.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/bd7015a5-9762-4f6e-8105-68dd54ae8250.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/1bf02664-43d7-47db-94b9-070a2932b085.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/bf161e1d-8797-4050-a6ae-d1f962729c1a.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/4ab0ac03-d198-4839-8c06-8e72357047c9.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/bf8f1773-ae1b-4ff5-bef2-40958c636137.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/cc8818e7-a58f-4e64-ba0f-cb1046f1e0ae.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/de0fe434-cf11-49b7-be16-3690659f3df0.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/fbc7f609-5490-4061-b1dc-8d639bb76634.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/2f51b3f4-463b-46ce-ad5f-be8d834cffc4.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/fe157948-f3a0-40c3-81d8-6dba070e43e5.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/ff0ada04-c3e1-4c8b-a607-923d14368629.vsidx


BIN
.vs/Ropin.Inspection.Api/v17/.futdcache.v2


BIN
.vs/Ropin.Inspection.Api/v17/.futdcache.v2.r1557


BIN
.vs/Ropin.Inspection.Api/v17/.futdcache.v2.r1611


BIN
.vs/Ropin.Inspection.Api/v17/.suo


BIN
.vs/Ropin.Inspection.Api/v17/.suo.r1557


BIN
.vs/Ropin.Inspection.Api/v17/.suo.r1611


BIN
.vs/Ropin.Inspection.Api/v17/fileList.bin


BIN
.vs/Ropin.Inspection.Api/v17/fileList.bin.r1557


BIN
.vs/Ropin.Inspection.Api/v17/fileList.bin.r1611


+ 6 - 6
Core.RabbitMQBus.Common/RabbitMQOptions.cs

@@ -9,35 +9,35 @@
         /// 默认密码
         /// </summary>
         /// <remarks></remarks>
-        public const string DefaultPass = "yak"; //guest
+        public const string DefaultPass = "ropin@epe"; //guest
 
         /// <summary>
         /// 默认用户名
         /// </summary>
         /// <remarks></remarks>
-        public const string DefaultUser = "yak"; //guest
+        public const string DefaultUser = "admin"; //guest
 
         /// <summary>
         /// 默认主机
         /// </summary>
         /// <remarks></remarks>
-        public const string DefaultVHost = "develop"; // /
+        public const string DefaultVHost = "/"; // develop
 
         /// <summary>
         /// 默认主机
         /// </summary>
         /// <remarks></remarks>
-        public const int DefaultPort = 5672;
+        public const int DefaultPort = 5673;
 
         /// <summary>
         /// 默认交换机
         /// </summary>
-        public const string DefaultExchangeName = "amq.topic"; //exchangeName.default.router
+        public const string DefaultExchangeName = "test_exchange"; //exchangeName.default.router
 
         /// <summary>
         /// 路由类型
         /// </summary>
-        public const string ExchangeType = "topic";
+        public const string ExchangeType = "direct"; //topic
 
         /// <summary>
         /// 主机名

BIN
Core.RabbitMQBus.Common/bin/Debug/Core.RabbitMQBus.Common.1.0.0.nupkg


BIN
Core.RabbitMQBus.Common/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll


BIN
Core.RabbitMQBus.Common/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb


BIN
Core.RabbitMQBus.Common/obj/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll


BIN
Core.RabbitMQBus.Common/obj/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb


+ 1 - 1
Core.RabbitMQBus/EventBus/RabbitMqPublisher.cs

@@ -21,7 +21,7 @@ namespace Core.RabbitMQBus.EventBus
             _connectionChannel = connectionChannel;
             _channel = _connectionChannel.GetChannel();
             //声名交换机
-            _channel.ExchangeDeclare(exchange: _connectionChannel.ExchangeName, type: "topic", durable: true);
+            _channel.ExchangeDeclare(exchange: _connectionChannel.ExchangeName, type: "direct", durable: true); // topic
             //启用发布者确认
             _channel.ConfirmSelect();
             //肯定确认

+ 1 - 1
Core.RabbitMQBus/EventBus/RabbitMqSubscriber.cs

@@ -48,7 +48,7 @@ namespace Core.RabbitMQBus.EventBus
             {
                 var body = ea.Body;
                 var message = Encoding.Default.GetString(body);
-                var subscriberServiceMethod = RegisterSubscriberCache.GetSubscriberMethod(ea.RoutingKey);
+                var subscriberServiceMethod = RegisterSubscriberCache.GetSubscriberMethod(ea.RoutingKey); //
                 var obj = SwifterJsonSerializer.DeserializeObject(message, subscriberServiceMethod.MethodParameterType);
                 var methodTask = (Task<ExecuteMethodResult>)subscriberServiceMethod.MethodInfo.Invoke(subscriberServiceMethod.SubscriberService,
                     new object[] { obj });

BIN
Core.RabbitMQBus/bin/Debug/Core.RabbitMQBus.1.2.0.nupkg


BIN
Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.dll


BIN
Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.Common.pdb


BIN
Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.dll


BIN
Core.RabbitMQBus/bin/Debug/netstandard2.1/Core.RabbitMQBus.pdb


BIN
Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.csproj.AssemblyReference.cache


BIN
Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.dll


BIN
Core.RabbitMQBus/obj/Debug/netstandard2.1/Core.RabbitMQBus.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.AssemblyReference.cache


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.pdb


+ 3 - 3
Ropin.Environmentally.AlarmService/appsettings.Development.json

@@ -13,14 +13,14 @@
   },
   "CofingSet": {
     "RabbitMQ": {
-      "QueueName": "rabbit.alarmDevice", //消息队列名称
+      "QueueName": "test_queue", //消息队列名称rabbit.alarmDevice
       "HostName": "124.71.132.255", //IP地址
       "Port": 5673, //端口号
       "UserName": "admin", //用户账号
       "VirtualHost": "/",
       "Password": "ropin@epe", //用户密码
-      "ExchangeName": "rabbit.alarmDevice.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
-      "RoutingKey": "rabbit.alarmDevice.key" //路由键【消息队列名称+.key】
+      "ExchangeName": "test_exchange", //交换机名称【消息队列名称+.DirectExchange】
+      "RoutingKey": "test_queue" //路由键【消息队列名称+.key】
     },
     "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
     //"PublicPushMessageAPI": "https://www.dgt.net.cn:4443/api/Account/PublicPushMessage",

BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Common.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Common.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Core.Extensions.pdb


+ 19 - 0
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.deps.json

@@ -2376,6 +2376,17 @@
           "System.Xml.ReaderWriter": "4.3.0"
         }
       },
+      "ToolGood.Words/3.1.0.2": {
+        "runtime": {
+          "lib/netstandard2.1/ToolGood.Words.dll": {
+            "assemblyVersion": "3.1.0.2",
+            "fileVersion": "3.1.0.2"
+          }
+        },
+        "compile": {
+          "lib/netstandard2.1/ToolGood.Words.dll": {}
+        }
+      },
       "ZXing.Net/0.16.9": {
         "runtime": {
           "lib/net5.0/zxing.dll": {
@@ -2453,6 +2464,7 @@
           "Microsoft.Extensions.Http": "5.0.0",
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
+          "ToolGood.Words": "3.1.0.2",
           "log4net": "2.0.17"
         },
         "runtime": {
@@ -5581,6 +5593,13 @@
       "path": "system.xml.xmldocument/4.3.0",
       "hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
     },
+    "ToolGood.Words/3.1.0.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-UcLdUjzkN0yeT8q591XpDsAs6bKue2T7Z6smYju3ku5ABuuSFVAr8WCTTzjVqpmlpEN/O3gC2Jai2Ujlir+BLg==",
+      "path": "toolgood.words/3.1.0.2",
+      "hashPath": "toolgood.words.3.1.0.2.nupkg.sha512"
+    },
     "ZXing.Net/0.16.9": {
       "type": "package",
       "serviceable": true,

BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Environmentally.AlarmService.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Service.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Service.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb


BIN
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/ToolGood.Words.dll


+ 3 - 3
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/appsettings.Development.json

@@ -13,14 +13,14 @@
   },
   "CofingSet": {
     "RabbitMQ": {
-      "QueueName": "rabbit.alarmDevice", //消息队列名称
+      "QueueName": "test_queue", //消息队列名称rabbit.alarmDevice
       "HostName": "124.71.132.255", //IP地址
       "Port": 5673, //端口号
       "UserName": "admin", //用户账号
       "VirtualHost": "/",
       "Password": "ropin@epe", //用户密码
-      "ExchangeName": "rabbit.alarmDevice.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
-      "RoutingKey": "rabbit.alarmDevice.key" //路由键【消息队列名称+.key】
+      "ExchangeName": "test_exchange", //交换机名称【消息队列名称+.DirectExchange】
+      "RoutingKey": "test_queue" //路由键【消息队列名称+.key】
     },
     "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
     //"PublicPushMessageAPI": "https://www.dgt.net.cn:4443/api/Account/PublicPushMessage",

+ 0 - 0
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250529.txt


+ 0 - 0
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250529_error.txt


+ 0 - 0
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250530.txt


+ 0 - 0
Ropin.Environmentally.AlarmService/bin/Debug/net5.0/logs/2025/202505/20250530_error.txt


BIN
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.AssemblyReference.cache


+ 1 - 1
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-3b3a948a1ff52fe89e5f8b88660a058742142260
+7abde38db7393fcc3df848c20ca1ea8f110aae6d

+ 1 - 0
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.FileListAbsolute.txt

@@ -126,3 +126,4 @@ E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmSer
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Inspection.Tasks.pdb
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\appsettings.Production.json
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\appsettings.Staging.json
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\ToolGood.Words.dll

BIN
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.dll


BIN
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.pdb


BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache


+ 3 - 2
Ropin.Environmentally.LedgeService1/log4net.config

@@ -64,8 +64,9 @@
 		</layout>
 	</appender>
 	<root>
-		<level value="OFF" />
-		<appender-ref ref="RollingFileError" />
+    <!--<level value="OFF" />-->
+		<level value="TRACE" />
+    <appender-ref ref="RollingFileError" />
 		<appender-ref ref="RollingFileAll" />
 		<appender-ref ref="TraceAppender" />
 		<appender-ref ref="ConsoleAppender" />

BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache


+ 1 - 1
Ropin.Environmentally.VideoService/appsettings.Development.json

@@ -13,7 +13,7 @@
     //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000,abortConnect=false",
     //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20241213;sslMode=None"
 
-    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
     "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
   },
   "RabbitMQ": {

BIN
Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.csproj.AssemblyReference.cache


BIN
Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.AssemblyReference.cache


BIN
Ropin.IOT.MLService/AccidentPredictionModel.zip


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio