From 806c0eaf760fc0026ea00de415d16944844988a8 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:17:03 +1000 Subject: [PATCH 1/9] cors --- Program.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Program.cs b/Program.cs index 5d44d5a..cfdbabc 100644 --- a/Program.cs +++ b/Program.cs @@ -5,6 +5,16 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); + + +builder.Services.AddCors(setup => +{ + setup.AddDefaultPolicy(policyBuilder => + { + policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200"); + }); + +}); //builder.Services.AddSwaggerGen(); var app = builder.Build(); @@ -18,6 +28,8 @@ if (app.Environment.IsDevelopment()) //app.UseHttpsRedirection(); +app.UseCors(); + app.UseAuthorization(); app.MapControllers(); From f5349db6979fea6ed6fa27285d339b5d828e6cd6 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:35:59 +1000 Subject: [PATCH 2/9] post list --- DBchat.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/DBchat.cs b/DBchat.cs index a9b5655..5f8d78b 100644 --- a/DBchat.cs +++ b/DBchat.cs @@ -14,8 +14,9 @@ namespace NeDvachAPI public static Post[] DbList() { // Build connection string using parameters from portal - Post[] posts = new Post[10]; - int postCount = 0; + //Post[] posts = new Post[10]; + List posts = new List(); + //int postCount = 0; string received = ""; string connString = String.Format( @@ -33,13 +34,13 @@ namespace NeDvachAPI conn.Open(); - using (var command = new NpgsqlCommand(@" + using ( var command = new NpgsqlCommand(@" SELECT * FROM (SELECT post_id, substring(post,1,200) FROM dvach - ORDER BY post_id - DESC limit 10) - subquery ORDER BY post_id ASC", conn)) + ORDER BY post_id DESC + ) + subquery ORDER BY post_id ASC", conn) ) { var reader = command.ExecuteReader(); @@ -58,8 +59,9 @@ namespace NeDvachAPI Id = reader.GetInt32(0), Text = reader.GetString(1) }; - posts[postCount] = receivedPost; - postCount++; + posts.Add(receivedPost); + //posts[postCount] = receivedPost; + //postCount++; } reader.Close(); } From e445c2bda1f2fe6f23c82696771de0b66e04c181 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:38:52 +1000 Subject: [PATCH 3/9] post list --- DBchat.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/DBchat.cs b/DBchat.cs index 5f8d78b..7465cd4 100644 --- a/DBchat.cs +++ b/DBchat.cs @@ -34,13 +34,22 @@ namespace NeDvachAPI conn.Open(); + // using ( var command = new NpgsqlCommand(@" + // SELECT * FROM + // (SELECT post_id, substring(post,1,200) + // FROM dvach + // ORDER BY post_id DESC + // limit 10 + // ) + subquery ORDER BY post_id ASC", conn) ) using ( var command = new NpgsqlCommand(@" SELECT * FROM - (SELECT post_id, substring(post,1,200) - FROM dvach - ORDER BY post_id DESC - ) - subquery ORDER BY post_id ASC", conn) ) + ( + SELECT post_id, post + FROM dvach + ORDER BY post_id DESC + ) subquery + ORDER BY post_id ASC", conn) ) { var reader = command.ExecuteReader(); From 1b60bf776f7d1ffe8cce0bcb7f3a1ea6534198b1 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:39:58 +1000 Subject: [PATCH 4/9] post list --- DBchat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBchat.cs b/DBchat.cs index 7465cd4..62fb9aa 100644 --- a/DBchat.cs +++ b/DBchat.cs @@ -41,7 +41,7 @@ namespace NeDvachAPI // ORDER BY post_id DESC // limit 10 // ) - subquery ORDER BY post_id ASC", conn) ) + // subquery ORDER BY post_id ASC", conn) ) using ( var command = new NpgsqlCommand(@" SELECT * FROM ( From 3d5c349288d7e54e45b6690ad5221250775120ab Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:41:05 +1000 Subject: [PATCH 5/9] post list --- Controllers/GetPosts.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controllers/GetPosts.cs b/Controllers/GetPosts.cs index bd5900c..5bc2400 100644 --- a/Controllers/GetPosts.cs +++ b/Controllers/GetPosts.cs @@ -10,7 +10,8 @@ namespace NeDvachAPI.Controllers [HttpGet(Name = "GetPosts")] public string Get() { - Post[] posts = DBchat.DbList(); + //Post[] posts = DBchat.DbList(); + List posts = DBchat.DbList(); string postsJson = JsonSerializer.Serialize(posts); return postsJson ; From 99c0e0c410bb4b8461c7ec13b201e605d7ef1036 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:42:03 +1000 Subject: [PATCH 6/9] post list --- DBchat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBchat.cs b/DBchat.cs index 62fb9aa..1c7d677 100644 --- a/DBchat.cs +++ b/DBchat.cs @@ -11,7 +11,7 @@ namespace NeDvachAPI private static string Password = "postgres"; private static string Port = "5432"; - public static Post[] DbList() + public static List DbList() { // Build connection string using parameters from portal //Post[] posts = new Post[10]; From 8d3839b53d2dedded0e23f1c5f12639c208c0ff2 Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:55:34 +1000 Subject: [PATCH 7/9] cors --- Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Program.cs b/Program.cs index cfdbabc..56801b3 100644 --- a/Program.cs +++ b/Program.cs @@ -11,7 +11,7 @@ builder.Services.AddCors(setup => { setup.AddDefaultPolicy(policyBuilder => { - policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200"); + policyBuilder.WithOrigins("http://*.vdk2ch.ru:4200"); }); }); From 572c1c699fc46e5b32770154c4987ea1643486bf Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:57:11 +1000 Subject: [PATCH 8/9] cors --- Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Program.cs b/Program.cs index 56801b3..6904864 100644 --- a/Program.cs +++ b/Program.cs @@ -11,7 +11,7 @@ builder.Services.AddCors(setup => { setup.AddDefaultPolicy(policyBuilder => { - policyBuilder.WithOrigins("http://*.vdk2ch.ru:4200"); + policyBuilder.WithOrigins("*.vdk2ch.ru:4200"); }); }); From 0efca3b0b5781ab54d78c97a62b20b0f47d7dabf Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:58:39 +1000 Subject: [PATCH 9/9] cors --- Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Program.cs b/Program.cs index 6904864..cfdbabc 100644 --- a/Program.cs +++ b/Program.cs @@ -11,7 +11,7 @@ builder.Services.AddCors(setup => { setup.AddDefaultPolicy(policyBuilder => { - policyBuilder.WithOrigins("*.vdk2ch.ru:4200"); + policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200"); }); });