add migration

SpringLeee · SpringLeee · commit e55d14317d5f · 2021-07-11T21:02:42.000+08:00
diff --git a/HttpReports.sln b/HttpReports.sln
@@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpReports.Transport.Grpc"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpReports.Collector.Grpc", "src\HttpReports.Collector.Grpc\HttpReports.Collector.Grpc.csproj", "{F8BC75E3-675C-442A-A653-8331B7357A20}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpReports.Collector.Demo", "example\HttpReports.Collector.Demo\HttpReports.Collector.Demo.csproj", "{7E1A2668-F5FA-44A4-851E-29CB18D3F279}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpReports.Collector.Demo", "example\HttpReports.Collector.Demo\HttpReports.Collector.Demo.csproj", "{7E1A2668-F5FA-44A4-851E-29CB18D3F279}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/example/HttpReports.Demo/Controllers/WeatherForecastController.cs b/example/HttpReports.Demo/Controllers/WeatherForecastController.cs
@@ -20,11 +20,11 @@ public class WeatherForecastController : ControllerBase
 
         public WeatherForecastController(ILogger<WeatherForecastController> logger)
         {
-            _logger = logger;
+            _logger = logger; 
         }
 
-        [HttpGet]
-        public IEnumerable<WeatherForecast> Get()
+        [HttpPost]
+        public IEnumerable<WeatherForecast> Get(WeatherForecast weather)
         {
             var rng = new Random();
             return Enumerable.Range(1, 5).Select(index => new WeatherForecast
diff --git a/example/HttpReports.Demo/Program.cs b/example/HttpReports.Demo/Program.cs
@@ -20,7 +20,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder.UseStartup<Startup>();
+                    webBuilder.UseStartup<Startup>().UseUrls("http://localhost:5010");
                 });
     }
 }
