chore 优化authserver配置

Merge branch 'master' of https://git.konsoft.top/konsoft/KonSoft.Clean
chore 优化authserverAudience
2025-10-30 00:10:48 +08:00 · 2025-10-29 23:52:43 +08:00 · 2025-10-29 23:52:40 +08:00 · 2025-10-28 08:39:41 +08:00 · 2025-10-27 20:23:34 +08:00 · 2025-10-27 20:21:24 +08:00
14 changed files with 2528 additions and 358 deletions
--- a/.gitignore
+++ b/.gitignore
@ -264,4 +264,5 @@ src/KonSoft.Admin.Blazor.Server.Tiered/Logs/*
 # Use abp install-libs to restore.
 **/wwwroot/libs/*

-**/Logs/*
+**/Logs/*
+**/logs.txt
--- a/applications/KonSoft.AuthServer/.yarnrc
+++ b/applications/KonSoft.AuthServer/.yarnrc
@ -1 +0,0 @@
-registry "https://registry.npmmirror.com"
--- a/applications/KonSoft.AuthServer/Dockerfile
+++ b/applications/KonSoft.AuthServer/Dockerfile
@ -38,6 +38,8 @@ RUN dotnet nuget locals all --clear
 RUN dotnet nuget add source https://mirrors.huaweicloud.com/repository/nuget/v3/index.json -n HuaweiCloud
 RUN dotnet tool install -g Volo.Abp.Cli --version 8.3.4
 ENV PATH="$PATH:/root/.dotnet/tools"
+RUN yarn config set registry https://registry.npmmirror.com
+RUN yarn cache clean
 RUN abp install-libs
 RUN dotnet build "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/build

--- a/applications/KonSoft.AuthServer/KonSoftAuthServerModule.cs
+++ b/applications/KonSoft.AuthServer/KonSoftAuthServerModule.cs
@ -26,6 +26,7 @@ using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.Security.Claims;
+using Volo.Abp.UI.Navigation.Urls;
 using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;

 namespace KonSoft;
@ -50,15 +51,20 @@ public class KonSoftAuthServerModule : AbpModule
        {
            builder.AddValidation(options =>
            {
-                options.AddAudiences("KonSoft");
+                options.AddAudiences(KonSoftConsts.AuthServerAudience);
                options.UseLocalServer();
                options.UseAspNetCore();
            });
        });

-        context.Services.Configure<ForwardedHeadersOptions>(options =>
+        PreConfigure<ForwardedHeadersOptions>(options =>
        {
-            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor |
+                                       ForwardedHeaders.XForwardedProto |
+                                       ForwardedHeaders.XForwardedHost;
+
+            options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("::ffff:127.0.0.1"), 104));
+            options.KnownProxies.Add(IPAddress.Parse("::ffff:127.0.0.1"));
        });

        if (!hostingEnvironment.IsDevelopment())
@ -105,6 +111,16 @@ public class KonSoftAuthServerModule : AbpModule
            options.ApplicationName = "AuthServer";
        });

+        Configure<AppUrlOptions>(options =>
+        {
+            options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
+            options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ??
+                                                 Array.Empty<string>());
+
+            options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
+            options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
+        });
+
        Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });

        context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
@ -137,17 +153,16 @@ public class KonSoftAuthServerModule : AbpModule
        var app = context.GetApplicationBuilder();
        var env = context.GetEnvironment();

-        if (env.IsDevelopment())
+        app.UseForwardedHeaders();
+        app.Use(async (ctx, next) =>
        {
-            app.UseDeveloperExceptionPage();
-            app.UseForwardedHeaders();
-        }
-        else
-        {
-            app.UseErrorPage();
-            app.UseForwardedHeaders();
-            app.UseHsts();
-        }
+            ctx.Request.Scheme = "https";
+            await next();
+        });
+
+        app.UseDeveloperExceptionPage();
+        app.UseAbpRequestLocalization();
+        app.UseErrorPage();

        app.UseAbpRequestLocalization();

