on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev

Browse Source
This commit is contained in:
Харченко Владимир 2021-12-22 16:06:40 +05:00
commit 525ccc67f8
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudWebApi/Controllers/AdminCompanyController.cs
View File

@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers
public AdminCompanyController(ICrudService<CompanyDto> service) public AdminCompanyController(ICrudService<CompanyDto> service)
: base(service) : base(service)
{ {
service.Includes.Add("CompanyType");
} }
} }
} }

9
AsbCloudWebApi/Startup.cs
View File

@ -49,7 +49,14 @@ namespace AsbCloudWebApi
"http://localhost:3000", "http://localhost:3000",
"http://0.0.0.0:5000", "http://0.0.0.0:5000",
"http://*:5000", "http://*:5000",
"http://localhost:5000" "http://localhost:5000",
"https://0.0.0.0:3000",
"https://*:3000",
"https://localhost:3000",
"https://0.0.0.0:5001",
"https://*:5001",
"https://localhost:5001"
) )
.AllowCredentials(); .AllowCredentials();
}); });

3
AsbCloudWebApi/appsettings.json
View File

@ -12,6 +12,5 @@
"ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", "ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
"LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
}, },
"AllowedHosts": "*", "AllowedHosts": "*"
"Urls": "http://0.0.0.0:5000"
} }