Commit 53176dd4 authored by Krishna Reddy Tamatam's avatar Krishna Reddy Tamatam

- Port Setting dynamically

- Compressed icon Api Changes done
parent 39af2a52
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<PackageReference Include="prometheus-net" Version="5.0.2" /> <PackageReference Include="prometheus-net" Version="5.0.2" />
<PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2" /> <PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2" />
<PackageReference Include="prometheus-net.SystemMetrics" Version="2.0.0" /> <PackageReference Include="prometheus-net.SystemMetrics" Version="2.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageReference Include="SSH.NET" Version="2025.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
......
...@@ -6,6 +6,7 @@ namespace FTP_Services.Core.Models ...@@ -6,6 +6,7 @@ namespace FTP_Services.Core.Models
public string AdminConnectionString { get; set; } public string AdminConnectionString { get; set; }
public string ConnectionString_MRD { get; set; } public string ConnectionString_MRD { get; set; }
public string Secret { get; set; } public string Secret { get; set; }
public string listeningPort {get; set;}
public AppSettings() public AppSettings()
{ {
...@@ -13,6 +14,7 @@ namespace FTP_Services.Core.Models ...@@ -13,6 +14,7 @@ namespace FTP_Services.Core.Models
ConnectionString = ""; ConnectionString = "";
AdminConnectionString = ""; AdminConnectionString = "";
ConnectionString_MRD = ""; ConnectionString_MRD = "";
listeningPort="";
} }
public FTPConfiguration FTPConfiguration { get; set; } public FTPConfiguration FTPConfiguration { get; set; }
......
...@@ -366,5 +366,7 @@ namespace FTP_Services.Core.Models ...@@ -366,5 +366,7 @@ namespace FTP_Services.Core.Models
public string? RemotePassword { get; set; } public string? RemotePassword { get; set; }
public int RemotePort { get; set; } public int RemotePort { get; set; }
public string? WebRemotePath { get; set; } public string? WebRemotePath { get; set; }
public int? Type { get; set; }
public bool? IsSFTP { get; set; }
} }
} }
This diff is collapsed.
...@@ -131,17 +131,30 @@ app.UseEndpoints(endpoints => ...@@ -131,17 +131,30 @@ app.UseEndpoints(endpoints =>
// }); // });
// }); // });
var appSettings = builder.Configuration
.GetSection("AppSettings")
.Get<AppSettings>();
if (app.Environment.IsDevelopment()) if (app.Environment.IsDevelopment())
{ {
app.Run("http://localhost:5604"); app.Run("http://localhost:5604");
//app.Run(appSettings.listeningPort);
} }
else else
{ {
//app.Run(); //For Test Site
//app.Run("http://*:4708"); // For Production
app.Run("http://*:4709"); // krishna
if (OperatingSystem.IsWindows())
{
//Console.WriteLine("Running on Windows.");
app.Run();
//app.Run("http://*:4708"); // For Production
//app.Run("http://*:4709"); // For Admin
//app.Run(appSettings.listeningPort);
}
else if (OperatingSystem.IsLinux())
{
//app.Run("http://0.0.0.0:4709"); ///for linux
app.Run(appSettings.listeningPort);
}
} }
...@@ -503,11 +503,11 @@ namespace FTP_Services.Services ...@@ -503,11 +503,11 @@ namespace FTP_Services.Services
public List<object>? ConfigValues(int CompanyId) public List<object>? ConfigValues(int CompanyId)
{ {
string FFDatabaseName = GetDatabaseNameFromConnectionString(_appSettings.ConnectionString); string DatabaseName = GetDatabaseNameFromConnectionString(_appSettings.ConnectionString);
string AdminDatabaseName = GetDatabaseNameFromConnectionString(_appSettings.AdminConnectionString); string AdminDatabaseName = GetDatabaseNameFromConnectionString(_appSettings.AdminConnectionString);
string MRDDatabaseName = GetDatabaseNameFromConnectionString(_appSettings.ConnectionString_MRD); string MRDDatabaseName = GetDatabaseNameFromConnectionString(_appSettings.ConnectionString_MRD);
String StrDatabases = "FFDatabaseName : " + FFDatabaseName + " , AdminDatabaseName: " + AdminDatabaseName + ", MRDDatabaseName :" + MRDDatabaseName + ";"; String StrDatabases = "DatabaseName : " + DatabaseName + " , AdminDatabaseName: " + AdminDatabaseName + ", MRDDatabaseName :" + MRDDatabaseName + ";";
List<object>? ConfigValuesData = null; List<object>? ConfigValuesData = null;
try try
......
{ {
"AppSettings": { "AppSettings": {
"Secret": "A78E-F7FA-B0FD-DAA45BB866CD-AA73D560-DACC-978C-4A9B-9924-5DE7E33F0040-GCD00", "Secret": "A78E-F7FA-B0FD-DAA45BB866CD-AA73D560-DACC-978C-4A9B-9924-5DE7E33F0040-GCD00",
"ConnectionString": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=FF_Backup_02032026;Timeout=1000", "ConnectionString": "Server=10.11.12.107;User id=curidbuser;password=curidbuser@0987!;Database=CURI_LIVE;Port=5432;MaxPoolSize=1000;Pooling=true;",
"AdminConnectionString": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=CareaxesAdmin;Timeout=1000", "AdminConnectionString": "SERVER=10.11.12.106;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;database=CareaxesAdmin;Timeout=1000",
"ConnectionString_MRD": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=FF_Backup_MRD;Timeout=1000", "ConnectionString_MRD": "SERVER=10.11.12.158;PORT=5432;UID=himsdbuser;PWD=dbuser@hims123!;Database=FF_Backup_MRD;Timeout=1000",
"listeningPort": "http://0.0.0.0:4710",
"FTPConfiguration": { "FTPConfiguration": {
"Username": "admin", "Username": "admin",
"Password": "Fmh@xp@rt01", "Password": "Fmh@xp@rt01",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment