admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

merge confilct

Browse Source
This commit is contained in:
Vikas Nale 2025-03-31 12:46:37 +05:30
commit 5f345c69b9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marco.Pms.Services/Program.cs
View File

@ -173,7 +173,7 @@ app.UseStaticFiles(); // Enables serving static files
======= =======
//app.UseSerilogRequestLogging(); // Log HTTP requests //app.UseSerilogRequestLogging(); // Log HTTP requests
>>>>>>> Created new API for creating new tenant >>>>>>> a4156153ff6618675abf0590395745816019a973
app.UseHttpsRedirection(); app.UseHttpsRedirection();
app.UseMiddleware<ExceptionHandlingMiddleware>(); app.UseMiddleware<ExceptionHandlingMiddleware>();
app.UseMiddleware<TenantMiddleware>(); app.UseMiddleware<TenantMiddleware>();

7
Marco.Pms.Services/appsettings.json
View File

@ -11,7 +11,7 @@
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.EntityFrameworkCore.Database.Command": "Warning", "Microsoft.EntityFrameworkCore.Database.Command": "Warning",
"Microsoft.AspNetCore.Mvc.Infrastructure": "Warning", "Microsoft.AspNetCore.Mvc.Infrastructure": "Warning",
"Serilog.AspNetCore.RequestLoggingMiddleware": "Warning" //"Serilog.AspNetCore.RequestLoggingMiddleware": "Warning"
} }
}, },
"WriteTo": [ "WriteTo": [
@ -64,8 +64,13 @@
"ConnectionStrings": { "ConnectionStrings": {
// "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci", // "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci",
<<<<<<< HEAD
//"DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1",
"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
=======
"DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1", "DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1",
//"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1" //"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
>>>>>>> a4156153ff6618675abf0590395745816019a973
}, },
"AppSettings": { "AppSettings": {
"WebFrontendUrl": "http://localhost:5173", "WebFrontendUrl": "http://localhost:5173",