From fac95c05f20144ae89e619b9644363b7758b6c85 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Wed, 14 Sep 2022 20:35:19 +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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IoTSharp/Controllers/InstallerController.cs b/IoTSharp/Controllers/InstallerController.cs index 0a7db1cb..7abdcad4 100644 --- a/IoTSharp/Controllers/InstallerController.cs +++ b/IoTSharp/Controllers/InstallerController.cs @@ -70,7 +70,7 @@ namespace IoTSharp.Controllers private InstanceDto GetInstanceDto() { - return new InstanceDto() { Installed = _context.Relationship.Any(), Domain = this.Request.Host.Value, Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), CACertificate= _setting.MqttBroker.CACertificate != null }; + return new InstanceDto() { Installed = _context.Relationship.Any(), Domain = this.Request.Host.Host, Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), CACertificate= _setting.MqttBroker.CACertificate != null }; } /// @@ -94,11 +94,11 @@ namespace IoTSharp.Controllers { try { - var ip = IPAddress.Parse(m.Domain); + var ten = _context.GetTenant(User.GetTenantId()); var option = _setting.MqttBroker; - var ca = ip.CreateCA(option.CACertificateFile, option.CAPrivateKeyFile); - ca.CreateBrokerTlsCert(_setting.MqttBroker.DomainName ?? Dns.GetHostName(), ip, + var ca = m.Domain.CreateCA(option.CACertificateFile, option.CAPrivateKeyFile); + ca.CreateBrokerTlsCert(m.Domain,Dns.GetHostAddresses(m.Domain).FirstOrDefault(), option.CertificateFile, option.PrivateKeyFile, ten.EMail); ca.LoadCAToRoot(); result = new ApiResult(ApiCode.Success, ca.Thumbprint); -- GitLab