1.0.0-rc.106

Former-commit-id: bf7728561725b5b2e1405d471ae6ecd9c232e4ae

projects/Infrastructure/Data/EfDbContext.cs

@@ -16,7 +16,7 @@ namespace Infrastructure.Data
     {
         public static readonly ILoggerFactory DebugLogFactory = LoggerFactory.Create(builder =>
         {
-            //builder.AddConsole();
+            builder.AddConsole();
         });
 
         public static readonly ILoggerFactory ProductLogFactory = LoggerFactory.Create(builder =>
@@ -34,7 +34,7 @@ namespace Infrastructure.Data
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            if (this._env.IsDevelopment())
+            if (this._cfg.GetValue<bool>("debug", false))
             {
                 optionsBuilder?.UseLoggerFactory(DebugLogFactory);
             }

projects/IoTCenter/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.105",
+  "version": "1.0.0-rc.106",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",

projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js

@@ -1,5 +1,5 @@
 //
-var version = '1.0.0-rc.105';
+var version = '1.0.0-rc.106';
 var isDebug = isDebug || false;
 var useSignalR = useSignalR || false;
 var isApp = location.href.indexOf('http') !== 0;

projects/IoTClient/iotclient.apk.REMOVED.git-id

@@ -1 +1 @@
-db18615540b78f52eae016df7a574ae5a1b6f934
+f0320fb226b6c4399d3bf2b7631fe835b0fb98bd

projects/IoTNode/DeviceServices/Onvif/OnvifService.cs

@@ -396,7 +396,7 @@ namespace IoTNode.DeviceServices.Onvif
             {
                 if (!string.IsNullOrEmpty(e.Data))
                 {
-                    if (this._env.IsDevelopment())
+                    if (this._cfg.GetValue<bool>("debug", false))
                     {
                         Console.WriteLine(e.Data);
                     }

projects/IoTNode/Program.cs

@@ -46,6 +46,7 @@ namespace IoTNode
                    new EFConfigurationValue { Id = "fbee.writelist", Value=""},
                    new EFConfigurationValue { Id = "camera.writelist", Value=""},
                    //
+                   new EFConfigurationValue { Id = "debug", Value= "false"},
                    new EFConfigurationValue { Id = "name", Value= "物联网节点"},
                    new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl},
                    new EFConfigurationValue { Id = "copyright", Value= "Copyright © {now} Company. All rights reserved",Type= InputType.Html}

projects/IoTNode/Startup.cs

@@ -31,11 +31,11 @@ namespace IoTNode
             services.AddTransient<IEmailSender, EmptyEmailSender>();
             services.AddTransient<IoTNodeJob>();
             services.AddSingleton<IoTNodeClient>();
-            //services.AddSingleton<OnvifService>();
+            services.AddSingleton<OnvifService>();
             services.AddSingleton<FBeeService>();
             //services.AddSingleton<SerialPortService>();
             services.AddHostedService(o => o.GetService<IoTNodeClient>());
-            //services.AddHostedService(o => o.GetService<OnvifService>());
+            services.AddHostedService(o => o.GetService<OnvifService>());
             services.AddHostedService(o => o.GetService<FBeeService>());
             //services.AddHostedService(o => o.GetService<SerialPortService>());
             base.ConfigureServices(services);

projects/IoTNode/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.105",
+  "version": "1.0.0-rc.106",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",