From 33dbda54579ada1781fc305af2fcb6183b9ae909 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 10 Oct 2024 15:38:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(nginx):=20=E4=BF=AE=E5=A4=8Dnginx?= =?UTF-8?q?=E8=BD=AC=E5=8F=91=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/vue/docker/nginx/default.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/vue/docker/nginx/default.conf b/apps/vue/docker/nginx/default.conf index 0956b8c9c..e04d3235b 100644 --- a/apps/vue/docker/nginx/default.conf +++ b/apps/vue/docker/nginx/default.conf @@ -24,22 +24,22 @@ server { } location /connect/ { - proxy_pass http://auth-server:44385/; + proxy_pass http://auth-server:44385$request_uri; proxy_set_header Host auth-server:44385; } location ~ /api/files/static/ { # 当path参数存在子路径时 不能让nginx解码 / 符号 - proxy_pass http://apigateway:30000; + proxy_pass http://apigateway:30000$request_uri; } location /api/ { - proxy_pass http://apigateway:30000/; + proxy_pass http://apigateway:30000$request_uri; proxy_set_header Host $host; } location ^~/wapi/ { - proxy_pass http://www.nmc.cn/; + proxy_pass http://www.nmc.cn$request_uri; proxy_set_header Host www.nmc.cn; proxy_set_header Referer http://www.nmc.cn; proxy_set_header X-Real-IP $remote_addr; @@ -48,7 +48,7 @@ server { } location /signalr-hubs/ { - proxy_pass http://apigateway:30000/; + proxy_pass http://apigateway:30000$request_uri; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; From 137ffd8db0cec66f1fcf1a8e21e960ab9b616b78 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 10 Oct 2024 15:39:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(single-project):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E4=BD=93=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/LY.MicroService.Applications.Single/Dockerfile | 1 + .../MicroServiceApplicationsSingleModule.Configure.cs | 2 +- .../services/LY.MicroService.Applications.Single/Program.cs | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Dockerfile b/aspnet-core/services/LY.MicroService.Applications.Single/Dockerfile index bd803188a..aee09fd66 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Dockerfile +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Dockerfile @@ -9,6 +9,7 @@ ENV TZ=Asia/Shanghai RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone EXPOSE 80/tcp +VOLUME [ "./app/blobs" ] VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs index bcc5e3042..1d86ea567 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs @@ -90,7 +90,7 @@ namespace LY.MicroService.Applications.Single; public partial class MicroServiceApplicationsSingleModule { protected const string DefaultCorsPolicyName = "Default"; - protected const string ApplicationName = "MicroService-Applications-Single"; + public static string ApplicationName { get; set; } = "MicroService-Applications-Single"; private readonly static OneTimeRunner OneTimeRunner = new(); private void PreConfigureFeature() diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs index 1f3acce59..ccd4f3c0e 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs @@ -34,6 +34,9 @@ builder.Host.AddAppSettingsSecretsJson() await builder.AddApplicationAsync(options => { + MicroServiceApplicationsSingleModule.ApplicationName = Environment.GetEnvironmentVariable("APPLICATION_NAME") + ?? MicroServiceApplicationsSingleModule.ApplicationName; + options.ApplicationName = MicroServiceApplicationsSingleModule.ApplicationName; // ӻȡû, options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); // ûָû, Ŀȡ