1.0.0-beta.415

Former-commit-id: 05c2599dd9ed18e7b525b2c5548233f8af4bbcd5

labs/jsuitest/Startup.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace jsuitest
 {
@@ -24,8 +25,12 @@ namespace jsuitest
             });
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger<Startup> logger)
         {
+            logger.LogTrace("trace log");
+            logger.LogDebug("debug log");
+            logger.LogInformation("info log");
+            logger.LogWarning("warn log");
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();

projects/Infrastructure/Infrastructure.csproj

@@ -5,19 +5,19 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>1.0.0-beta.414</Version>
+    <Version>1.0.0-beta.415</Version>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="CS-Script.Core" Version="1.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.3" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.3" />
@@ -28,15 +28,15 @@
     <PackageReference Include="nacos-sdk-csharp-unofficial.Extensions.Configuration" Version="0.2.5" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
     <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
     <PackageReference Include="MailKit" Version="2.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.InfluxDB.Standard" Version="1.0.5" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.3.1" />

projects/IoTCenter/IoTCenter.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0-beta.414.2</Version>
+    <Version>1.0.0-beta.415</Version>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

projects/IoTCenter/Program.cs

@@ -4,11 +4,8 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Formatting.Json;
+using Serilog.Sinks.InfluxDB;
-using Serilog.Sinks.Elasticsearch;
-using Serilog.Sinks.RollingFile;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -42,28 +39,25 @@ namespace IoTCenter
                 })
             .ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
             {
-                if (config.GetValue<bool>("useLogServer", false))
+                if (config.GetValue("useLogServer", false))
                 {
                     var url = c.Configuration["elasticsearch:url"];
-                    Log.Logger = new LoggerConfiguration()
+                    var connectionInfo = new InfluxDBConnectionInfo
-                        .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(url))
                     {
-                            TypeName = "_doc",
+                        Address = config["logserver:influxdb:address"],
-                            AutoRegisterTemplate = true,
+                        Port = config.GetValue("logserver:influxdb:port", 8086),
-                            AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7,
+                        DbName = config["logserver:influxdb:dbName"],
-                            FailureCallback = e => Debug.WriteLine("Unable to submit event " + e.MessageTemplate),
+                        Username = config["logserver:influxdb:username"],
-                            EmitEventFailure = EmitEventFailureHandling.WriteToSelfLog |
+                        Password = config["logserver:influxdb:password"]
-                                        EmitEventFailureHandling.WriteToFailureSink |
+                    };
-                                        EmitEventFailureHandling.RaiseCallback,
+                    Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger();
-                            FailureSink = new RollingFileSink("logs/log.txt", new JsonFormatter(), fileSizeLimitBytes: 100 * 1024 * 1024, 1)
-                        })
-                        .CreateLogger();
                 }
                 else
                 {
                     Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
                 }
                 o.AddSerilog();
+                Log.Logger.Information("start...");
             })
             .UseStartup<Startup>()
             .Build()

projects/IoTCenter/appsettings.json

@@ -10,7 +10,7 @@
   "tableprefix": "iot",
   "useRedisSignalR": "false",
   "useConfigServer": "false",
-  "useLogServer": "false",
+  "useLogServer": "true",
   "useServiceServer": "false",
   "nacosConfigServer": {
     "ServerAddresses": "localhost:8848",
@@ -68,5 +68,13 @@
     "database": "mysql",
     "cache": "memory",
     "upload": ""
+  },
+  "logserver": {
+    "influxdb": {
+      "address": "http://localhost",
+      "dbName": "log",
+      "username": "admin",
+      "password": "admin"
+    }
   }
 }

projects/UserCenter/Program.cs

@@ -4,9 +4,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Formatting.Json;
+using Serilog.Sinks.InfluxDB;
-using Serilog.Sinks.Elasticsearch;
-using Serilog.Sinks.RollingFile;
 using System;
 using System.IO;
 using System.Linq;
@@ -41,28 +39,25 @@ namespace UserCenter
                 })
                 .ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
                 {
-                    if (config.GetValue<bool>("useLogServer", false))
+                    if (config.GetValue("useLogServer", false))
                     {
                         var url = c.Configuration["elasticsearch:url"];
-                        Log.Logger = new LoggerConfiguration()
+                        var connectionInfo = new InfluxDBConnectionInfo
-                            .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(url))
                         {
-                                TypeName = "_doc",
+                            Address = config["logserver:influxdb:address"],
-                                AutoRegisterTemplate = true,
+                            Port = config.GetValue("logserver:influxdb:port", 8086),
-                                AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7,
+                            DbName = config["logserver:influxdb:dbName"],
-                                FailureCallback = e => Console.WriteLine("Unable to submit event " + e.MessageTemplate),
+                            Username = config["logserver:influxdb:username"],
-                                EmitEventFailure = EmitEventFailureHandling.WriteToSelfLog |
+                            Password = config["logserver:influxdb:password"]
-                                           EmitEventFailureHandling.WriteToFailureSink |
+                        };
-                                           EmitEventFailureHandling.RaiseCallback,
+                        Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger();
-                                FailureSink = new RollingFileSink("logs/log.txt", new JsonFormatter(), fileSizeLimitBytes: 100 * 1024 * 1024, 1)
-                            })
-                            .CreateLogger();
                     }
                     else
                     {
                         Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
                     }
                     o.AddSerilog();
+                    Log.Logger.Information("start...");
                 })
                 .UseStartup<Startup>()
                 .Build()

projects/UserCenter/UserCenter.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0-beta.414</Version>
+    <Version>1.0.0-beta.415</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.0.0" />

tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

tools/InfluxDBStudio-0.2.0/.gitignore

@@ -0,0 +1,2 @@
+logs
+InfluxDBStudio.log

tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe.config

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-      <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <section name="CymaticLabs.InfluxDB.Studio.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       </sectionGroup>
       <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
   </configSections>
   <startup> 
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -15,6 +15,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <userSettings>

tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe.config

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-      <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <section name="CymaticLabs.InfluxDB.Studio.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       </sectionGroup>
       <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
   </configSections>
   <startup> 
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -15,6 +15,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <userSettings>