From 964efd556d1e731de069ed1154d5c870f13a16f7 Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Sun, 9 Oct 2022 19:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IoTSharp/Controllers/InstallerController.cs | 10 +++++++++-
 IoTSharp/appsettings.PostgreSql.json        |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/IoTSharp/Controllers/InstallerController.cs b/IoTSharp/Controllers/InstallerController.cs
index 5a27a5a4..e336c199 100644
--- a/IoTSharp/Controllers/InstallerController.cs
+++ b/IoTSharp/Controllers/InstallerController.cs
@@ -70,7 +70,15 @@ namespace IoTSharp.Controllers
 
         private InstanceDto GetInstanceDto()
         {
-            return new InstanceDto() { Installed = _context.Relationship.Any(), Domain =_setting.MqttBroker.DomainName?? this.Request.Host.ToString(), Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), CACertificate= _setting.MqttBroker.CACertificate != null , CAThumbprint = _setting.MqttBroker.CACertificate?.Thumbprint, BrokerThumbprint = _setting.MqttBroker.BrokerCertificate.Thumbprint};
+            return new InstanceDto()
+            {
+                Installed = _context.Relationship.Any(),
+                Domain = _setting.MqttBroker.DomainName ?? this.Request.Host.ToString(),
+                Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(),
+                CACertificate = _setting.MqttBroker.CACertificate != null,
+                CAThumbprint = _setting.MqttBroker.CACertificate?.Thumbprint,
+                BrokerThumbprint = _setting.MqttBroker.BrokerCertificate?.Thumbprint
+            };
         }
 
         /// <summary>
diff --git a/IoTSharp/appsettings.PostgreSql.json b/IoTSharp/appsettings.PostgreSql.json
index a1313bea..7acc0d98 100644
--- a/IoTSharp/appsettings.PostgreSql.json
+++ b/IoTSharp/appsettings.PostgreSql.json
@@ -8,8 +8,8 @@
   },
   "DataBase": "PostgreSql",
   "ConnectionStrings": {
-    "IoTSharp": "Server=localhost;Database=IoTSharp20221;Username=postgres;Password=future;",
-    "TelemetryStorage": "Server=localhost;Database=IoTSharp20221;Username=postgres;Password=future;"
+    "IoTSharp": "Server=localhost;Database=IoTSharp20222;Username=postgres;Password=future;",
+    "TelemetryStorage": "Server=localhost;Database=IoTSharp20222;Username=postgres;Password=future;"
   },
   "JwtKey": "iotsharpiotsharpiotsharpiotsharpiotsharp",
   "JwtExpireHours": 3,
-- 
GitLab