yandaniu 10 hours ago
parent
commit
ca915f69cc
100 changed files with 1107 additions and 216 deletions
  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/FileContentIndex/2d03c03c-2555-4bd1-a292-52e580adf2e6.vsidx
  5. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/48522230-6a25-414e-9cd1-8b6a39a95356.vsidx
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/66921e8f-d58c-4310-9945-fc3469cc0f29.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/72af36d8-a8ba-41e5-ad11-f1b767fee7a3.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7f02d622-7ee6-4c49-9019-84ec6e560b51.vsidx
  9. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/8746401a-d6c0-4645-b14e-5f76724f0e5e.vsidx
  10. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9047e244-875e-46b5-b07a-ee9b99da2ff4.vsidx
  11. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/99cf4c89-6f05-4110-81ad-a06cdfcae612.vsidx
  12. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9eaf3ec7-a104-4f9e-bc1e-3ed7760dc957.vsidx
  13. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/a68678a8-2980-42ab-aa28-4e73cca27cc0.vsidx
  14. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/aacd4045-d341-4a09-891d-f19ab5a41a15.vsidx
  15. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/b78b68ec-f1f1-4205-b96c-c9895de6df3a.vsidx
  16. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/b8adb285-c71c-4926-9c5b-d57341c0b0b1.vsidx
  17. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/bd7015a5-9762-4f6e-8105-68dd54ae8250.vsidx
  18. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/dfbc833a-e63b-47da-bfe9-9901f0302f0a.vsidx
  19. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2
  20. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  21. BIN
      .vs/Ropin.Inspection.Api/v17/fileList.bin
  22. 19 0
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.deps.json
  23. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  24. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  25. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  26. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  27. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  28. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  29. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  30. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  31. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  32. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  33. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  34. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  35. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.assets.cache
  36. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.AssemblyReference.cache
  37. 1 1
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.CoreCompileInputs.cache
  38. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.dll
  39. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.pdb
  40. 4 0
      Ropin.Core.Extensions/obj/Ropin.Core.Extensions.csproj.nuget.dgspec.json
  41. 39 0
      Ropin.Core.Extensions/obj/project.assets.json
  42. 2 1
      Ropin.Core.Extensions/obj/project.nuget.cache
  43. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.assets.cache
  44. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.AssemblyReference.cache
  45. 4 0
      Ropin.Environmentally.AlarmService/obj/Ropin.Environmentally.AlarmService.csproj.nuget.dgspec.json
  46. 39 0
      Ropin.Environmentally.AlarmService/obj/project.assets.json
  47. 2 1
      Ropin.Environmentally.AlarmService/obj/project.nuget.cache
  48. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.assets.cache
  49. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache
  50. 4 0
      Ropin.Environmentally.DcsService/obj/Ropin.Environmentally.DcsService.csproj.nuget.dgspec.json
  51. 39 0
      Ropin.Environmentally.DcsService/obj/project.assets.json
  52. 2 1
      Ropin.Environmentally.DcsService/obj/project.nuget.cache
  53. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.assets.cache
  54. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache
  55. 4 0
      Ropin.Environmentally.LedgeService1/obj/Ropin.Environmentally.LedgeService1.csproj.nuget.dgspec.json
  56. 39 0
      Ropin.Environmentally.LedgeService1/obj/project.assets.json
  57. 2 1
      Ropin.Environmentally.LedgeService1/obj/project.nuget.cache
  58. 2 0
      Ropin.Environmentally.VideoService/Ropin.Environmentally.VideoService.csproj
  59. 2 0
      Ropin.Environmentally.VideoService/Startup.cs
  60. 11 1
      Ropin.Environmentally.VideoService/appsettings.Development.json
  61. BIN
      Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.assets.cache
  62. BIN
      Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.csproj.AssemblyReference.cache
  63. 12 0
      Ropin.Environmentally.VideoService/obj/Ropin.Environmentally.VideoService.csproj.nuget.dgspec.json
  64. 13 1
      Ropin.Environmentally.VideoService/obj/Ropin.Environmentally.VideoService.csproj.nuget.g.targets
  65. 462 133
      Ropin.Environmentally.VideoService/obj/project.assets.json
  66. 38 31
      Ropin.Environmentally.VideoService/obj/project.nuget.cache
  67. 190 41
      Ropin.Environmentally.VideoService/service/RabbitMQVideoService.cs
  68. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.assets.cache
  69. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.AssemblyReference.cache
  70. 4 0
      Ropin.Environmentally.WebScada/obj/Ropin.Environmentally.WebScada.csproj.nuget.dgspec.json
  71. 39 0
      Ropin.Environmentally.WebScada/obj/project.assets.json
  72. 2 1
      Ropin.Environmentally.WebScada/obj/project.nuget.cache
  73. BIN
      Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.assets.cache
  74. BIN
      Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.csproj.AssemblyReference.cache
  75. 4 0
      Ropin.IOT.MqttService/obj/Ropin.IOT.MqttService.csproj.nuget.dgspec.json
  76. 39 0
      Ropin.IOT.MqttService/obj/project.assets.json
  77. 2 1
      Ropin.IOT.MqttService/obj/project.nuget.cache
  78. BIN
      Ropin.IOT.MsgService/obj/Debug/net5.0/Ropin.IOT.MsgService.assets.cache
  79. BIN
      Ropin.IOT.MsgService/obj/Debug/net5.0/Ropin.IOT.MsgService.csproj.AssemblyReference.cache
  80. 4 0
      Ropin.IOT.MsgService/obj/Ropin.IOT.MsgService.csproj.nuget.dgspec.json
  81. 39 0
      Ropin.IOT.MsgService/obj/project.assets.json
  82. 2 1
      Ropin.IOT.MsgService/obj/project.nuget.cache
  83. 14 1
      Ropin.Inspection.Api/Controllers/Base/AIController.cs
  84. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  85. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  86. 22 0
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.deps.json
  87. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.dll
  88. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.pdb
  89. 6 0
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.xml
  90. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  91. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  92. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  93. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  94. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  95. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  96. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  97. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  98. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  99. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  100. BIN
      Ropin.Inspection.Api/bin/Debug/net5.0/Ulid.dll

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/FileContentIndex/b6323dc9-6aa2-4965-8549-7bc811ec6d62.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/2d03c03c-2555-4bd1-a292-52e580adf2e6.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/03bd73c7-485d-4d94-828f-b8db25840830.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/48522230-6a25-414e-9cd1-8b6a39a95356.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/9291e289-ecf0-4f5d-83ab-d61f83922799.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/66921e8f-d58c-4310-9945-fc3469cc0f29.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/766374d5-114f-4c8c-8879-2542fe3f2491.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/72af36d8-a8ba-41e5-ad11-f1b767fee7a3.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/58ba6a1c-ce29-4509-98ff-67f0cbdc802a.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/9047e244-875e-46b5-b07a-ee9b99da2ff4.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/8c5d571d-b92a-4ac8-9e81-1faee0351912.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/99cf4c89-6f05-4110-81ad-a06cdfcae612.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/77e0d5d6-5caf-450d-8815-6d9e3a4ce3d4.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/aacd4045-d341-4a09-891d-f19ab5a41a15.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/eae10dc0-3af4-4642-8c18-3434e76c4ef3.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/b78b68ec-f1f1-4205-b96c-c9895de6df3a.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/3d0e0188-79bf-4a9f-9cb3-71779d308049.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/b8adb285-c71c-4926-9c5b-d57341c0b0b1.vsidx


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


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7d38ffd3-66d5-4d88-979f-8a1c8720079c.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/dfbc833a-e63b-47da-bfe9-9901f0302f0a.vsidx


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


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


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


