diff --git a/AsbCloudDb/Readme.md b/AsbCloudDb/Readme.md index e04daa96..dca7192a 100644 --- a/AsbCloudDb/Readme.md +++ b/AsbCloudDb/Readme.md @@ -55,6 +55,7 @@ SELECT timescaledb_pre_restore(); Terminal: ``` sudo -u postgres psql -p 5499 -U postgres postgres -W < dump_2021-11-26.bak +or sudo pg_restore -Fc -d postgres dump_2021-11-26.bak ``` OR psql: diff --git a/AsbCloudWebApi/AsbCloudWebApi.csproj b/AsbCloudWebApi/AsbCloudWebApi.csproj index b88a3e73..8d358003 100644 --- a/AsbCloudWebApi/AsbCloudWebApi.csproj +++ b/AsbCloudWebApi/AsbCloudWebApi.csproj @@ -7,6 +7,13 @@ 80899ceb-210f-4f19-ac56-aa90a5d666d4 + + + + + + + @@ -33,13 +40,21 @@ + + PreserveNewest + + + PreserveNewest + PreserveNewest - - - - + + PreserveNewest + + + PreserveNewest + diff --git a/AsbCloudWebApi/Startup.cs b/AsbCloudWebApi/Startup.cs index 4b0c6b0c..5ba8dbd2 100644 --- a/AsbCloudWebApi/Startup.cs +++ b/AsbCloudWebApi/Startup.cs @@ -50,13 +50,15 @@ namespace AsbCloudWebApi "http://0.0.0.0:5000", "http://*:5000", "http://localhost:5000", - + "http://*", + "https://0.0.0.0:3000", "https://*:3000", "https://localhost:3000", "https://0.0.0.0:5001", "https://*:5001", - "https://localhost:5001" + "https://localhost:5001", + "https://*:443" ) .AllowCredentials(); }); diff --git a/AsbCloudWebApi/wwwroot/asset-manifest.json b/AsbCloudWebApi/wwwroot/asset-manifest.json index be35f8d7..be79f148 100644 --- a/AsbCloudWebApi/wwwroot/asset-manifest.json +++ b/AsbCloudWebApi/wwwroot/asset-manifest.json @@ -1,8 +1,8 @@ { "files": { "main.css": "/static/css/main.9cfe6b31.chunk.css", - "main.js": "/static/js/main.6c26ed34.chunk.js", - "main.js.map": "/static/js/main.6c26ed34.chunk.js.map", + "main.js": "/static/js/main.f6229874.chunk.js", + "main.js.map": "/static/js/main.f6229874.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.33aef657.js", "runtime-main.js.map": "/static/js/runtime-main.33aef657.js.map", "static/js/2.968888d9.chunk.js": "/static/js/2.968888d9.chunk.js", @@ -35,6 +35,6 @@ "static/js/runtime-main.33aef657.js", "static/js/2.968888d9.chunk.js", "static/css/main.9cfe6b31.chunk.css", - "static/js/main.6c26ed34.chunk.js" + "static/js/main.f6229874.chunk.js" ] } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 367a842d..2cbd4e4f 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -АСБ Vision
ц \ No newline at end of file +АСБ Vision
ц \ No newline at end of file