diff --git a/example/HttpReports.Demo/Startup.cs b/example/HttpReports.Demo/Startup.cs
@@ -20,9 +20,9 @@ public Startup(IConfiguration configuration)
       
         public void ConfigureServices(IServiceCollection services)
         {
-            //services.AddHttpReports().AddHttpTransport();   
+            services.AddHttpReports().AddHttpTransport();   
 
-            services.AddHttpReportsDashboard().AddMySqlStorage(); 
+            services.AddHttpReportsDashboard().AddPostgreSQLStorage(); 
 
             services.AddControllers();
             services.AddSwaggerGen(c =>
@@ -35,7 +35,7 @@ public void ConfigureServices(IServiceCollection services)
        
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {    
-            //app.UseHttpReports(); 
+            app.UseHttpReports();
             //app.UseMiddleware<ErrorMiddleware>();
 
             app.UseHttpReportsDashboard(); 
diff --git a/example/HttpReports.Demo/appsettings.json b/example/HttpReports.Demo/appsettings.json
@@ -1,9 +1,9 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Default": "Error",
+      "Microsoft": "Error",
+      "Microsoft.Hosting.Lifetime": "Error"
     }
   },
   "HttpReports": {
@@ -16,7 +16,7 @@
     "Service": "User",
     "Switch": true,
     "MaxBytes": 20000,
-    "RequestFilter": [ "/api/Health/*" ],
+    "RequestFilter": [ "/api/Health/*","/HttpReports*"],
     "WithRequest": true,
     "WithResponse": true,
     "WithCookie": true,
@@ -26,9 +26,9 @@
     "QueryCount":6,
     "ExpireDay": 3,
     "Storage": {
-      "ConnectionString": "DataBase=HttpReports;Data Source=localhost;User Id=root;Password=123456;",
+      //"ConnectionString": "DataBase=HttpReports;Data Source=localhost;User Id=root;Password=123456;",
       //"ConnectionString": "Max Pool Size = 512;server=.;uid=sa;pwd=123456;database=HttpReports;Connection Timeout=900;", 
-      //"ConnectionString": "Host=localhost;Port=5432;Username=postgres;Password=123456;Database=HttpReports;",
+      "ConnectionString": "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=HttpReports;",
       "DeferSecond": 10,
       "DeferThreshold": 1
     },
diff --git a/src/HttpReports.Core/BasicConfig.cs b/src/HttpReports.Core/BasicConfig.cs
@@ -71,7 +71,7 @@ public static class BasicConfig
 
         public const string Language = "Language";
 
-        public const string DefaultLanguage = "en-us";
+        public const string DefaultLanguage = "zh-cn";
 
         public const string StaticFilesRoot = "HttpReports.Dashboard";
 
diff --git a/src/HttpReports.Dashboard.UI/src/main.js b/src/HttpReports.Dashboard.UI/src/main.js
@@ -33,7 +33,7 @@ Vue.use(VueResource)
 Vue.use(VueParticles)  
  
 const i18n = new VueI18n({
-  locale: basic.isEmpty(localStorage.getItem("locale")) ? 'en-us': localStorage.getItem("locale"),  
+  locale: basic.isEmpty(localStorage.getItem("locale")) ? 'zh-cn': localStorage.getItem("locale"),  
   messages: {
     'en-us': Object.assign(require("../static/lang/en-us.json"), enLocale),
     'zh-cn': Object.assign(require("../static/lang/zh-cn.json"), zhLocale), 
diff --git a/src/HttpReports.Dashboard.UI/src/view/Index.vue b/src/HttpReports.Dashboard.UI/src/view/Index.vue
@@ -630,6 +630,7 @@ export default {
         .catch((_) => {});
     },
     changeLanguage(type) {
+
       this.$i18n.locale = type;
 
       localStorage.setItem("locale", type);
@@ -642,8 +643,7 @@ export default {
           //this.$message({ message: "Switch: " + type, type: "success" });
 
           this.$http.get(`/static/lang/${type}.json`).then((res) => {
-            this.$store.commit("set_lang", res.body); 
-
+            this.$store.commit("set_lang", res.body);  
             window.location.reload();
           });
         });
diff --git a/src/HttpReports.Dashboard/DashboardOptions.cs b/src/HttpReports.Dashboard/DashboardOptions.cs
@@ -14,7 +14,7 @@ public class DashboardOptions : IOptions<DashboardOptions>
 
         public int QueryCount { get; set; } = 6;
 
-        public bool Migrate { get; set; } = true;
+        public bool Migration { get; set; } = true;
 
         public HealthCheckOptions Check { get; set; } = new HealthCheckOptions();
 
diff --git a/src/HttpReports.Dashboard/DependencyInjectionExtensions.cs b/src/HttpReports.Dashboard/DependencyInjectionExtensions.cs
@@ -117,21 +117,34 @@ public static IApplicationBuilder UseHttpReportsDashboard(this IApplicationBuild
 
             var storage = app.ApplicationServices.GetRequiredService<IHttpReportsStorage>() ?? throw new ArgumentNullException("Storage Not Found");
 
-            storage.InitAsync().Wait();
+            if (options.Value.Migration) storage.InitAsync().Wait();
 
             app.ApplicationServices.GetService<IScheduleService>().InitAsync().Wait(); 
 
             var localizeService = app.ApplicationServices.GetRequiredService<ILocalizeService>() ?? throw new ArgumentNullException("localizeService Not Found");
 
-            if (options.Value.Migrate) localizeService.InitAsync().Wait(); 
+            localizeService.InitAsync().Wait(); 
 
             app.UseHttpCollector();
 
             app.UseMiddleware<DashboardMiddleware>();   
 
             return app;
+        }
+
+
+        public static IApplicationBuilder UseHttpReportsMigration(this IApplicationBuilder app)
+        {
+            ServiceContainer.provider = app.ApplicationServices.GetRequiredService<IServiceProvider>() ?? throw new ArgumentNullException("ServiceProvider Init Failed");
+
+            var storage = app.ApplicationServices.GetRequiredService<IHttpReportsStorage>() ?? throw new ArgumentNullException("Storage Not Found");
+
+            storage.PrintSQLAsync().Wait();
+
+            return app;
+        
         } 
- 
+
 
         private static IServiceCollection AddHandleService(this IServiceCollection services)
         {
diff --git a/src/Storage/HttpReports.Storage.Abstractions/BaseStorage.cs b/src/Storage/HttpReports.Storage.Abstractions/BaseStorage.cs
@@ -85,6 +85,66 @@ await freeSql.Insert(new SysConfig
             }
         }
 
+        public async Task PrintSQLAsync()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.AppendLine().AppendLine("--  HttpReports Migration Start!  ").AppendLine();
+
+            DbInitializer.Initialize(freeSql, _options.DataType);
+
+            List<Type> dbType = new List<Type> { 
+                typeof(RequestInfo), 
+                typeof(RequestDetail),
+                typeof(Performance),
+                typeof(MonitorJob),
+                typeof(MonitorAlarm),
+                typeof(SysUser),
+                typeof(SysConfig),
+            };
+
+            dbType.ForEach(x => {
+
+                var sql = freeSql.CodeFirst.GetComparisonDDLStatements(x);
+
+                if (sql != null) sb.AppendLine(sql); 
+
+            });
+
+            if (!await freeSql.Select<SysUser>().AnyAsync())
+            {
+               var sql = freeSql.Insert(new SysUser
+                {
+                    Id = _idWorker.NextId(),
+                    UserName = BasicConfig.DefaultUserName,
+                    Password = BasicConfig.DefaultPassword
+
+                }).ToSql();
+
+                if (!sql.IsEmpty()) sb.AppendLine(sql);
+            }
+
+            if (!await freeSql.Select<SysConfig>().Where(x => x.Key == BasicConfig.Language).AnyAsync())
+            {
+                var sql = freeSql.Insert(new SysConfig
+                {
+
+                    Id = _idWorker.NextId(),
+                    Key = BasicConfig.Language,
+                    Value = BasicConfig.DefaultLanguage
+
+                }).ToSql();
+
+                if (!sql.IsEmpty()) sb.AppendLine(sql); 
+            } 
+
+            sb.AppendLine().AppendLine("--  HttpReports Migration End  ").AppendLine();
+
+            System.Console.WriteLine(sb.ToString());  
+
+        }
+
+
 
         public async Task SetLanguage(string Language)
             => await freeSql.Update<SysConfig>().Set(x => x.Value == Language).Where(x => x.Key == BasicConfig.Language).ExecuteAffrowsAsync();
diff --git a/src/Storage/HttpReports.Storage.Abstractions/IHttpReportsStorage.cs b/src/Storage/HttpReports.Storage.Abstractions/IHttpReportsStorage.cs
@@ -14,6 +14,8 @@ public interface IHttpReportsStorage
     {
         Task InitAsync();
 
+        Task PrintSQLAsync();
+
         Task AddRequestInfoAsync(RequestBag bag);
 
 
diff --git a/test/HttpReports.Mock.Console/Program.cs b/test/HttpReports.Mock.Console/Program.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -15,7 +16,11 @@ namespace HttpReports.Mock.Console
     class Program
     {
         static async Task Main(string[] args)
-        {  
+        {
+            await APITest(); 
+            System.Console.ReadKey();
+
+
             var a = 199;
             var b = 10000;
             var c = 60000; 
@@ -68,7 +73,41 @@ static async Task Main(string[] args)
 
             System.Console.ReadKey();
           
-        } 
+        }
+
+        static async Task APITest()
+        {
+            for (int i = 0; i < 50; i++)
+            {
+                _ = Task.Run(async () => {
+
+                    HttpClient client = new HttpClient();
+
+                    while (true)
+                    {
+                        await Task.Delay(new Random().Next(10,100));
+
+                        HttpContent content = new StringContent(System.Text.Json.JsonSerializer.Serialize(new { TemperatureC = 99, Summary = "Summary" }), System.Text.Encoding.UTF8, "application/json");
+
+                        content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+                        content.Headers.Add(BasicConfig.TransportType, typeof(Performance).Name);
+
+                        try
+                        {
+                            await client.PostAsync("http://localhost:5010/WeatherForecast", content);
+                        }
+                        catch (Exception ex)
+                        {
+
+                             
+                        }  
+                    } 
+                
+                }); 
+
+            }   
+
+        }
        
 
 

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ public class WeatherForecastController : ControllerBase`
`20`	`20`
`21`	`21`	`public WeatherForecastController(ILogger<WeatherForecastController> logger)`
`22`	`22`	`{`
`23`		`- _logger = logger;`
	`23`	`+ _logger = logger;`
`24`	`24`	`}`
`25`	`25`
`26`		`- [HttpGet]`
`27`		`- public IEnumerable<WeatherForecast> Get()`
	`26`	`+ [HttpPost]`
	`27`	`+ public IEnumerable<WeatherForecast> Get(WeatherForecast weather)`
`28`	`28`	`{`
`29`	`29`	`var rng = new Random();`
`30`	`30`	`return Enumerable.Range(1, 5).Select(index => new WeatherForecast`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>`
`20`	`20`	`Host.CreateDefaultBuilder(args)`
`21`	`21`	`.ConfigureWebHostDefaults(webBuilder =>`
`22`	`22`	`{`
`23`		`- webBuilder.UseStartup<Startup>();`
	`23`	`+ webBuilder.UseStartup<Startup>().UseUrls("http://localhost:5010");`
`24`	`24`	`});`
`25`	`25`	`}`
`26`	`26`	`}`