--- a/applications/KonSoft.AuthServer/yarn.lock
+++ b/applications/KonSoft.AuthServer/yarn.lock
@ -1,322 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@abp/aspnetcore.mvc.ui.theme.basic@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.3.4.tgz#75708276b2d9162d4f208ebf566fb0a7343636a7"
-  integrity sha512-m5NBySj8tPbXwMKI1hUfYDzGVxvcU4JGJsSDegetuiulZYm59tPnfdwBeM0zSqx72UPowu/2oDwJsgjODVrDlg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~8.3.4"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.3.4.tgz#169ae0893302ced9256f94174d9bb870e49f446c"
-  integrity sha512-bZy8iAIN0QfNJXCRg+RR1NxqTzNDSXRPBx+ksFtDxY6FzMJvwwSOmHF0wqsMLj1xpwXjijWaVWQ2RM/7scDWmw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~8.3.4"
-    "@abp/bootstrap" "~8.3.4"
-    "@abp/bootstrap-datepicker" "~8.3.4"
-    "@abp/bootstrap-daterangepicker" "~8.3.4"
-    "@abp/datatables.net-bs5" "~8.3.4"
-    "@abp/font-awesome" "~8.3.4"
-    "@abp/jquery-form" "~8.3.4"
-    "@abp/jquery-validation-unobtrusive" "~8.3.4"
-    "@abp/lodash" "~8.3.4"
-    "@abp/luxon" "~8.3.4"
-    "@abp/malihu-custom-scrollbar-plugin" "~8.3.4"
-    "@abp/moment" "~8.3.4"
-    "@abp/select2" "~8.3.4"
-    "@abp/sweetalert2" "~8.3.4"
-    "@abp/timeago" "~8.3.4"
-    "@abp/toastr" "~8.3.4"
-
-"@abp/aspnetcore.mvc.ui@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.3.4.tgz#041d83f34541081d9e0f37c36c302cbe871a4897"
-  integrity sha512-sjGE/EoNM98mXNYPze2C7GPP+TNpv4TLIt416ojaqtxru60oddr4VWrOGuhaqUCO2jJes3OwFZi5PY3hVOBbYw==
-  dependencies:
-    ansi-colors "^4.1.3"
-
-"@abp/bootstrap-datepicker@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.3.4.tgz#072f4a3cea93e3a1bb1de13b355201648929f84c"
-  integrity sha512-txilFovf9zT1w+fTkyI3eZdiISjaxc/+wRRFKwrkVH+0xEgaiR41svKm6sjWBORxgTddlGas87SZJvYY3IKBjA==
-  dependencies:
-    bootstrap-datepicker "^1.10.0"
-
-"@abp/bootstrap-daterangepicker@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.3.4.tgz#b0f65611ca4fafdf2b551f9f139868eae6e22e9a"
-  integrity sha512-bYkYjk1zTdWcM4DGwnDoU+4pDvs1S8hkNWhrnpP0o8oRoJiesO8Aeda+82rtydtWnxHg+HkDC0iYFFqaNuHvbg==
-  dependencies:
-    bootstrap-daterangepicker "^3.1.0"
-
-"@abp/bootstrap@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.3.4.tgz#744bb4d30d4c269ce8e6a7d16c6777dd3cd9fe1e"
-  integrity sha512-GXCLFFmPNaR3DjQYSaqACL5sH/M9FPia2OKAAMOd796+NmcoFpT+S7l4C6ihqeQc4bjFm0voB8QklueGWx6r8A==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    bootstrap "^5.3.3"
-
-"@abp/core@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.3.4.tgz#12635bc2ac325a426334150502a32fefa4ec3767"
-  integrity sha512-wImAdZABahaQe6mmZAZlPfYZ3PEhL7eEq+18c1WFO0xeD98oxqi8H1X7+3ABjyFscIh9LIxJVaD3RJ9OHCc5bw==
-  dependencies:
-    "@abp/utils" "~8.3.4"
-
-"@abp/datatables.net-bs5@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.3.4.tgz#efc28fa57144c7b495a4aeea38df962807ca20df"
-  integrity sha512-u85aXjqYIJJfOsMq6oNqfxNgxQqV6vOEnJ32vrH294ceW8RzUxHA+G/ZkGRLLRGWVuxuARD/UXzEotH5sd1Ssw==
-  dependencies:
-    "@abp/datatables.net" "~8.3.4"
-    datatables.net-bs5 "^2.0.8"
-
-"@abp/datatables.net@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.3.4.tgz#23a3155a2d84247a29a6b80ff98d1d5f6422a245"
-  integrity sha512-cwE9TFoRoszmI3zNVaYJtqjSPtwkL9dhCfE02zsmJo8GBdFAlbzAmQenfQiWb3BZhvUvKKN20e+og9S8qoCbXA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    datatables.net "^2.0.8"
-
-"@abp/font-awesome@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.3.4.tgz#f79f7b439f9ffadfc03be3a415a977eab21fa5a1"
-  integrity sha512-5+D5XKnrZROtg9PJ2zex52gbphXGK/7ZIUsszEg8rOIc/niXggaZLmuDcYJwOEzIkwpGO9OvYy7lc0tHv/Pr4g==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    "@fortawesome/fontawesome-free" "^6.5.2"
-
-"@abp/jquery-form@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.3.4.tgz#c1705bd5213ab5c2b895dd5bd9f3e54f3d94cf54"
-  integrity sha512-vFjWbTbHQyIsk5SS7Cc+5YrJ15ORjJU+YWVPchI0qoug26for06a7lDGpazWMadxx3iPL7cKLqneOqaVtHkgJA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    jquery-form "^4.3.0"
-
-"@abp/jquery-validation-unobtrusive@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.3.4.tgz#e89eafed89787bcb5221c0ba89832b79a7396d19"
-  integrity sha512-+kJA5vfvxkrj/iW4Q84BrMTrAGOhC2Hb5czAKr6c60Prmayk5hcakZdXc3wDBHREBLVAq1Muk4AtEJZmaKIeaA==
-  dependencies:
-    "@abp/jquery-validation" "~8.3.4"
-    jquery-validation-unobtrusive "^4.0.0"
-
-"@abp/jquery-validation@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.3.4.tgz#a445592d80edc6b6b1334ece2007b3084c329cc6"
-  integrity sha512-XvL0H3IRuSHwpPKUyJmW6PH8KwPDt9NllMqPGreRANF8l5IU10hOLEeP2BnGFfGMqFwqUMh+eJRar5yZcegkmg==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    jquery-validation "^1.20.1"
-
-"@abp/jquery@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.3.4.tgz#2dc3f5f124ac65b5f45d29749ebb5d6cf17db23b"
-  integrity sha512-Zx2rErtgc0gxjX5PURjp6sjDQfzxBChUE9YWN37Xh+Ysm3tTGcXlF0Emwl94MZ640NfmYRpG4AWdik6kbaU5Wg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    jquery "~3.7.1"
-
-"@abp/lodash@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.3.4.tgz#b0ef4e82a788ae7389a31793c3bad6702efdbe33"
-  integrity sha512-yGd/oLds0jpTgTpmkFYOEomS4K15DGcffMP3N1t0qKLgTaBYTQzeugHVgQ0baufC+OvLjumDNuu3eHjBJewwKg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    lodash "^4.17.21"
-
-"@abp/luxon@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.3.4.tgz#f152b2d7b62bd27f3d27aa3a1794b868bf06a1a4"
-  integrity sha512-l1nvfqdhHBgHBPK+bLClAEprRK3K5zx5Jar93o5++6r3zXUhYi5OUHUxl+LuGn8MXLvHJVGL41irHl6sYjFSww==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    luxon "^3.4.4"
-
-"@abp/malihu-custom-scrollbar-plugin@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.3.4.tgz#0868214884e3e0b94dade0e8e78c01741d71106a"
-  integrity sha512-uKRk8+HCvXtpmvof5W09908AkivlweErTE62b0JhkrJVIlYt/0LC1MmB/qHHBfPj6OK05HYGBi3inr7fNAPXEQ==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    malihu-custom-scrollbar-plugin "^3.1.5"
-
-"@abp/moment@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.3.4.tgz#a5809520dc50b50402ade4ac630c6ec985fd4518"
-  integrity sha512-61J8drO3OqkaaAn66xBg6jCws1iV6zutjYQvpEXLdGBA9Kvw2J87GSomxJ4mcIo/5+jzrVro6JYaCfKWY8b1dw==
-  dependencies:
-    moment "^2.30.1"
-
-"@abp/select2@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.3.4.tgz#1731b465760e0515d0d4280f38189c9366fecda5"
-  integrity sha512-sPtYstFVvMTT8fdXRIfHeODIgSN2ufWm6zCMGH7C0cST3FF59M4m/MtdKGBlA/itzHPxeDv7A6dy4Aw4l7Gk4Q==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    select2 "^4.0.13"
-
-"@abp/sweetalert2@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.3.4.tgz#c0768ca4fe0a9926b8f33d8bf5251d3e4202cd2f"
-  integrity sha512-6HqxISh+FodwUsCrR3nX49RQDhzHtDlz8ul42TecUMsGa96qX2lvwnoWkXAHLG3mdLRy62Z0dhJ1JKMfrPeJeg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    sweetalert2 "^11.3.6"
-
-"@abp/timeago@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.3.4.tgz#26ca0bec90d861f9f4af714061b370950551c839"
-  integrity sha512-cDARYysPn5Rr/9rqVn7S4sBWbeEpaIXr8NKwGZqNOzMF2g283SkLKrkQJBWIC6Pn2lVeIB7AV1+GtVn81V/nnw==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    timeago "^1.6.7"
-
-"@abp/toastr@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.3.4.tgz#cb433bc4ed2e302f2704ad0456c99d6f12fd0529"
-  integrity sha512-29C9GgwlumrHgt1iZ4lArDnlXfSvmCHDehxkbDutrkC1m257UxQaOID11us2UeCs3JobueQcLlQKD/LqnDB4xA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    toastr "^2.1.4"
-
-"@abp/utils@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.3.4.tgz#4b06575a110e85e2a360294f678b782818e1ab10"
-  integrity sha512-7Lq3wdk/07vKgQnR56DTmdSuYRABMe0XTGPJRS5F91DVbggeJyDUaqifVvOeurF/3CZJOS7fJpoIHQXeUveFtQ==
-  dependencies:
-    just-compare "^2.3.0"
-
-"@fortawesome/fontawesome-free@^6.5.2":
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
-  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
-
-ansi-colors@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
-bootstrap-datepicker@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz#61612bbe8bf0a69a5bce32bbcdda93ebb6ccf24a"
-  integrity sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg==
-  dependencies:
-    jquery ">=3.4.0 <4.0.0"
-
-bootstrap-daterangepicker@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-daterangepicker/-/bootstrap-daterangepicker-3.1.0.tgz#632e6fb2de4b6360c5c0a9d5f6adb9aace051fe8"
-  integrity sha512-oaQZx6ZBDo/dZNyXGVi2rx5GmFXThyQLAxdtIqjtLlYVaQUfQALl5JZMJJZzyDIX7blfy4ppZPAJ10g8Ma4d/g==
-  dependencies:
-    jquery ">=1.10"
-    moment "^2.9.0"
-
-bootstrap@^5.3.3:
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed"
-  integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==
-
-datatables.net-bs5@^2.0.8:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-2.3.3.tgz#8bf3aec484a69e373f6007038eaac0cc0ef4ee15"
-  integrity sha512-IPtC57k3KyZaLzIYTHies23Cm2zqaKfD6lkxy/aOAUUAtsg35l53VqNY9y84AEySYG3YLghMHVBvl2ckUhvm0A==
-  dependencies:
-    datatables.net "2.3.3"
-    jquery ">=1.7"
-
-datatables.net@2.3.3, datatables.net@^2.0.8:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.3.tgz#fe4f96bdbc4cf47c8d11162a7af525ca6a3683d2"
-  integrity sha512-SWL3za6nheY6gdoiLgCc++tYmxbwrmv2bjrEiII9rXBWXXSbOZct6pjR3FueMVRM5jmt7pQcXiGovfuFDnutQg==
-  dependencies:
-    jquery ">=1.7"
-
-jquery-form@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jquery-form/-/jquery-form-4.3.0.tgz#7d3961c314a1f2d15298f4af1d3943f54f4149c6"
-  integrity sha512-q3uaVCEWdLOYUCI6dpNdwf/7cJFOsUgdpq6r0taxtGQ5NJSkOzofyWm4jpOuJ5YxdmL1FI5QR+q+HB63HHLGnQ==
-  dependencies:
-    jquery ">=1.7.2"
-
-jquery-mousewheel@>=3.0.6:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.2.2.tgz#48c833f6260ee0c46d438a999e7d0060ec9eed0b"
-  integrity sha512-JP71xTAg08ZY3hcs9ZbYUZ5i+dkSsz4yRl/zpWkAmtzc+kMs5EfPkpkINSidiLYMaR0MTo3DfFGF9WIezMsFQQ==
-  dependencies:
-    jquery ">=1.2.6"
-
-jquery-validation-unobtrusive@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#dfcf25a558496a2c883db6021d10f5398d15f99d"
-  integrity sha512-1ervYFFv6LX/rp7ktuLnMakHNG0piNRDyROI8Ir3hL1vPIwylAehB1AY3BPrYJnzW3WmwWryZq+Bz4sazZK9iQ==
-  dependencies:
-    jquery "^3.6.0"
-    jquery-validation ">=1.19"
-
-jquery-validation@>=1.19, jquery-validation@^1.20.1:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.21.0.tgz#78fc05ab76020912a246af3661b3f54a438bca93"
-  integrity sha512-xNot0rlUIgu7duMcQ5qb6MGkGL/Z1PQaRJQoZAURW9+a/2PGOUxY36o/WyNeP2T9R6jvWB8Z9lUVvvQWI/Zs5w==
-
-jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.2.6, "jquery@>=1.5.0 <4.0", jquery@>=1.7, jquery@>=1.7.2, "jquery@>=3.4.0 <4.0.0", jquery@^3.6.0, jquery@~3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
-just-compare@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-2.3.0.tgz#a2adcc1d1940536263275f5a1ef1298bcacfeda7"
-  integrity sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg==
-
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-luxon@^3.4.4:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.7.2.tgz#d697e48f478553cca187a0f8436aff468e3ba0ba"
-  integrity sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==
-
-malihu-custom-scrollbar-plugin@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.5.tgz#310cecc5e59415a1c29e9dfb5d2b6e01d66a29ef"
-  integrity sha512-lwW3LgI+CNDMPnP4ED2la6oYxWMkCXlnhex+s2wuOLhFDFGnGmQuTQVdRK9bvDLpxs10sGlfErVufJy9ztfgJQ==
-  dependencies:
-    jquery-mousewheel ">=3.0.6"
-
-moment@^2.30.1, moment@^2.9.0:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
-select2@^4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"
-  integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
-
-sweetalert2@^11.3.6:
-  version "11.23.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.23.0.tgz#ba8a051b1e94215c762af08692171b7b4611c4c1"
-  integrity sha512-cKzzbC3C1sIs7o9XAMw4E8F9kBtGXsBDUsd2JZ8JM/dqa+nzWwSGM+9LLYILZWzWHzX9W+HJNHyBlbHPVS/krw==
-
-timeago@^1.6.7:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/timeago/-/timeago-1.6.7.tgz#afd467c29a911e697fc22a81888c7c3022783cb5"
-  integrity sha512-FikcjN98+ij0siKH4VO4dZ358PR3oDDq4Vdl1+sN9gWz1/+JXGr3uZbUShYH/hL7bMhcTpPbplJU5Tej4b4jbQ==
-  dependencies:
-    jquery ">=1.5.0 <4.0"
-
-toastr@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/toastr/-/toastr-2.1.4.tgz#8b43be64fb9d0c414871446f2db8e8ca4e95f181"
-  integrity sha512-LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA==
-  dependencies:
-    jquery ">=1.12.0"
--- a/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs
+++ b/gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs
@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Builder;
+using Yarp.ReverseProxy.Configuration;
+namespace KonSoft.InternalGateway.Extensions
+{
+    public static class YarpSwaggerUIBuilderExtensions
+    {
+        public static IApplicationBuilder UseSwaggerUIWithYarp(this IApplicationBuilder app)
+        {
+            var serviceProvider = app.ApplicationServices;
+
+            app.UseSwagger();
+            app.UseSwaggerUI(options =>
+            {
+                var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+                var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
+                var proxyConfigProvider = serviceProvider.GetRequiredService<IProxyConfigProvider>();
+                var yarpConfig = proxyConfigProvider.GetConfig();
+
+                var routedClusters = yarpConfig.Clusters
+                    .SelectMany(t => t.Destinations,
+                        (clusterId, destination) => new { clusterId.ClusterId, destination.Value });
+
+                var groupedClusters = routedClusters
+                    .GroupBy(q => q.Value.Address)
+                    .Select(t => t.First())
+                    .Distinct()
+                    .ToList();
+                var gatewayUrl = configuration["GatewayUrl"];
+
+                options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+                options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
+                foreach (var clusterGroup in groupedClusters)
+                {
+                    var routeConfig = yarpConfig.Routes.FirstOrDefault(q =>
+                        q.ClusterId == clusterGroup.ClusterId);
+                    if (routeConfig == null)
+                    {
+                        logger.LogWarning($"Swagger UI: Couldn't find route configuration for {clusterGroup.ClusterId}...");
+                        continue;
+                    }
+                    
+                   // options.SwaggerEndpoint($"{clusterGroup.Value.Address}/swagger/v1/swagger.json", $"{routeConfig.RouteId} API");
+                    options.SwaggerEndpoint(new Uri(new Uri(!string.IsNullOrWhiteSpace(gatewayUrl)? gatewayUrl: clusterGroup.Value.Address), $"{routeConfig.RouteId.Split("-")[0]}/swagger/v1/swagger.json").AbsoluteUri, $"{routeConfig.RouteId} API");
+                }
+            });
+
+            return app;
+        }
+    }
+}
--- a/gateways/KonSoft.InternalGateway/Program.cs
+++ b/gateways/KonSoft.InternalGateway/Program.cs
@ -1,5 +1,9 @@
 using KonSoft.InternalGateway;
