证书

IoTSharp/ClientApp/src/app/routes/devices/devicecertdialog/devicecertdialog.component.ts

@@ -57,8 +57,6 @@ e
       .subscribe(
         {
           next: next => {
-
-            if(next.code===10000){
             let url = window.URL.createObjectURL(next);
             let a = document.createElement('a');
             document.body.appendChild(a);
@@ -68,15 +66,11 @@ e
             a.click();
             window.URL.revokeObjectURL(url);
             a.remove();
-            }else{
-
-              this.msg.create('error', '证书下载失败:'+next.msg);
-            }
 
           },
           error: error => {
 
-            this.msg.create('error', '证书下载失败:'+error.error);
+            this.msg.create('error', '证书下载失败:' + error.error);
           }, complete: () => { }
         }
       );

IoTSharp/Controllers/DevicesController.cs

@@ -250,7 +250,15 @@ namespace IoTSharp.Controllers
 
                 SubjectAlternativeNameBuilder altNames = new SubjectAlternativeNameBuilder();
                 altNames.AddUserPrincipalName(did.Device.Id.ToString());
+                if (!string.IsNullOrEmpty(_setting.MqttBroker.DomainName))
+                {
                     altNames.AddDnsName(_setting.MqttBroker.DomainName);
+                    if (!string.IsNullOrEmpty(_setting.MqttBroker.ServerIPAddress))
+                    {
+
+                        if (_setting.MqttBroker.TlsPort > 0 && _setting.MqttBroker.TlsPort < 65535)
+                        {
+
                             altNames.AddUri(new Uri($"mqtt://{_setting.MqttBroker.ServerIPAddress}:{_setting.MqttBroker.TlsPort}"));
                             string name = $"CN={dev.Name},C=CN,L={dev.Customer.Province ?? "IoTSharp"},ST={dev.Customer.City ?? "IoTSharp"},O={dev.Customer.Name},OU={dev.Tenant.Name}";
                             var tlsclient = option.CACertificate.CreateTlsClientRSA(name, altNames);
@@ -268,11 +276,23 @@ namespace IoTSharp.Controllers
                             return new ApiResult<DeviceIdentity>(ApiCode.Success, "OK", new DeviceIdentity() { Id = did.Id, IdentityType = did.IdentityType, IdentityId = did.IdentityId });
                         }
                         else
+                        {
+                            return new ApiResult<DeviceIdentity>(ApiCode.NotFoundDeviceIdentity, "Please set valid MqttBroker TlsPort", null);
+                        }
+                    }
+                    return new ApiResult<DeviceIdentity>(ApiCode.NotFoundDeviceIdentity, "Please set MqttBroker ServerIPAddress", null);
+
+                }
+                return new ApiResult<DeviceIdentity>(ApiCode.NotFoundDeviceIdentity, "Please set MqttBroker domain name", null);
+
+            }
+            else
             {
                 return new ApiResult<DeviceIdentity>(ApiCode.NotFoundDeviceIdentity, "Not found device identity", null);
             }
         }
 
+
         /// <summary>
         /// 下载证书
         /// </summary>

IoTSharp/appsettings.MySql.json

@@ -8,7 +8,7 @@
   },
   "DataBase": "MySql",
   "ConnectionStrings": {
-    "IoTSharp": "server=localhost;user=root;password=kissmedatabase=IoTSharp",
+    "IoTSharp": "server=localhost;user=root;password=kissme;database=IoTSharp",
     "TelemetryStorage": "server=localhost;user=root;password=kissme;database=IoTSharp"
   },
   "JwtKey": "kissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissmekissme",