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

Merge pull request 'Moved variable configuration to development and production appsettings' (#62) from Ashutosh_AppSettings_Changes into Issue_May_3W

Browse Source 
Reviewed-on: #62
This commit is contained in:
Vikas Nale 2025-05-19 09:47:43 +00:00
commit 4e3d981beb
5 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marco.Pms.Services/Controllers/MarketController.cs
View File

@ -48,7 +48,7 @@ namespace Marco.Pms.Services.Controllers
if (industry != null && industry.Name != null)
{
InquiryEmailObject inquiryEmailObject = inquiryDto.ToInquiryEmailObjectFromInquiriesDto(industry.Name);
string emails = _configuration["Contact:Emails"] ?? "";
string emails = _configuration["MaliingList:RequestDemoRecivers"] ?? "";
List<string> result = emails
.Split(';', StringSplitOptions.RemoveEmptyEntries)
.Select(item => item.Trim())

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

@ -97,7 +97,7 @@ builder.Services.AddSwaggerGen(option =>
});
});
builder.Services.Configure<SmtpSettings>(builder.Configuration.GetSection("EmailSettings"));
builder.Services.Configure<SmtpSettings>(builder.Configuration.GetSection("SmtpSettings"));
builder.Services.AddTransient<IEmailSender, EmailSender>();
builder.Services.Configure<AWSSettings>(builder.Configuration.GetSection("AWS")); // For uploading images to aws s3

36
Marco.Pms.Services/appsettings.Development.json
View File

@ -1,18 +1,40 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"Cors": {
"AllowedOrigins": "*",
"AllowedMethods": "*",
"AllowedHeaders": "*"
},
"ConnectionStrings": {
//"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS10"
"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSDev"
},
"SmtpSettings": {
"SmtpServer": "smtp.gmail.com",
"Port": 587,
"SenderName": "MarcoIoIT",
"SenderEmail": "marcoioitsoft@gmail.com",
"Password": "qrtq wfuj hwpp fhqr"
},
"AppSettings": {
"WebFrontendUrl": "http://localhost:5173",
"ImagesBaseUrl": "http://localhost:5173"
},
"Jwt": {
"Issuer": "http://localhost:5246",
"Audience": "http://localhost:5246",
"Key": "sworffishhkjfa9dnfdndfu33infnajfj",
"ExpiresInMinutes": 60,
"RefreshTokenExpiresInDays": 7
},
"MaliingList": {
"RequestDemoRecivers": "ashutosh.nehete@marcoaiot.com;vikas@marcoaiot.com;umesh@marcoait.com"
},
"AWS": {
"AccessKey": "AKIARZDBH3VDMSUUY2FX",
"SecretKey": "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",
"Region": "us-east-1",
"BucketName": "testenv-marco-pms-documents"
},
"MongoDB": {
"SerilogDatabaseUrl": "mongodb://localhost:27017/DotNetLogs"

16
Marco.Pms.Services/appsettings.Production.json
View File

@ -7,6 +7,13 @@
"ConnectionStrings": {
"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
},
"SmtpSettings": {
"SmtpServer": "smtp.gmail.com",
"Port": 587,
"SenderName": "MarcoIoIT",
"SenderEmail": "marcoioitsoft@gmail.com",
"Password": "qrtq wfuj hwpp fhqr"
},
"AppSettings": {
"WebFrontendUrl": "https://app.marcoaiot.com",
"ImagesBaseUrl": "https://app.marcoaiot.com"
@ -18,6 +25,15 @@
"ExpiresInMinutes": 60,
"RefreshTokenExpiresInDays": 7
},
"MaliingList": {
"RequestDemoRecivers": "ashutosh.nehete@marcoaiot.com;vikas@marcoaiot.com;umesh@marcoait.com"
},
"AWS": {
"AccessKey": "AKIARZDBH3VDMSUUY2FX",
"SecretKey": "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",
"Region": "us-east-1",
"BucketName": "testenv-marco-pms-documents"
},
"MongoDB": {
"SerilogDatabaseUrl": "mongodb://localhost:27017/DotNetLogs"
}

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

@ -47,46 +47,7 @@
"WithThreadId"
]
},
"AppSettings": {
"WebFrontendUrl": "http://localhost:5173",
"ImagesBaseUrl": "http://localhost:5173"
},
"AllowedHosts": "*",
"Jwt": {
"Issuer": "http://localhost:5246",
"Audience": "http://localhost:5246",
"Key": "sworffishhkjfa9dnfdndfu33infnajfj",
"ExpiresInMinutes": 60,
"RefreshTokenExpiresInDays": 7
},
"SmtpSettings": {
"Server": "mail.marcobms.com",
"Port": 465, //587,
"SenderName": "Marco",
"SenderEmail": "vikas@marcobms.com",
"Username": "vikas@marcobms.com",
"Password": "MarcoVikas@123",
"EnableSsl": true
},
"EmailSettings": {
"SmtpServer": "smtp.gmail.com",
"Port": 587,
"SenderName": "MarcoIoIT",
"SenderEmail": "marcoioitsoft@gmail.com",
"Password": "qrtq wfuj hwpp fhqr"
},
"Contact": {
"Emails": "ashutosh.nehete@marcoaiot.com;vikas@marcoaiot.com;umesh@marcoait.com"
},
"MongoDB": {
"SerilogDatabaseUrl": "mongodb://localhost:27017/DotNetLogs"
},
"AWS": {
"AccessKey": "AKIARZDBH3VDMSUUY2FX",
"SecretKey": "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",
"Region": "us-east-1",
"BucketName": "testenv-marco-pms-documents"
},
"WhiteList": {
"ContentType": [
"application/pdf", // pdf