+using KonSoft.InternalGateway.Extensions;
 using KonSoft.Shared.Hosting.AspNetCore;
+using Microsoft.AspNetCore.Rewrite;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OpenApi.Models;
 using Serilog;

 var assemblyName = typeof(Program).Assembly.GetName().Name!;
@ -17,11 +21,26 @@ try
        .AddAppSettingsSecretsJson()
        .UseAutofac()
        .UseSerilog();
+
+    builder.Services.AddAbpSwaggerGenWithOidc(builder.Configuration["AuthServer:Authority"]!, setupAction: options =>
+    {
+        options.SwaggerDoc("v1", new OpenApiInfo
+        {
+            Title = "Gateway",
+            Version = "v1"
+        });
+        options.DocInclusionPredicate((docName, description) => true);
+        options.CustomSchemaIds(type => type.FullName);
+    });
+
+
    builder.Services.AddReverseProxy()
        .LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
+    builder.Services.AddControllers();
    await builder.AddApplicationAsync<InternalGatewayModule>();
    var app = builder.Build();
    await app.InitializeApplicationAsync();
+    app.UseSwaggerUIWithYarp();
    app.MapReverseProxy();
    app.MapGet("/heath", () => "Online");
    await app.RunAsync();
--- a/gateways/KonSoft.InternalGateway/appsettings.json
+++ b/gateways/KonSoft.InternalGateway/appsettings.json
@ -4,5 +4,10 @@
    "name": "KonSoft.InternalGateway",
    "nodes": "https://config.konsoft.top/",
    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
