From 9fb013e98bc4d938e87bd4ba747840dc0ad6fc0b Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Wed, 24 Jun 2026 13:55:50 +0800
Subject: [PATCH] feat: Optimize module configuration

---
 .../AuthServerModule.Configure.cs                     | 11 +++++++++--
 .../AuthServerModule.cs                               |  2 +-
 .../MicroServiceApplicationsSingleModule.Configure.cs |  9 +++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.Configure.cs
index cc7aab740..e281f164c 100644
--- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.Configure.cs
+++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.Configure.cs
@@ -108,13 +108,20 @@ public partial class AuthServerModule
         });
     }
 
-    private void PreConfigureAuthServer()
+    private void PreConfigureAuthServer(IConfiguration configuration)
     {
         PreConfigure<OpenIddictBuilder>(builder =>
         {
             builder.AddValidation(options =>
             {
-                //options.AddAudiences("lingyun-abp-application");
+                var validAudiences = configuration.GetSection("AuthServer:ValidAudiences").Get<List<string>>();
+                if (validAudiences?.Count > 0)
+                {
+                    foreach (var audience in validAudiences)
+                    {
+                        options.AddAudiences(audience);
+                    }
+                }
 
                 options.UseLocalServer();
 
diff --git a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.cs b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.cs
index fb50fac4f..521ef2220 100644
--- a/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.cs
+++ b/aspnet-core/aspire/LINGYUN.Abp.MicroService.AuthServer/AuthServerModule.cs
@@ -88,9 +88,9 @@ public partial class AuthServerModule : AbpModule
         PreConfigureWrapper();
         PreConfigureFeature();
         PreForwardedHeaders();
-        PreConfigureAuthServer();
         PreConfigureApp(configuration);
         PreConfigureCAP(configuration);
+        PreConfigureAuthServer(configuration);
         PreConfigureCertificate(configuration, hostingEnvironment);
     }
 
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 f82dec829..f2819f6be 100644
--- a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs
+++ b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs
@@ -961,11 +961,16 @@ public partial class MicroServiceApplicationsSingleModule
 
         if (!isDevelopment)
         {
-            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
             services
                 .AddDataProtection()
                 .SetApplicationName("LINGYUN.Abp.Application")
-                .PersistKeysToStackExchangeRedis(redis, "LINGYUN.Abp.Application:DataProtection:Protection-Keys");
+                .PersistKeysToStackExchangeRedis(() =>
+                {
+                    var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
+
+                    return redis.GetDatabase();
+                },
+                "LINGYUN.Abp.Application:DataProtection:Protection-Keys");
         }
 
         services.AddSameSiteCookiePolicy();