From 06600c9cce61a181a7f06836248317e1f76a8a28 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 22 Nov 2019 22:14:25 +0800
Subject: [PATCH] update

Former-commit-id: fe0a008eb7fb1dfb9ce7bbb68490a4f76f3c3a9f
---
 .../Extensions/StringExtensions.cs            |  7 +++
 .../IoT.Shared/Services/OpenApiService.cs     |  2 +
 .../DeviceServices/BaseDeviceService.cs       | 58 +------------------
 3 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/projects/Infrastructure/Extensions/StringExtensions.cs b/projects/Infrastructure/Extensions/StringExtensions.cs
index 9014b785..f54407af 100644
--- a/projects/Infrastructure/Extensions/StringExtensions.cs
+++ b/projects/Infrastructure/Extensions/StringExtensions.cs
@@ -99,5 +99,12 @@ namespace Infrastructure.Extensions
             cs.FlushFinalBlock();
             return Encoding.Default.GetString(ms.ToArray());
         }
+
+        public static Guid ToGuid(this string input)
+        {
+            using MD5 md5 = MD5.Create();
+            var hash = md5.ComputeHash(Encoding.UTF8.GetBytes(input));
+            return new Guid(hash);
+        }
     }
 }
\ No newline at end of file
diff --git a/projects/IoT.Shared/Services/OpenApiService.cs b/projects/IoT.Shared/Services/OpenApiService.cs
index 52e6f086..42b6dac1 100644
--- a/projects/IoT.Shared/Services/OpenApiService.cs
+++ b/projects/IoT.Shared/Services/OpenApiService.cs
@@ -27,6 +27,7 @@ namespace IoT.Shared.Services
                             var postion = path.Key.LastIndexOf('/') + 1;
                             var api = new Api
                             {
+                                Id=$"{product.Number}{path}".ToGuid(),
                                 Path = path.Key.Substring(0, postion),
                                 Command = path.Key.Substring(postion),
                                 Name = operation.Value.Summary,
@@ -39,6 +40,7 @@ namespace IoT.Shared.Services
                                 {
                                     api.Parameters.Add(new Parameter
                                     {
+                                        Id=$"{product.Number}{api.Path}{parameter.Name}".ToGuid(),
                                         Name = parameter.Name,
                                         Description = parameter.Description,
                                         Required = parameter.Required,
diff --git a/projects/IoTNode/DeviceServices/BaseDeviceService.cs b/projects/IoTNode/DeviceServices/BaseDeviceService.cs
index cd184bc6..78e245b8 100644
--- a/projects/IoTNode/DeviceServices/BaseDeviceService.cs
+++ b/projects/IoTNode/DeviceServices/BaseDeviceService.cs
@@ -9,6 +9,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -109,7 +111,7 @@ namespace IoTNode.DeviceServices
             {
                 product = new Product
                 {
-                    Id = this.GetProductId(productName, productNumber),
+                    Id = productNumber.ToGuid(),
                     Number = productNumber,
                     Name = productName,
                     Path = path,
@@ -128,59 +130,5 @@ namespace IoTNode.DeviceServices
             }
             return product;
         }
-
-        private Guid GetProductId(string productName, string productNumber)
-        {
-            return new Guid(productNumber);
-
-            if (productNumber == "onvifcamera")
-            {
-                return Guid.Parse("27f3ad85-497f-4a5c-871b-be839b58215e");
-            }
-            else if (productNumber == "fbee:gateway")
-            {
-                return Guid.Parse("29697f92-4789-4c86-8807-21aa0581dbc1");
-            }
-            else if (productNumber == "fbee:0202:01")
-            {
-                return Guid.Parse("9bd1d581-b423-4152-b24c-a3e5de125e66");
-            }
-            else if (productNumber == "fbee:0163:01")
-            {
-                return Guid.Parse("ec7a3eb7-60dc-4927-8e24-7497c3371716");
-            }
-            else if (productNumber == "fbee:0302:01")
-            {
-                return Guid.Parse("577a060d-13b8-4cc5-8b92-d5dc5d1cc786");
-            }
-            else if (productNumber == "fbee:0002:03")
-            {
-                return Guid.Parse("ddbcae6c-a94a-40c9-9f5c-46ba291228a5");
-            }
-            else if (productNumber == "fbee:0051:01")
-            {
-                return Guid.Parse("dbd737c3-e75c-416a-a62d-ac84b3595193");
-            }
-            else if (productNumber == "fbee:0402:0d")
-            {
-                return Guid.Parse("730795cb-d6f9-4a42-bb3f-04ed0316edbb");
-            }
-            else if (productNumber == "fbee:0106:01")
-            {
-                return Guid.Parse("eeccb0e1-0f94-4dd1-8256-5ff6f369e280");
-            }
-            else if (productNumber == "fbee:0402:28")
-            {
-                return Guid.Parse("3d572ccb-8738-49cf-87df-0f477b0a65cf");
-            }
-            else if (productNumber == "fbee:0210:01")
-            {
-                return Guid.Parse("eb1a2b5d-f06a-4239-ab3f-9b49da682870");
-            }
-            else
-            {
-                throw new Exception();
-            }
-        }
     }
 }
\ No newline at end of file