+  },
+  "AuthServer": {
+    "Authority": "https://devauth.konsoft.top",
+    "RequireHttpsMetadata": true,
+    "SwaggerClientId": "Gateway_Swagger"
  }
 }
--- a/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
+++ b/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc.Libs;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Modularity;

@ -25,13 +26,18 @@ public class AdminHttpApiHostModule : AbpModule
        SwaggerConfigurationHelper.ConfigureWithOidc(
            context,
            configuration["AuthServer:Authority"]!,
-            ["AdministrationService"],
+            ["Admin", "Dispatch", "Payment", "Report", "TenantManagement"],
            discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
            apiTitle: "Administration Service API"
        );

        // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>
        Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false);
+
+        Configure<AbpMvcLibsOptions>(options =>
+        {
+            options.CheckLibs = false;
+        });
    }

    public override void OnApplicationInitialization(ApplicationInitializationContext context)
@ -46,6 +52,7 @@ public class AdminHttpApiHostModule : AbpModule

        app.UseAbpRequestLocalization();
        app.UseCorrelationId();
+        app.UseStaticFiles();
        app.UseRouting();
        app.UseCors();
        app.UseAuthentication();
@ -68,8 +75,7 @@ public class AdminHttpApiHostModule : AbpModule
            options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
            options.OAuthScopes("Admin");
        });
