diff --git a/Marco.Pms.Services/Controllers/MarketController.cs b/Marco.Pms.Services/Controllers/MarketController.cs index 8928b2a..670176c 100644 --- a/Marco.Pms.Services/Controllers/MarketController.cs +++ b/Marco.Pms.Services/Controllers/MarketController.cs @@ -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 result = emails .Split(';', StringSplitOptions.RemoveEmptyEntries) .Select(item => item.Trim()) diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs index 1d69193..ff4cca8 100644 --- a/Marco.Pms.Services/Program.cs +++ b/Marco.Pms.Services/Program.cs @@ -97,7 +97,7 @@ builder.Services.AddSwaggerGen(option => }); }); -builder.Services.Configure(builder.Configuration.GetSection("EmailSettings")); +builder.Services.Configure(builder.Configuration.GetSection("SmtpSettings")); builder.Services.AddTransient(); builder.Services.Configure(builder.Configuration.GetSection("AWS")); // For uploading images to aws s3 diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json index 91af3c4..836b23c 100644 --- a/Marco.Pms.Services/appsettings.Development.json +++ b/Marco.Pms.Services/appsettings.Development.json @@ -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" diff --git a/Marco.Pms.Services/appsettings.Production.json b/Marco.Pms.Services/appsettings.Production.json index a82748e..b2a0391 100644 --- a/Marco.Pms.Services/appsettings.Production.json +++ b/Marco.Pms.Services/appsettings.Production.json @@ -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" } diff --git a/Marco.Pms.Services/appsettings.json b/Marco.Pms.Services/appsettings.json index 2ee7a17..0eed3cb 100644 --- a/Marco.Pms.Services/appsettings.json +++ b/Marco.Pms.Services/appsettings.json @@ -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