diff --git a/projects/Version.cs b/projects/Version.cs index c028065b..fd12aeda 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0812d2")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0813d1")] \ No newline at end of file diff --git a/publish/build.ps1 b/publish/build.ps1 index 27f53459..94cc95b5 100644 --- a/publish/build.ps1 +++ b/publish/build.ps1 @@ -1,12 +1,12 @@ Remove-Item ./dist/* -recurse -force -Copy-Item ./src/* ./dist -recurse -Exclude @('.gitignore','debug-start.cmd','debug-stop.cmd','docker-compose.override.yml','nginx.development.conf') +Copy-Item ./src/* ./dist -recurse -Exclude @('.gitignore','start-dev.cmd','docker-compose.override.yml','nginx.development.conf') Remove-Item ./dist/linux-x64/publish/docker/log/* -recurse -force Remove-Item ./dist/linux-x64/publish/docker/data/* -recurse -force -Copy-Item ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC -recurse -Copy-Item ../projects/WebSPA/wwwroot ./dist/linux-x64/publish/apps/WebSPA -recurse +Copy-Item ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC/wwwroot -recurse +Copy-Item ../projects/WebSPA/wwwroot ./dist/linux-x64/publish/apps/WebSPA/wwwroot -recurse dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/UserCenter dotnet publish ../projects/JobServer/JobServer.csproj -c Release -r linux-x64 -o ../publish/dist/linux-x64/publish/apps/JobServer diff --git a/publish/src/linux-x64/publish/debug-stop.cmd b/publish/src/linux-x64/publish/debug-stop.cmd deleted file mode 100644 index 356959e4..00000000 --- a/publish/src/linux-x64/publish/debug-stop.cmd +++ /dev/null @@ -1 +0,0 @@ -docker-compose down --remove-orphans \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf index 5c5f25e9..55f7a3ab 100644 --- a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf +++ b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf @@ -1,5 +1,5 @@ #user nobody; -worker_processes 1; +worker_processes 4; #error_log logs/error.log; #error_log logs/error.log notice; diff --git a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.development.conf b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.development.conf index 96248629..698e06f7 100644 --- a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.development.conf +++ b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.development.conf @@ -1,5 +1,5 @@ #user nobody; -worker_processes 1; +worker_processes 4; #error_log logs/error.log; #error_log logs/error.log notice; diff --git a/publish/src/linux-x64/publish/docker/conf/website/nginx.conf b/publish/src/linux-x64/publish/docker/conf/website/nginx.conf index 756c9c37..3889a8ef 100644 --- a/publish/src/linux-x64/publish/docker/conf/website/nginx.conf +++ b/publish/src/linux-x64/publish/docker/conf/website/nginx.conf @@ -1,6 +1,5 @@ -#user nobody; -worker_processes 1; - +user root; +worker_processes 4; #error_log logs/error.log; #error_log logs/error.log notice; #error_log logs/error.log info; diff --git a/publish/src/linux-x64/publish/debug-start.cmd b/publish/src/linux-x64/publish/start-dev.cmd similarity index 100% rename from publish/src/linux-x64/publish/debug-start.cmd rename to publish/src/linux-x64/publish/start-dev.cmd