-        app.UseStaticFiles();
-
+        
        app.UseAuditing();
        app.UseAbpSerilogEnrichers();
        app.UseConfiguredEndpoints();
--- a/microservices/KonSoft.Admin.HttpApi.Host/Properties/launchSettings.json
+++ b/microservices/KonSoft.Admin.HttpApi.Host/Properties/launchSettings.json
@ -6,18 +6,7 @@
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "applicationUrl": "https://localhost:44354"
-    },
-    "Container (Dockerfile)": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "environmentVariables": {
-        "ASPNETCORE_HTTPS_PORTS": "8081",
-        "ASPNETCORE_HTTP_PORTS": "8080"
-      },
-      "publishAllPorts": true,
-      "useSSL": true
+      "applicationUrl": "http://localhost:44354"
    }
  },
  "$schema": "http://json.schemastore.org/launchsettings.json"
--- a/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json
+++ b/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json
@ -6,8 +6,9 @@
    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44322",
-    "RequireHttpsMetadata": true,
-    "SwaggerClientId": "Admin_Swagger"
+    "Authority": "https://devauth.konsoft.top",
+    "RequireHttpsMetadata": false,
+    "SwaggerClientId": "Dev_Admin_Swagger",
+    "MetadataAddress": "https://devauth.konsoft.top"
  }
 }
--- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.Designer.cs
+++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.Designer.cs
--- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.cs
+++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/20251026064212_V1.0.1.cs
@ -0,0 +1,69 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace KonSoft.Admin.Migrations
+{
+    /// <inheritdoc />
+    public partial class V101 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "WorkerId",
+                table: "AppOrder",
+                newName: "HouseholdWorkerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AppOrder_CustomerId",
+                table: "AppOrder",
+                column: "CustomerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AppOrder_HouseholdWorkerId",
+                table: "AppOrder",
+                column: "HouseholdWorkerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AppOrder_AbpUsers_CustomerId",
+                table: "AppOrder",
+                column: "CustomerId",
+                principalTable: "AbpUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AppOrder_AbpUsers_HouseholdWorkerId",
+                table: "AppOrder",
+                column: "HouseholdWorkerId",
+                principalTable: "AbpUsers",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AppOrder_AbpUsers_CustomerId",
+                table: "AppOrder");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_AppOrder_AbpUsers_HouseholdWorkerId",
+                table: "AppOrder");
+
+            migrationBuilder.DropIndex(
+                name: "IX_AppOrder_CustomerId",
+                table: "AppOrder");
+
+            migrationBuilder.DropIndex(
+                name: "IX_AppOrder_HouseholdWorkerId",
+                table: "AppOrder");
+
+            migrationBuilder.RenameColumn(
+                name: "HouseholdWorkerId",
+                table: "AppOrder",
+                newName: "WorkerId");
+        }
+    }
+}
--- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/AdminDbContextModelSnapshot.cs
+++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Migrations/AdminDbContextModelSnapshot.cs
@ -68,6 +68,9 @@ namespace KonSoft.Admin.Migrations
                        .HasColumnType("text")
                        .HasColumnName("ExtraProperties");

