From 7400451ac44b03d4e7ee5257abae20dc70c679ea Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 24 Mar 2023 19:54:48 +0800 Subject: [PATCH] update --- .../src/Win_in.Sfs.Auth.Web/Program.cs | 9 ++++++++- .../Win_in.Sfs.Auth.Web.csproj | 3 ++- .../src/Win_in.Sfs.Auth.Web/appsettings.json | 20 +++++++++++++++++++ .../HostBuilderExtensions.cs | 6 +++++- .../src/docker/publish/conf/gateway/Caddyfile | 7 +------ .../docker/publish/conf/gateway/Caddyfile.dev | 7 +------ 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Program.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Program.cs index 650107484..13a137314 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Program.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Program.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; using Win_in.Sfs.Shared.Host; namespace Win_in.Sfs.Auth.Web; @@ -7,6 +8,12 @@ public class Program { public static int Main(string[] args) { - return WebApplication.CreateBuilder(args).BuildAndRun(); + return WebApplication.CreateBuilder(args).BuildAndRun(o => + { + o.Services.AddReverseProxy().LoadFromConfig(o.Configuration.GetSection("ReverseProxy")); + }, o => + { + o.MapReverseProxy(); + }); } } diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj index c941b1299..40bbfaa22 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj @@ -14,7 +14,7 @@ true Win_in.Sfs.Auth-4681b4fd-151f-4221-84a4-929d86723e4c 1.yyyy.Mdd.Hmm - 1.2023.324.1723 + 1.2023.324.1857 True @@ -32,6 +32,7 @@ + diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json index 8456a816a..d238381b7 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json @@ -5,6 +5,26 @@ "nodes": "http://config:8848", "env": "prod" }, + "ReverseProxy": { + "Routes": { + "ids4": { + "ClusterId": "ids4cluster", + "Match": { + "Path": "/api/connect/{**catch-all}" + }, + "Transforms": [ { "PathRemovePrefix": "/api" } ] + } + }, + "Clusters": { + "ids4cluster": { + "Destinations": { + "default": { + "Address": "http://localhost:59093/" + } + } + } + } + }, "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs index f81ce1238..ca8161050 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Host/HostBuilderExtensions.cs @@ -13,7 +13,9 @@ namespace Win_in.Sfs.Shared.Host; public static class HostBuilderExtensions { - public static int BuildAndRun(this WebApplicationBuilder builder) where TModule : IAbpModule + public static int BuildAndRun(this WebApplicationBuilder builder, + Action builderAction = null, + Action appAction = null) where TModule : IAbpModule { Serilog.Debugging.SelfLog.Enable(Console.WriteLine); Log.Logger = new LoggerConfiguration() @@ -44,9 +46,11 @@ public static class HostBuilderExtensions .Enrich.FromLogContext() .WriteTo.Console(formatProvider: CultureInfo.InvariantCulture); }, writeToProviders: false); + builderAction?.Invoke(builder); var app = builder.Build(); app.UseSerilogRequestLogging(); app.InitializeApplicationAsync().Wait(); + appAction?.Invoke(app); app.RunAsync().Wait(); return 0; } diff --git a/build/src/docker/publish/conf/gateway/Caddyfile b/build/src/docker/publish/conf/gateway/Caddyfile index 79da07b51..3d367af0b 100644 --- a/build/src/docker/publish/conf/gateway/Caddyfile +++ b/build/src/docker/publish/conf/gateway/Caddyfile @@ -8,15 +8,10 @@ reverse_proxy @sfs-core-host /api/* sfs-core-host:59092 @sfs-auth-web { - path_regexp ^/api/(abp|identity|base|multi-tenancy|permission-management)/* + path_regexp ^/api/(abp|identity|base|multi-tenancy|permission-management|token|connect)/* } reverse_proxy @sfs-auth-web /api/* sfs-auth-web:59093 - @sfs-auth-web-ids { - path_regexp ^/api/(connect)/* - } - reverse_proxy @sfs-auth-web-ids /* sfs-auth-web:59093 - @sfs-basedata-host { path_regexp ^/api/basedata/* } diff --git a/build/src/docker/publish/conf/gateway/Caddyfile.dev b/build/src/docker/publish/conf/gateway/Caddyfile.dev index 8359f816f..b3fd72ce1 100644 --- a/build/src/docker/publish/conf/gateway/Caddyfile.dev +++ b/build/src/docker/publish/conf/gateway/Caddyfile.dev @@ -8,15 +8,10 @@ reverse_proxy @sfs-core-host /api/* host.docker.internal:59092 @sfs-auth-web { - path_regexp ^/api/(abp|identity|base|multi-tenancy|permission-management)/* + path_regexp ^/api/(abp|identity|base|multi-tenancy|permission-management|token|connect)/* } reverse_proxy @sfs-auth-web /api/* host.docker.internal:59093 - @sfs-auth-web-ids { - path_regexp ^/api/(connect)/* - } - reverse_proxy @sfs-auth-web-ids /* host.docker.internal:59093 - @sfs-basedata-host { path_regexp ^/api/basedata/* }