+ 19 - 0
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.deps.json

@@ -1510,6 +1510,17 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "assemblyVersion": "1.4.1.0",
+            "fileVersion": "1.4.1.0"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "runtime": {
           "lib/net5.0/zxing.dll": {
@@ -1560,6 +1571,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "runtime": {
@@ -2770,6 +2782,13 @@
       "path": "toolgood.words/3.1.0.2",
       "hashPath": "toolgood.words.3.1.0.2.nupkg.sha512"
     },
+    "Ulid/1.4.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "path": "ulid/1.4.1",
+      "hashPath": "ulid.1.4.1.nupkg.sha512"
+    },
     "ZXing.Net/0.16.9": {
       "type": "package",
       "serviceable": true,

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.assets.cache


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


+ 1 - 1
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a89d89087f229c905a72530cd7459350b652d6bd
+a13dabcd3d672cddd1c56ffff39b3fb4b07d56ba

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


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


+ 4 - 0
Ropin.Core.Extensions/obj/Ropin.Core.Extensions.csproj.nuget.dgspec.json

@@ -286,6 +286,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.Core.Extensions/obj/project.assets.json

@@ -2871,6 +2871,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -2938,6 +2954,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -8807,6 +8824,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.Core.Extensions/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "SLYHDykX0WLhETBEhmM9RiMpRS/QaZYsmLxM/PMKqT/2++slaFMs/Sk60fiodiIWrYWIMsWzR5YJYAeaoFRuHQ==",
+  "dgSpecHash": "2MmNTybA9zXz0QVLequyoSJ53REEM8TA+0tl8XlxcNxddsDDKD1RgGnu4/gBt96qJiJEhqBK5cNEJk5CFXJH3A==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Core.Extensions\\Ropin.Core.Extensions.csproj",
   "expectedPackageFiles": [
@@ -168,6 +168,7 @@
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

BIN
Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.assets.cache


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


+ 4 - 0
Ropin.Environmentally.AlarmService/obj/Ropin.Environmentally.AlarmService.csproj.nuget.dgspec.json

@@ -415,6 +415,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.Environmentally.AlarmService/obj/project.assets.json

@@ -3424,6 +3424,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3512,6 +3528,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -10276,6 +10293,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.Environmentally.AlarmService/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "ypDuJYZrzKiDdZYFqKnC5kWQjcfGsziW8OXZnMSJlHPi+4B7N3LR7FEh9TPGhoLXR3NIwLlXUx3z7jbJYlzoUA==",
+  "dgSpecHash": "xwQCsewwsgBzSqjyy1Tv3JI03ty3pyKEG/vmQQk8jVb6y8kFLIq01pB200JfkmrluyPw4w6BuhofUeO/q90rbA==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Environmentally.AlarmService\\Ropin.Environmentally.AlarmService.csproj",
   "expectedPackageFiles": [
@@ -201,6 +201,7 @@
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.assets.cache


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


+ 4 - 0
Ropin.Environmentally.DcsService/obj/Ropin.Environmentally.DcsService.csproj.nuget.dgspec.json

@@ -301,6 +301,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.Environmentally.DcsService/obj/project.assets.json

@@ -3053,6 +3053,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3120,6 +3136,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -9178,6 +9195,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.Environmentally.DcsService/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "fisUao1kWxjoFwRTL3Hrr0q5zwuKPwwQ4bhkqtUXuSQlkzy5qN5+rb2eY1xceiaFJoqvrtxYuFMzUngHNUvD1g==",
+  "dgSpecHash": "2jYxksYxlC39LkMVVCJppsaCkIHxM8kZq3L/MMGsMj3kb6MGbWcEblCPcyh82xaQAcnfUvOCGC9xjdk+nFwSFw==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Environmentally.DcsService\\Ropin.Environmentally.DcsService.csproj",
   "expectedPackageFiles": [
@@ -182,6 +182,7 @@
     "D:\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.assets.cache


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


+ 4 - 0
Ropin.Environmentally.LedgeService1/obj/Ropin.Environmentally.LedgeService1.csproj.nuget.dgspec.json

@@ -309,6 +309,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.Environmentally.LedgeService1/obj/project.assets.json

@@ -3054,6 +3054,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3121,6 +3137,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -9159,6 +9176,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.Environmentally.LedgeService1/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "Fs1VfbRdDZOHIgjZ7YhGrKvryOZuwG78we7EOc1Of7FcOJRXAOzFSQYKvieMF20pAsIj7r/F0RdeIStZ/RJLpA==",
+  "dgSpecHash": "7d0H8JGIcAk+SWgEauTl3pqWwn7unEKgWE9263cnpv50FtMdyoLjWhhAxD/suY7M6SLNrF/QkdzX09tY63Ro2w==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Environmentally.LedgeService1\\Ropin.Environmentally.LedgeService1.csproj",
   "expectedPackageFiles": [
@@ -182,6 +182,7 @@
     "D:\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

+ 2 - 0
Ropin.Environmentally.VideoService/Ropin.Environmentally.VideoService.csproj

@@ -10,7 +10,9 @@
     <PackageReference Include="FBoxClientDriver" Version="1.2.0" />
     <PackageReference Include="InitQ" Version="1.0.0.14" />
     <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
+    <PackageReference Include="Minio" Version="6.0.5" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
   </ItemGroup>

+ 2 - 0
Ropin.Environmentally.VideoService/Startup.cs

@@ -52,6 +52,8 @@ namespace Ropin.Environmentally.VideoService
             #region ÅäÖÃÎļþ
             var rabbitMQ = Configuration.GetSection("RabbitMQ").Get<RabbitMQModel>();
             services.AddSingleton<RabbitMQModel>(rabbitMQ);
+            var MinioSettings = Configuration.GetSection("MinioSettings").Get<MinioSettingsModel>();
+            services.AddSingleton<MinioSettingsModel>(MinioSettings);
             #endregion
             #region 
             services.AddTransient<IVMCDevCameraRepository, VMCDevCameraRepository>();

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

@@ -26,5 +26,15 @@
     "ExchangeName": "rab.video.record.mqtt.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
     "RoutingKey": "rab.video.record.mqtt.key" //路由键【消息队列名称+.key】
   },
-  "ServiceUrl": "https://www.dgt.net.cn:103" //本程序的服务地址
+  "ServiceUrl": "https://www.dgt.net.cn:103", //本程序的服务地址
+  "MinioSettings": {
+    "Urls": "http://60.204.212.71:19000",
+    "BucketName": "huanbao", //"devalamvideobuckename",
+    "Endpoint": "60.204.212.71:19000", //"http://60.204.212.71:9000",
+    //"AccessKey": "1Iv7S6uxln1yZdz5pAUx",
+    //"SecretKey": "Hkx2EJU4MDwMGeDfaFeL9jkef2AZyfZXSUYQ30FC",
+    "AccessKey": "DnoIplsC8d4HEtgtZNeH",
+    "SecretKey": "LejZtCAEphekBYdsMPd2dR6CcYbkEWLw8wcaUpZV",
+    "UseSSL": false
+  }
 }

BIN
Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.assets.cache


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


+ 12 - 0
Ropin.Environmentally.VideoService/obj/Ropin.Environmentally.VideoService.csproj.nuget.dgspec.json

@@ -152,10 +152,18 @@
               "target": "Package",
               "version": "[1.0.0.14, )"
             },
+            "Microsoft.Bcl.AsyncInterfaces": {
+              "target": "Package",
+              "version": "[9.0.8, )"
+            },
             "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": {
               "target": "Package",
               "version": "[1.17.2, )"
             },
+            "Minio": {
+              "target": "Package",
+              "version": "[6.0.5, )"
+            },
             "RabbitMQ.Client": {
               "target": "Package",
               "version": "[6.8.1, )"
@@ -293,6 +301,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 13 - 1
Ropin.Environmentally.VideoService/obj/Ropin.Environmentally.VideoService.csproj.nuget.g.targets

@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)\system.runtime.compilerservices.unsafe\6.1.0\buildTransitive\netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.targets" Condition="Exists('$(NuGetPackageRoot)\system.runtime.compilerservices.unsafe\6.1.0\buildTransitive\netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.targets')" />
     <Import Project="$(NuGetPackageRoot)\system.threading.channels\7.0.0\buildTransitive\netcoreapp2.0\System.Threading.Channels.targets" Condition="Exists('$(NuGetPackageRoot)\system.threading.channels\7.0.0\buildTransitive\netcoreapp2.0\System.Threading.Channels.targets')" />
-    <Import Project="$(NuGetPackageRoot)\system.reactive\4.4.1\buildTransitive\netcoreapp3.0\System.Reactive.targets" Condition="Exists('$(NuGetPackageRoot)\system.reactive\4.4.1\buildTransitive\netcoreapp3.0\System.Reactive.targets')" />
+    <Import Project="$(NuGetPackageRoot)\system.text.encodings.web\9.0.1\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets" Condition="Exists('$(NuGetPackageRoot)\system.text.encodings.web\9.0.1\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets')" />
+    <Import Project="$(NuGetPackageRoot)\system.io.pipelines\9.0.1\buildTransitive\netcoreapp2.0\System.IO.Pipelines.targets" Condition="Exists('$(NuGetPackageRoot)\system.io.pipelines\9.0.1\buildTransitive\netcoreapp2.0\System.IO.Pipelines.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.bcl.asyncinterfaces\9.0.8\buildTransitive\netcoreapp2.0\Microsoft.Bcl.AsyncInterfaces.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.bcl.asyncinterfaces\9.0.8\buildTransitive\netcoreapp2.0\Microsoft.Bcl.AsyncInterfaces.targets')" />
+    <Import Project="$(NuGetPackageRoot)\system.text.json\9.0.1\buildTransitive\netcoreapp2.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)\system.text.json\9.0.1\buildTransitive\netcoreapp2.0\System.Text.Json.targets')" />
+    <Import Project="$(NuGetPackageRoot)\system.diagnostics.diagnosticsource\9.0.4\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets" Condition="Exists('$(NuGetPackageRoot)\system.diagnostics.diagnosticsource\9.0.4\buildTransitive\netcoreapp2.0\System.Diagnostics.DiagnosticSource.targets')" />
+    <Import Project="$(NuGetPackageRoot)\system.io.hashing\9.0.4\buildTransitive\netcoreapp2.0\System.IO.Hashing.targets" Condition="Exists('$(NuGetPackageRoot)\system.io.hashing\9.0.4\buildTransitive\netcoreapp2.0\System.IO.Hashing.targets')" />
     <Import Project="$(NuGetPackageRoot)\microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.primitives\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.primitives\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.dependencyinjection.abstractions\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.DependencyInjection.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.dependencyinjection.abstractions\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.DependencyInjection.Abstractions.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.options\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Options.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.options\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Options.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.logging.abstractions\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.logging.abstractions\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.dependencyinjection\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.DependencyInjection.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.dependencyinjection\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.DependencyInjection.targets')" />
+    <Import Project="$(NuGetPackageRoot)\microsoft.extensions.logging\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Logging.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.extensions.logging\9.0.4\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Logging.targets')" />
     <Import Project="$(NuGetPackageRoot)\microsoft.visualstudio.azure.containers.tools.targets\1.17.2\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.visualstudio.azure.containers.tools.targets\1.17.2\build\Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets')" />
   </ImportGroup>
 </Project>

File diff suppressed because it is too large
+ 462 - 133
Ropin.Environmentally.VideoService/obj/project.assets.json


+ 38 - 31
Ropin.Environmentally.VideoService/obj/project.nuget.cache

@@ -1,11 +1,12 @@
 {
   "version": 2,
-  "dgSpecHash": "OqbpjkGM4o6m/O7L/edZkMQ8c/POMjVVnuEvjUMxygn5OnCH0QT5SOcknu9exKAS0esPzypxM0o7Bg1bnIdOZg==",
+  "dgSpecHash": "dqRs5EXedMVcohjEEeuPoIMSn8r+16kKQ11/JtYvMkvHNDtwzMyMPyfauYKNoDSUyBJOht4QfGCZYh5JsL67Fw==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Environmentally.VideoService\\Ropin.Environmentally.VideoService.csproj",
   "expectedPackageFiles": [
     "D:\\.nuget\\packages\\advancedstringbuilder\\0.1.0\\advancedstringbuilder.0.1.0.nupkg.sha512",
     "D:\\.nuget\\packages\\bouncycastle.netcore\\1.8.5\\bouncycastle.netcore.1.8.5.nupkg.sha512",
+    "D:\\.nuget\\packages\\communitytoolkit.highperformance\\8.4.0\\communitytoolkit.highperformance.8.4.0.nupkg.sha512",
     "D:\\.nuget\\packages\\coravel\\4.2.1\\coravel.4.2.1.nupkg.sha512",
     "D:\\.nuget\\packages\\fboxclientdriver\\1.2.0\\fboxclientdriver.1.2.0.nupkg.sha512",
     "D:\\.nuget\\packages\\fboxclientdriver.contract\\1.2.0\\fboxclientdriver.contract.1.2.0.nupkg.sha512",
@@ -27,6 +28,7 @@
     "D:\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.0\\microsoft.aspnetcore.http.features.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.aspnetcore.nodeservices\\3.1.30\\microsoft.aspnetcore.nodeservices.3.1.30.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\9.0.8\\microsoft.bcl.asyncinterfaces.9.0.8.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.0\\microsoft.entityframeworkcore.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\5.0.0\\microsoft.entityframeworkcore.abstractions.5.0.0.nupkg.sha512",
@@ -40,27 +42,28 @@
     "D:\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\9.0.4\\microsoft.extensions.dependencyinjection.9.0.4.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\9.0.4\\microsoft.extensions.dependencyinjection.abstractions.9.0.4.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.0\\microsoft.extensions.hosting.abstractions.3.1.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.http\\5.0.0\\microsoft.extensions.http.5.0.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.logging\\9.0.4\\microsoft.extensions.logging.9.0.4.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\9.0.4\\microsoft.extensions.logging.abstractions.9.0.4.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.logging.configuration\\3.1.30\\microsoft.extensions.logging.configuration.3.1.30.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.logging.console\\3.1.30\\microsoft.extensions.logging.console.3.1.30.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.options\\9.0.4\\microsoft.extensions.options.9.0.4.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\3.1.30\\microsoft.extensions.options.configurationextensions.3.1.30.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.4\\microsoft.extensions.primitives.9.0.4.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\microsoft.netcore.targets\\1.1.3\\microsoft.netcore.targets.1.1.3.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.visualstudio.azure.containers.tools.targets\\1.17.2\\microsoft.visualstudio.azure.containers.tools.targets.1.17.2.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\microsoft.win32.systemevents\\5.0.0\\microsoft.win32.systemevents.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\minio\\6.0.5\\minio.6.0.5.nupkg.sha512",
     "D:\\.nuget\\packages\\mysql.data\\8.0.23\\mysql.data.8.0.23.nupkg.sha512",
     "D:\\.nuget\\packages\\mysqlconnector\\1.1.0\\mysqlconnector.1.1.0.nupkg.sha512",
     "D:\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
@@ -73,23 +76,23 @@
     "D:\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\5.0.0-alpha.2\\pomelo.entityframeworkcore.mysql.5.0.0-alpha.2.nupkg.sha512",
     "D:\\.nuget\\packages\\qrcoder\\1.4.3\\qrcoder.1.4.3.nupkg.sha512",
     "D:\\.nuget\\packages\\rabbitmq.client\\6.8.1\\rabbitmq.client.6.8.1.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
     "D:\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\runtime.native.system.net.security\\4.3.0\\runtime.native.system.net.security.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.1\\runtime.native.system.security.cryptography.apple.4.3.1.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.1\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.1.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
     "D:\\.nuget\\packages\\sixlabors.imagesharp\\2.1.6\\sixlabors.imagesharp.2.1.6.nupkg.sha512",
     "D:\\.nuget\\packages\\ssh.net\\2020.0.0-beta1\\ssh.net.2020.0.0-beta1.nupkg.sha512",
     "D:\\.nuget\\packages\\sshnet.security.cryptography\\1.3.0\\sshnet.security.cryptography.1.3.0.nupkg.sha512",
@@ -111,7 +114,7 @@
     "D:\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.diagnostics.diagnosticsource\\9.0.4\\system.diagnostics.diagnosticsource.9.0.4.nupkg.sha512",
     "D:\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.drawing.common\\5.0.3\\system.drawing.common.5.0.3.nupkg.sha512",
@@ -123,17 +126,18 @@
     "D:\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.io.pipelines\\5.0.0\\system.io.pipelines.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.io.hashing\\9.0.4\\system.io.hashing.9.0.4.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.io.pipelines\\9.0.1\\system.io.pipelines.9.0.1.nupkg.sha512",
     "D:\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.net.http\\4.3.2\\system.net.http.4.3.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.net.http\\4.3.4\\system.net.http.4.3.4.nupkg.sha512",
     "D:\\.nuget\\packages\\system.net.nameresolution\\4.3.0\\system.net.nameresolution.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.net.primitives\\4.3.1\\system.net.primitives.4.3.1.nupkg.sha512",
     "D:\\.nuget\\packages\\system.net.security\\4.3.0\\system.net.security.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.reactive\\4.4.1\\system.reactive.4.4.1.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.reactive\\6.0.1\\system.reactive.6.0.1.nupkg.sha512",
     "D:\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
@@ -142,8 +146,8 @@
     "D:\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.runtime\\4.3.1\\system.runtime.4.3.1.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.1.0\\system.runtime.compilerservices.unsafe.6.1.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
@@ -152,7 +156,7 @@
     "D:\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.security.accesscontrol\\4.7.0\\system.security.accesscontrol.4.7.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.security.claims\\4.3.0\\system.security.claims.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.1\\system.security.cryptography.algorithms.4.3.1.nupkg.sha512",
     "D:\\.nuget\\packages\\system.security.cryptography.cng\\4.3.0\\system.security.cryptography.cng.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
@@ -166,19 +170,22 @@
     "D:\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.text.encodings.web\\4.7.0\\system.text.encodings.web.4.7.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.text.encodings.web\\9.0.1\\system.text.encodings.web.9.0.1.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.text.json\\9.0.1\\system.text.json.9.0.1.nupkg.sha512",
     "D:\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading.channels\\7.0.0\\system.threading.channels.7.0.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
-    "D:\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.threading.tasks.extensions\\4.6.0\\system.threading.tasks.extensions.4.6.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading.threadpool\\4.3.0\\system.threading.threadpool.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
+    "D:\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

+ 190 - 41
Ropin.Environmentally.VideoService/service/RabbitMQVideoService.cs

@@ -22,6 +22,10 @@ using Renci.SshNet.Messages;
 using Microsoft.Extensions.Configuration;
 using System.Net.NetworkInformation;
 using Ropin.Inspection.Repository.SYS.Interface;
+using Minio;
+using Minio.DataModel.Args;
+using System.Net.Http;
+using System.Net;
 
 namespace Ropin.Environmentally.VideoService.service
 {
@@ -31,11 +35,28 @@ namespace Ropin.Environmentally.VideoService.service
         private static readonly ILog log = LogManager.GetLogger(typeof(RabbitMQVideoService));
         private readonly RabbitMQModel _rabbitMQModel;
         private readonly IConfiguration _configuration;
-        public RabbitMQVideoService(IServiceProvider provider, RabbitMQModel rabbitMQModel, IConfiguration configuration)
+        private readonly MinioSettingsModel _minioSettingsModel;
+        private readonly MinioClient _minioClient;
+        public RabbitMQVideoService(IServiceProvider provider, RabbitMQModel rabbitMQModel, IConfiguration configuration, MinioSettingsModel minioSettingsModel)
         {
             this._provider = provider;
             _rabbitMQModel = rabbitMQModel;
             _configuration = configuration;
+            _minioSettingsModel = minioSettingsModel;
+            try
+            {
+                // 初始化 MinIO 客户端并使用 UseSSL 配置
+                _minioClient = (MinioClient)new MinioClient()
+                   .WithEndpoint(_minioSettingsModel.Endpoint)
+                   .WithCredentials(_minioSettingsModel.AccessKey, _minioSettingsModel.SecretKey)
+                   .WithSSL(_minioSettingsModel.UseSSL) // 使用 UseSSL 配置
+                   .Build();
+
+            }
+            catch (Exception ex)
+            {
+                log.Info($"初始化 MinIO 客户端时出错: {ex.Message}");
+            }
         }
         private IConnection con;
         private IModel channel;
@@ -47,28 +68,14 @@ namespace Ropin.Environmentally.VideoService.service
                 //string dewUrl = "http://124.71.132.255:10000/sms/34020000002020000001/api/v1/downloads/record_0200000001_20241121091328_0.mp4";
                 //string urls= DownLoad_Video(dewUrl);
                 //log.Info("【DownLoad_Video】" + urls);
-                //List<TMTN_PushMsgResult> list = new List<TMTN_PushMsgResult>();
-                //list.Add(new TMTN_PushMsgResult
+                //TSYS_Message mes = new TSYS_Message
                 //{
-                //    C_ID = Guid.NewGuid().ToString(),
-                //    C_DevStoreCode = "8453d5ed-8a21-4880-88e7-f872e93551bf"
-                //});
-                //list.Add(new TMTN_PushMsgResult
-                //{
-                //    C_ID = Guid.NewGuid().ToString(),
-                //    C_DevStoreCode = "8453d5ed-8a21-4880-88e7-f872e93551bf"
-                //});
-                //list.Add(new TMTN_PushMsgResult
-                //{
-                //    C_ID = Guid.NewGuid().ToString(),
-                //    C_DevStoreCode = "acb0c8c2-38d1-4143-a938-ce2df1741c35"
-                //});
-                //await VideoExecute(list);
+                //    C_ID = "2d126655-a9ab-4380-a0ef-fcfddc8fba0b",
+                //    C_DevStoreCode = "36de09f8-589a-424b-861d-af937aa5dd0d",
+                //};
+                //await VideoExecute(mes);
                 await AddRabbitMQ();
-                //while (true)
-                //{
-                //    await Task.Delay(5000);//10000:10s
-                //}
+
             });
             return Task.CompletedTask;
         }
@@ -189,12 +196,7 @@ namespace Ropin.Environmentally.VideoService.service
                                 {
                                     if (vmc != null && !string.IsNullOrEmpty(vmc.C_Serial) && !string.IsNullOrEmpty(vmc.Codes))
                                     {
-                                        //TBDM_CodeDetail codeDetail = dbmList.Where(t => t.C_Name == vmc.C_TypeName).FirstOrDefault();
                                         int ss = vmc.F_ShootingTime;//60;
-                                                                    //if (codeDetail != null)
-                                                                    //{
-                                                                    //    ss = Convert.ToInt32(codeDetail.C_Value);
-                                                                    //}
                                         VideoStartRecording videoUrlModel = await LiveGBSHelper.StartRecording(vmc.C_Serial, vmc.Codes);
                                         Thread.Sleep(ss * 1000);
                                         if (videoUrlModel != null && !string.IsNullOrEmpty(videoUrlModel.DownloadURL))
@@ -205,20 +207,119 @@ namespace Ropin.Environmentally.VideoService.service
                                                 VideoRecordingMode videoRecording = channelVideo.RecordList.Where(v => v.DownloadURL == videoUrlModel.DownloadURL).FirstOrDefault();
                                                 if (videoRecording != null && !string.IsNullOrEmpty(videoRecording.EndTime))
                                                 {
-                                                    //string videoUrl = DownLoad_Video(videoUrlModel.DownloadURL);
-                                                    ///api/v1/cloudrecord/video/:operate/:serial/:code/:starttime/:endtime/video.mp4
-                                                    //string videoUrl = $"{LiveGBSHelper.loginUrl}api/v1/cloudrecord/video/play/{vmc.C_Serial}/{vmc.Codes}/{videoRecording.StartTime}/{videoRecording.EndTime}/video.mp4";
-                                                    string videoUrl = "/sms" + videoUrlModel.DownloadURL.Split("sms")[1];
-                                                    TSYS_MessageFile messageFile = new TSYS_MessageFile();
-                                                    messageFile.C_ID = Guid.NewGuid().ToString();
-                                                    messageFile.C_MessageCode = message.C_ID;
-                                                    messageFile.C_Url = videoUrl;
-                                                    messageFile.C_Type = "FILE_TYP_004";
-                                                    messageFile.C_CreateBy = Guid.NewGuid().ToString();
-                                                    messageFile.D_CreateOn = DateTime.Now;
-                                                    messageFile.C_Status = "1";
-                                                    messageFileRepository.Create(messageFile);
-                                                    var bolResult = await messageFileRepository.SaveAsync();
+                                                    #region 2025-8-7
+                                                    //string videoUrl = "/sms" + videoUrlModel.DownloadURL.Split("sms")[1];
+                                                    //TSYS_MessageFile messageFile = new TSYS_MessageFile();
+                                                    //messageFile.C_ID = Guid.NewGuid().ToString();
+                                                    //messageFile.C_MessageCode = message.C_ID;
+                                                    //messageFile.C_Url = videoUrl;
+                                                    //messageFile.C_Type = "FILE_TYP_004";
+                                                    //messageFile.C_CreateBy = Guid.NewGuid().ToString();
+                                                    //messageFile.D_CreateOn = DateTime.Now;
+                                                    //messageFile.C_Status = "1";
+                                                    //messageFileRepository.Create(messageFile);
+                                                    //var bolResult = await messageFileRepository.SaveAsync();
+                                                    #endregion
+                                                    try
+                                                    {
+                                                        // 下载视频文件
+                                                        string tempFilePath = DownLoad_Video(videoUrlModel.DownloadURL);
+                                                        if (!string.IsNullOrEmpty(tempFilePath))
+                                                        {
+                                                            // 生成 MinIO 中的对象名
+                                                            DateTime time = DateTime.Now;
+                                                            string objectName = $"videos/{time.Year}/{time.Month}/{time.ToString("yyyyMMddHHmmssfff")}.mp4";
+                                                            string bucketName =  _minioSettingsModel.BucketName;
+                                                            // 检查存储桶名称是否符合规范
+                                                            if (!IsValidBucketName(bucketName))
+                                                            {
+                                                                log.Error($"存储桶名称 {bucketName} 不符合 MinIO 命名规范");
+                                                                return;
+                                                            }
+                                                            // 检查存储桶是否存在,不存在则创建
+                                                            var bucketExistsArgs = new BucketExistsArgs()
+                                                               .WithBucket(bucketName);
+                                                            bool found = await _minioClient.BucketExistsAsync(bucketExistsArgs);
+                                                            if (!found)
+                                                            {
+                                                                var makeBucketArgs = new MakeBucketArgs()
+                                                                   .WithBucket(bucketName);
+                                                                await _minioClient.MakeBucketAsync(makeBucketArgs);
+                                                            }
+
+                                                            // 上传文件到 MinIO
+                                                            var putObjectArgs = new PutObjectArgs()
+                                                               .WithBucket(bucketName)
+                                                               .WithObject(objectName)
+                                                               .WithFileName(tempFilePath)
+                                                               .WithContentType("video/mp4");
+                                                            await _minioClient.PutObjectAsync(putObjectArgs);
+
+                                                            // 生成可访问的 URL
+                                                            var presignedGetObjectArgs = new PresignedGetObjectArgs()
+                                                               .WithBucket(bucketName)
+                                                               .WithObject(objectName)
+                                                               .WithExpiry(60 * 60 * 24 * 7); // 有效期 7 天
+                                                            string videoUrl = await _minioClient.PresignedGetObjectAsync(presignedGetObjectArgs);
+                                                            videoUrl = videoUrl.Replace(_minioSettingsModel.Urls, "");
+                                                            TSYS_MessageFile messageFile = new TSYS_MessageFile();
+                                                            messageFile.C_ID = Guid.NewGuid().ToString();
+                                                            messageFile.C_MessageCode = message.C_ID;
+                                                            messageFile.C_Url = videoUrl;
+                                                            messageFile.C_Type = "FILE_TYP_004";
+                                                            messageFile.C_CreateBy = Guid.NewGuid().ToString();
+                                                            messageFile.D_CreateOn = DateTime.Now;
+                                                            messageFile.C_Status = "1";
+                                                            messageFile.C_CreateBy = "6e864cbc-5252-11ec-8681-fa163e02b3e4";
+                                                            try
+                                                            {
+                                                                messageFileRepository.Create(messageFile);
+                                                                var bolResult = await messageFileRepository.SaveAsync();
+                                                            }
+                                                            catch (Exception ex)
+                                                            {
+                                                                log.Info($"【TSYS_MessageFile保存错误】{ex.Message}");
+                                                            }
+                                                            //删除临时文件
+                                                            try
+                                                            {
+                                                                // 获取视频所在文件夹路径
+                                                                string videoDirectory = Path.GetDirectoryName(tempFilePath);
+                                                                if (!string.IsNullOrEmpty(videoDirectory) && Directory.Exists(videoDirectory))
+                                                                {
+                                                                    // 获取文件夹下所有 .mp4 文件
+                                                                    string[] videoFiles = Directory.GetFiles(videoDirectory, "*.mp4");
+                                                                    foreach (string videoFile in videoFiles)
+                                                                    {
+                                                                        // 判断文件是否被其他进程占用
+                                                                        if (!IsFileLocked(videoFile))
+                                                                        {
+                                                                            try
+                                                                            {
+                                                                                File.Delete(videoFile);
+                                                                            }
+                                                                            catch (Exception delEx)
+                                                                            {
+                                                                                log.Info($"【删除其他视频文件 {videoFile} 出错】{delEx.Message}");
+                                                                            }
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                            log.Info($"【文件 {videoFile} 正在被其他进程使用,无法删除】");
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                            catch (Exception ex)
+                                                            {
+                                                                log.Info($"【删除临时文件出错】{ex.Message}");
+                                                            }
+                                                        }
+                                                    }
+                                                    catch (Exception ex)
+                                                    {
+                                                        log.Info($"【上传视频到 MinIO 出错】{ex.Message}");
+                                                    }
                                                 }
                                                 else
                                                 {
@@ -377,7 +478,7 @@ namespace Ropin.Environmentally.VideoService.service
                 path += fileNmae;
                 FileHelp.DownLoadVideo(pathUrl, path);
                 string videoUrl= serviceUrl + fileUrl + fileNmae;
-                return videoUrl;
+                return path;// videoUrl;
             }
             catch (Exception ex)
             {
@@ -385,6 +486,44 @@ namespace Ropin.Environmentally.VideoService.service
             }
 
         }
+        // 检查存储桶名称是否符合规范的方法
+        private bool IsValidBucketName(string bucketName)
+        {
+            //- 长度在 3 到 63 个字符之间。-只能包含小写字母、数字、连字符( - )。 -必须以字母或数字开头和结尾。
+            if (string.IsNullOrEmpty(bucketName) || bucketName.Length < 3 || bucketName.Length > 63)
+            {
+                return false;
+            }
+            if (!char.IsLetterOrDigit(bucketName[0]) || !char.IsLetterOrDigit(bucketName[bucketName.Length - 1]))
+            {
+                return false;
+            }
+            foreach (char c in bucketName)
+            {
+                if (!(char.IsLower(c) || char.IsDigit(c) || c == '-'))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        // 添加判断文件是否被锁定的方法
+        private bool IsFileLocked(string filePath)
+        {
+            try
+            {
+                using (FileStream stream = File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.None))
+                {
+                    stream.Close();
+                }
+            }
+            catch (IOException)
+            {
+                return true;
+            }
+
+            return false;
+        }
         public Task StopAsync(CancellationToken cancellationToken)
         {
             Dispose();
@@ -403,4 +542,14 @@ namespace Ropin.Environmentally.VideoService.service
             }
         }
     }
+
+    public class MinioSettingsModel
+    {
+        public string Urls { get; set; }
+        public string BucketName { get; set; }
+        public string Endpoint { get; set; }
+        public string AccessKey { get; set; }
+        public string SecretKey { get; set; }
+        public bool UseSSL { get; set; }
+    }
 }

BIN
Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.assets.cache


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


+ 4 - 0
Ropin.Environmentally.WebScada/obj/Ropin.Environmentally.WebScada.csproj.nuget.dgspec.json

@@ -424,6 +424,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.Environmentally.WebScada/obj/project.assets.json

@@ -3641,6 +3641,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3729,6 +3745,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -10496,6 +10513,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.Environmentally.WebScada/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "1P/IfX5vNmGhwU5XpLjSPTFr0V8lkyqqP4GUB0La1vGAWKN3ufVwQGEGpGNGq4/T3wJbXNc+90ZfjQKmiqYLgA==",
+  "dgSpecHash": "OwHNxkxkGlSrbcNSwnRhD5ZN9Q7H30O9n5CZ3FwPHAnUpBphT29zU2E5uOt+61e8ZnTKUMbabA3AxfBcHLEVqw==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.Environmentally.WebScada\\Ropin.Environmentally.WebScada.csproj",
   "expectedPackageFiles": [
@@ -213,6 +213,7 @@
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

BIN
Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.assets.cache


BIN
Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.csproj.AssemblyReference.cache


+ 4 - 0
Ropin.IOT.MqttService/obj/Ropin.IOT.MqttService.csproj.nuget.dgspec.json

@@ -286,6 +286,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.IOT.MqttService/obj/project.assets.json

@@ -3000,6 +3000,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3088,6 +3104,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -9207,6 +9224,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.IOT.MqttService/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "PKMBAMoFsHBUYohDeiLsxakHXeyFA9asWAORLYGCS4REWZMMFFtyfgulvEOskjDjYyuaIS6RGGZtyC3vCti9Eg==",
+  "dgSpecHash": "O60bxcikfZ4yu55KBSYeSZA8NV8t3meBP7B+eNuD/KFSesOu4FctVy5n4ghLMGI+nWmWkSsTxiIkpsqsk7rjww==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.IOT.MqttService\\Ropin.IOT.MqttService.csproj",
   "expectedPackageFiles": [
@@ -177,6 +177,7 @@
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

BIN
Ropin.IOT.MsgService/obj/Debug/net5.0/Ropin.IOT.MsgService.assets.cache


BIN
Ropin.IOT.MsgService/obj/Debug/net5.0/Ropin.IOT.MsgService.csproj.AssemblyReference.cache


+ 4 - 0
Ropin.IOT.MsgService/obj/Ropin.IOT.MsgService.csproj.nuget.dgspec.json

@@ -286,6 +286,10 @@
               "target": "Package",
               "version": "[3.1.0.2, )"
             },
+            "Ulid": {
+              "target": "Package",
+              "version": "[1.4.1, )"
+            },
             "log4net": {
               "target": "Package",
               "version": "[2.0.17, )"

+ 39 - 0
Ropin.IOT.MsgService/obj/project.assets.json

@@ -3424,6 +3424,22 @@
           }
         }
       },
+      "Ulid/1.4.1": {
+        "type": "package",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "related": ".xml"
+          }
+        }
+      },
       "ZXing.Net/0.16.9": {
         "type": "package",
         "compile": {
@@ -3512,6 +3528,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "compile": {
@@ -10276,6 +10293,28 @@
         "toolgood.words.nuspec"
       ]
     },
+    "Ulid/1.4.1": {
+      "sha512": "V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "type": "package",
+      "path": "ulid/1.4.1",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "lib/net6.0/Ulid.dll",
+        "lib/net6.0/Ulid.xml",
+        "lib/net7.0/Ulid.dll",
+        "lib/net7.0/Ulid.xml",
+        "lib/net8.0/Ulid.dll",
+        "lib/net8.0/Ulid.xml",
+        "lib/netstandard2.0/Ulid.dll",
+        "lib/netstandard2.0/Ulid.xml",
+        "lib/netstandard2.1/Ulid.dll",
+        "lib/netstandard2.1/Ulid.xml",
+        "ulid.1.4.1.nupkg.sha512",
+        "ulid.nuspec"
+      ]
+    },
     "ZXing.Net/0.16.9": {
       "sha512": "7WaVMHklpT3Ye2ragqRIwlFRsb6kOk63BOGADV0fan3ulVfGLUYkDi5yNUsZS/7FVNkWbtHAlDLmu4WnHGfqvQ==",
       "type": "package",

+ 2 - 1
Ropin.IOT.MsgService/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "KUAq+sA9Qr7As41NiKwyopuuNJGAA8zCyvWJO57Xd5Beny1TNSENg4Xt3JC2MKMDrj6uOb9azFpgMS1YL7AyWw==",
+  "dgSpecHash": "xwOIQUVeYV0ako5+me019tj6un3gQRLHdKw3431Qfp+cbIHleEqWcHz9bqEJJot6lCbWCB5D8wHELeLoQZVZdA==",
   "success": true,
   "projectFilePath": "E:\\Ropin\\svn\\SH_HB\\Source_SQ\\Ropin.Inspection.Api\\Ropin.IOT.MsgService\\Ropin.IOT.MsgService.csproj",
   "expectedPackageFiles": [
@@ -201,6 +201,7 @@
     "D:\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
     "D:\\.nuget\\packages\\toolgood.words\\3.1.0.2\\toolgood.words.3.1.0.2.nupkg.sha512",
+    "D:\\.nuget\\packages\\ulid\\1.4.1\\ulid.1.4.1.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net\\0.16.9\\zxing.net.0.16.9.nupkg.sha512",
     "D:\\.nuget\\packages\\zxing.net.bindings.imagesharp.v2\\0.16.15\\zxing.net.bindings.imagesharp.v2.0.16.15.nupkg.sha512"
   ],

+ 14 - 1
Ropin.Inspection.Api/Controllers/Base/AIController.cs

@@ -34,6 +34,18 @@ namespace Ropin.Inspection.Api.Controllers.Base
             IsUpdateAI = !string.IsNullOrEmpty(IsUpdate) ? IsUpdate : "false";
             _vmcCameraService = vmcCameraService;
         }
+        /// <summary>
+        /// AI会话
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("AiConversation")]
+        [AllowAnonymous]
+        public async Task<object> AiConversation(AIConversationSearch search)
+        {
+            var meg = await aIHelper.AiConversation(search);
+            return new ApiResult<object>(meg);
+        }
+
         /// <summary>
         /// AI登录
         /// </summary>
@@ -159,8 +171,9 @@ namespace Ropin.Inspection.Api.Controllers.Base
                 AlarmDataModel alarmData = JsonConvert.DeserializeObject<AlarmDataModel>(alarmDataModel.ToString());
                 log.Info("获取deviceNo="+ alarmData.deviceNo);
                 var devIds = await _vmcCameraService.GetCameraByTDH(alarmData.deviceNo);
-                var cameraModel = await _vmcCameraService.GetCameraEntity(alarmData.deviceNo);
                 log.Info($"获取到的设备ID:【{JsonConvert.SerializeObject(devIds)}】");
+                var cameraModel = await _vmcCameraService.GetCameraEntity(alarmData.deviceNo);
+                log.Info($"获取到的摄像头数据:【{JsonConvert.SerializeObject(cameraModel)}】");
                 int row = 0;
                 foreach (var x in devIds)
                 {

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


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


+ 22 - 0
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.deps.json

@@ -2519,6 +2519,20 @@
           "lib/netcoreapp2.0/UAParser.dll": {}
         }
       },
+      "Ulid/1.4.1": {
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+        },
+        "runtime": {
+          "lib/netstandard2.1/Ulid.dll": {
+            "assemblyVersion": "1.4.1.0",
+            "fileVersion": "1.4.1.0"
+          }
+        },
+        "compile": {
+          "lib/netstandard2.1/Ulid.dll": {}
+        }
+      },
       "ZXing.Net/0.16.9": {
         "runtime": {
           "lib/net5.0/zxing.dll": {
@@ -2597,6 +2611,7 @@
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.8.1",
           "ToolGood.Words": "3.1.0.2",
+          "Ulid": "1.4.1",
           "log4net": "2.0.17"
         },
         "runtime": {
@@ -5731,6 +5746,13 @@
       "path": "uaparser/3.1.47",
       "hashPath": "uaparser.3.1.47.nupkg.sha512"
     },
+    "Ulid/1.4.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-V6crLJ8a29raWeNwxYGfH9RTKA3H0nR0D9LAGzN3KtEsbiiaWkUjDor6OT5Oz7pxCK+NaY2hu2FLoYEOa8oCkA==",
+      "path": "ulid/1.4.1",
+      "hashPath": "ulid.1.4.1.nupkg.sha512"
+    },
     "ZXing.Net/0.16.9": {
       "type": "package",
       "serviceable": true,

BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.pdb


+ 6 - 0
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -99,6 +99,12 @@
             <param name="ip"></param>
             <returns></returns>
         </member>
+        <member name="M:Ropin.Inspection.Api.Controllers.Base.AIController.AiConversation(Ropin.Inspection.Common.Helper.AIConversationSearch)">
+            <summary>
+            AI会话
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Ropin.Inspection.Api.Controllers.Base.AIController.AiLogin">
             <summary>
             AI登录

BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Service.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Service.pdb


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb


BIN
Ropin.Inspection.Api/bin/Debug/net5.0/Ulid.dll


Some files were not shown because too many files changed in this diff