+                    b.Property<Guid?>("HouseholdWorkerId")
+                        .HasColumnType("uuid");
+
                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("boolean")
@ -101,9 +104,6 @@ namespace KonSoft.Admin.Migrations
                    b.Property<int>("Status")
                        .HasColumnType("integer");

-                    b.Property<Guid?>("WorkerId")
-                        .HasColumnType("uuid");
-
                    b.ComplexProperty<Dictionary<string, object>>("Address", "KonSoft.Admin.Entities.Order.Address#AddressInfo", b1 =>
                        {
                            b1.IsRequired();
@ -131,6 +131,10 @@ namespace KonSoft.Admin.Migrations

                    b.HasKey("Id");

+                    b.HasIndex("CustomerId");
+
+                    b.HasIndex("HouseholdWorkerId");
+
                    b.ToTable("AppOrder", (string)null);
                });

@ -2104,6 +2108,23 @@ namespace KonSoft.Admin.Migrations
                    b.HasDiscriminator().HasValue("HouseholdWorker");
                });

+            modelBuilder.Entity("KonSoft.Admin.Entities.Order", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", "Customer")
+                        .WithMany()
+                        .HasForeignKey("CustomerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", "HouseholdWorker")
+                        .WithMany()
+                        .HasForeignKey("HouseholdWorkerId");
+
+                    b.Navigation("Customer");
+
+                    b.Navigation("HouseholdWorker");
+                });
+
            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
                {
                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
Author	SHA1	Message	Date
张兆鑫	ea3a825825	chore 优化authserver配置	2025-10-30 00:10:48 +08:00
张兆鑫	90f0040f63	Merge branch 'master' of https://git.konsoft.top/konsoft/KonSoft.Clean	2025-10-29 23:52:43 +08:00
张兆鑫	d4e54f5709	chore 优化authserverAudience	2025-10-29 23:52:40 +08:00
叶建欣	8d9e7658d7	upd:把OAuthClientId和secret的获取移动到了循环的外面	2025-10-28 08:39:41 +08:00
张兆鑫	d340be4e2c	fix 调整authserver服务https代理配置	2025-10-27 20:23:34 +08:00
张兆鑫	4afd7924b7	chore 调整adminservice swagger	2025-10-27 20:21:24 +08:00
于鹏	30e5e6a4dc	upd	2025-10-27 15:53:21 +08:00
于鹏	df78f842f3	upd: appsettings	2025-10-27 15:42:26 +08:00
于鹏	5138daebea	upd: InternalGateWay AddAbpSwaggerGenWithOidc	2025-10-27 14:47:41 +08:00
于鹏	bbead3a651	upd: 网关swagger	2025-10-26 22:28:32 +08:00
于鹏	802624e7ea	upd: 网关swagger	2025-10-26 22:13:17 +08:00
于鹏	b2bccc34f5	upd: 忽略logs.txt文件	2025-10-26 22:12:46 +08:00
于鹏	f060641e97	upd: UseSwaggerUIWithYarp	2025-10-26 16:03:23 +08:00
于鹏	e7aaacc410	upd: 网关添加swagger	2025-10-26 15:35:38 +08:00
KarlsEcho	75cd096b60	upd：刚刚好像没加完	2025-10-26 15:25:45 +08:00
KarlsEcho	e4629b1771	Merge branch 'master' of https://git.konsoft.top/konsoft/KonSoft.Clean	2025-10-26 15:07:23 +08:00
KarlsEcho	b699762c1b	upd:在swagger里面聚合了Swagger	2025-10-26 15:07:13 +08:00
于鹏	931ecbd4bc	add: migrations	2025-10-26 14:43:57 +08:00
张兆鑫	79171b51b2	Revert "upd:把管道内的静态文件顺序调整到了swagger后面" This reverts commit `6dd678ec31`.	2025-10-26 13:52:34 +08:00
张兆鑫	29201fa84e	fix: 修复swagger500问题	2025-10-26 13:40:22 +08:00
张兆鑫	7171ac44ac	Revert "fix: 修复swagger500问题" This reverts commit `1b82fc3545`.	2025-10-26 13:39:51 +08:00
张兆鑫	1b82fc3545	fix: 修复swagger500问题	2025-10-26 13:35:45 +08:00
张兆鑫	e3b058a4e8	fix: 删除yarn.lokc	2025-10-26 13:29:09 +08:00
张兆鑫	42a4f1e2c4	merge	2025-10-26 13:21:15 +08:00
张兆鑫	60c4958adf	fix: 切换yarn为国内镜像源	2025-10-26 13:20:57 +08:00
张兆鑫	2e61ed8f92	fix: 切换yarn为国内镜像源	2025-10-26 13:18:40 +08:00