diff --git a/labs/jsuitest/Program.cs b/labs/jsuitest/Program.cs index cf4a057b..244ca684 100644 --- a/labs/jsuitest/Program.cs +++ b/labs/jsuitest/Program.cs @@ -12,9 +12,9 @@ namespace jsuitest public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); } } \ No newline at end of file diff --git a/labs/jsuitest/Startup.cs b/labs/jsuitest/Startup.cs index 4e5e92f5..26b45b85 100644 --- a/labs/jsuitest/Startup.cs +++ b/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 logger) { + logger.LogTrace("trace log"); + logger.LogDebug("debug log"); + logger.LogInformation("info log"); + logger.LogWarning("warn log"); if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj index 0ebd6148..95998381 100644 --- a/projects/Infrastructure/Infrastructure.csproj +++ b/projects/Infrastructure/Infrastructure.csproj @@ -5,19 +5,19 @@ true true true - 1.0.0-beta.414 + 1.0.0-beta.415 + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -28,15 +28,15 @@ - - + + - + diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj index 6bba8388..ff4a2c36 100644 --- a/projects/IoTCenter/IoTCenter.csproj +++ b/projects/IoTCenter/IoTCenter.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 true - 1.0.0-beta.414.2 + 1.0.0-beta.415 diff --git a/projects/IoTCenter/Program.cs b/projects/IoTCenter/Program.cs index 6e5c94a9..d8108e1c 100644 --- a/projects/IoTCenter/Program.cs +++ b/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.Elasticsearch; -using Serilog.Sinks.RollingFile; +using Serilog.Sinks.InfluxDB; 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("useLogServer", false)) + if (config.GetValue("useLogServer", false)) { var url = c.Configuration["elasticsearch:url"]; - Log.Logger = new LoggerConfiguration() - .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(url)) - { - TypeName = "_doc", - AutoRegisterTemplate = true, - AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, - FailureCallback = e => Debug.WriteLine("Unable to submit event " + e.MessageTemplate), - EmitEventFailure = EmitEventFailureHandling.WriteToSelfLog | - EmitEventFailureHandling.WriteToFailureSink | - EmitEventFailureHandling.RaiseCallback, - FailureSink = new RollingFileSink("logs/log.txt", new JsonFormatter(), fileSizeLimitBytes: 100 * 1024 * 1024, 1) - }) - .CreateLogger(); + var connectionInfo = new InfluxDBConnectionInfo + { + Address = config["logserver:influxdb:address"], + Port = config.GetValue("logserver:influxdb:port", 8086), + DbName = config["logserver:influxdb:dbName"], + Username = config["logserver:influxdb:username"], + Password = config["logserver:influxdb:password"] + }; + Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger(); } else { Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger(); } o.AddSerilog(); + Log.Logger.Information("start..."); }) .UseStartup() .Build() diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index de5c24fb..0ad34df5 100644 --- a/projects/IoTCenter/appsettings.json +++ b/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" + } } } \ No newline at end of file diff --git a/projects/UserCenter/Program.cs b/projects/UserCenter/Program.cs index 574b5d08..441dcb43 100644 --- a/projects/UserCenter/Program.cs +++ b/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.Elasticsearch; -using Serilog.Sinks.RollingFile; +using Serilog.Sinks.InfluxDB; 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("useLogServer", false)) + if (config.GetValue("useLogServer", false)) { var url = c.Configuration["elasticsearch:url"]; - Log.Logger = new LoggerConfiguration() - .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(url)) - { - TypeName = "_doc", - AutoRegisterTemplate = true, - AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, - FailureCallback = e => Console.WriteLine("Unable to submit event " + e.MessageTemplate), - EmitEventFailure = EmitEventFailureHandling.WriteToSelfLog | - EmitEventFailureHandling.WriteToFailureSink | - EmitEventFailureHandling.RaiseCallback, - FailureSink = new RollingFileSink("logs/log.txt", new JsonFormatter(), fileSizeLimitBytes: 100 * 1024 * 1024, 1) - }) - .CreateLogger(); + var connectionInfo = new InfluxDBConnectionInfo + { + Address = config["logserver:influxdb:address"], + Port = config.GetValue("logserver:influxdb:port", 8086), + DbName = config["logserver:influxdb:dbName"], + Username = config["logserver:influxdb:username"], + Password = config["logserver:influxdb:password"] + }; + Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger(); } else { Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger(); } o.AddSerilog(); + Log.Logger.Information("start..."); }) .UseStartup() .Build() diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj index 847b72a8..2744483e 100644 --- a/projects/UserCenter/UserCenter.csproj +++ b/projects/UserCenter/UserCenter.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 true - 1.0.0-beta.414 + 1.0.0-beta.415 diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.pdb b/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.pdb deleted file mode 100644 index 229b880c..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.pdb and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.manifest b/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.manifest deleted file mode 100644 index 061c9ca9..00000000 --- a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.dll b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.dll deleted file mode 100644 index 553fcdfe..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.dll and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.pdb b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.pdb deleted file mode 100644 index 1012aeb3..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Common.pdb and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.dll b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.dll deleted file mode 100644 index d66441dc..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.dll and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.pdb b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.pdb deleted file mode 100644 index 447177d9..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.InfluxDb.pdb and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.dll b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.dll deleted file mode 100644 index bcde3de3..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.dll and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.pdb b/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.pdb deleted file mode 100644 index 45a624dd..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxData.Net.Kapacitor.pdb and /dev/null differ diff --git a/tools/InfluxDBStudio-0.1.0/Newtonsoft.Json.dll b/tools/InfluxDBStudio-0.1.0/Newtonsoft.Json.dll deleted file mode 100644 index be6558d2..00000000 Binary files a/tools/InfluxDBStudio-0.1.0/Newtonsoft.Json.dll and /dev/null differ diff --git a/tools/InfluxDBStudio-0.2.0/.gitignore b/tools/InfluxDBStudio-0.2.0/.gitignore new file mode 100644 index 00000000..47d28309 --- /dev/null +++ b/tools/InfluxDBStudio-0.2.0/.gitignore @@ -0,0 +1,2 @@ +logs +InfluxDBStudio.log \ No newline at end of file diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe similarity index 90% rename from tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe rename to tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe index 3cc7ad85..fbb50fec 100644 Binary files a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe and b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe.config b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe.config similarity index 89% rename from tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe.config rename to tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe.config index ab771dba..9e39d94e 100644 --- a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.exe.config +++ b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.exe.config @@ -1,13 +1,13 @@  - +
- + @@ -15,6 +15,10 @@ + + + + @@ -57,4 +61,4 @@ - \ No newline at end of file + diff --git a/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.pdb b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.pdb new file mode 100644 index 00000000..da8d2b98 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.pdb differ diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe similarity index 100% rename from tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe rename to tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe diff --git a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.config b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe.config similarity index 89% rename from tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.config rename to tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe.config index ab771dba..9e39d94e 100644 --- a/tools/InfluxDBStudio-0.1.0/InfluxDBStudio.vshost.exe.config +++ b/tools/InfluxDBStudio-0.2.0/InfluxDBStudio.vshost.exe.config @@ -1,13 +1,13 @@  - +
- + @@ -15,6 +15,10 @@ + + + + @@ -57,4 +61,4 @@ - \ No newline at end of file + diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.dll b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.dll new file mode 100644 index 00000000..a28638d0 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.pdb b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.pdb new file mode 100644 index 00000000..8ed7e5b9 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Common.pdb differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.dll b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.dll new file mode 100644 index 00000000..c078ecd2 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.pdb b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.pdb new file mode 100644 index 00000000..7e382c71 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.InfluxDb.pdb differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.dll b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.dll new file mode 100644 index 00000000..94a78520 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.pdb b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.pdb new file mode 100644 index 00000000..e5b24c1f Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.Kapacitor.pdb differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.dll b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.dll new file mode 100644 index 00000000..0ca2d5fa Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/InfluxData.Net.pdb b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.pdb new file mode 100644 index 00000000..714cd7b8 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/InfluxData.Net.pdb differ diff --git a/tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.Extensions.Desktop.dll b/tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.Extensions.Desktop.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.Extensions.Desktop.dll rename to tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.Extensions.Desktop.dll diff --git a/tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.Extensions.dll b/tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.Extensions.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.Extensions.dll rename to tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.Extensions.dll diff --git a/tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.dll b/tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/Microsoft.Threading.Tasks.dll rename to tools/InfluxDBStudio-0.2.0/Microsoft.Threading.Tasks.dll diff --git a/tools/InfluxDBStudio-0.2.0/Newtonsoft.Json.dll b/tools/InfluxDBStudio-0.2.0/Newtonsoft.Json.dll new file mode 100644 index 00000000..77a5d89e Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/Newtonsoft.Json.dll differ diff --git a/tools/InfluxDBStudio-0.1.0/ScintillaNET.dll b/tools/InfluxDBStudio-0.2.0/ScintillaNET.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/ScintillaNET.dll rename to tools/InfluxDBStudio-0.2.0/ScintillaNET.dll diff --git a/tools/InfluxDBStudio-0.1.0/System.Net.Http.Extensions.dll b/tools/InfluxDBStudio-0.2.0/System.Net.Http.Extensions.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/System.Net.Http.Extensions.dll rename to tools/InfluxDBStudio-0.2.0/System.Net.Http.Extensions.dll diff --git a/tools/InfluxDBStudio-0.1.0/System.Net.Http.Primitives.dll b/tools/InfluxDBStudio-0.2.0/System.Net.Http.Primitives.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/System.Net.Http.Primitives.dll rename to tools/InfluxDBStudio-0.2.0/System.Net.Http.Primitives.dll diff --git a/tools/InfluxDBStudio-0.2.0/System.Net.Http.dll b/tools/InfluxDBStudio-0.2.0/System.Net.Http.dll new file mode 100644 index 00000000..7a370c82 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/System.Net.Http.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Algorithms.dll b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Algorithms.dll new file mode 100644 index 00000000..aee69839 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Algorithms.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Encoding.dll b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Encoding.dll new file mode 100644 index 00000000..de1ec5e5 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Encoding.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Primitives.dll b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Primitives.dll new file mode 100644 index 00000000..16b24465 Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.Primitives.dll differ diff --git a/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.X509Certificates.dll b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.X509Certificates.dll new file mode 100644 index 00000000..3ecec41c Binary files /dev/null and b/tools/InfluxDBStudio-0.2.0/System.Security.Cryptography.X509Certificates.dll differ diff --git a/tools/InfluxDBStudio-0.1.0/log4net.dll b/tools/InfluxDBStudio-0.2.0/log4net.dll similarity index 100% rename from tools/InfluxDBStudio-0.1.0/log4net.dll rename to tools/InfluxDBStudio-0.2.0/log4net.dll