增加redis哨兵模式开关,优化配置

Admin.NET/Admin.NET.Application/Configuration/Cache.json

@@ -16,17 +16,19 @@
     "SignalR": {
       "RedisConfiguration": "127.0.0.1:6379,ssl=false,password=,defaultDatabase=5",
       "ChannelPrefix": "signalrPrefix_"
+    },
+    "DataProtecteKey": "AdminNet:DataProtection-Keys",
+    "IsSentinel": false,
+    "SentinelConfig": {
+      "DefaultDb": "4",
+      "EndPoints": [
+        // "10.10.0.124:26380", // 哨兵端口
+      ],
+      "MainPrefix": "adminNet:",
+      "Password": "123456",
+      "SentinelPassword": "adminNet",
+      "ServiceName": "adminNet",
+      "SignalRChannelPrefix": "signalR:"
     }
-  },
-  "StackExchangeRedis": { // 数据保护
-    "DefaultDb": "4",
-    "EndPoints": [
-      // "10.10.0.124:26380", // 哨兵端口
-    ],
-    "MainPrefix": "adminNet:",
-    "Password": "123456",
-    "SentinelPassword": "adminNet",
-    "ServiceName": "adminNet",
-    "SignalRChannelPrefix": "signalR:"
   }
 }

Admin.NET/Admin.NET.Core/Option/CacheOptions.cs

@@ -66,6 +66,21 @@ public sealed class ClusterOptions : IConfigurableOptions
     /// SignalR配置
     /// </summary>
     public ClusterSignalR SignalR { get; set; }
+
+    /// <summary>
+    /// 数据保护key
+    /// </summary>
+    public string DataProtecteKey { get; set; }
+
+    /// <summary>
+    /// 是否哨兵模式
+    /// </summary>
+    public bool IsSentinel { get; set; }
+
+    /// <summary>
+    /// 哨兵配置
+    /// </summary>
+    public StackExchangeSentinelConfig SentinelConfig { get; set; }
 }
 
 /// <summary>
@@ -82,4 +97,45 @@ public sealed class ClusterSignalR
     /// 缓存前缀
     /// </summary>
     public string ChannelPrefix { get; set; }
+}
+
+/// <summary>
+/// 哨兵配置
+/// </summary>
+public sealed class StackExchangeSentinelConfig
+{
+    /// <summary>
+    /// master名称
+    /// </summary>
+    public string ServiceName { get; set; }
+
+    /// <summary>
+    /// master访问密码
+    /// </summary>
+    public string Password { get; set; }
+
+    /// <summary>
+    /// 哨兵访问密码
+    /// </summary>
+    public string SentinelPassword { get; set; }
+
+    /// <summary>
+    /// 哨兵端口
+    /// </summary>
+    public List<string> EndPoints { get; set; }
+
+    /// <summary>
+    /// 默认库
+    /// </summary>
+    public int DefaultDb { get; set; }
+
+    /// <summary>
+    /// 主前缀
+    /// </summary>
+    public string MainPrefix { get; set; }
+
+    /// <summary>
+    /// SignalR前缀
+    /// </summary>
+    public string SignalRChannelPrefix { get; set; }
 }

Admin.NET/Admin.NET.Core/Option/StackExchangeRedisOptions.cs

@@ -1,42 +0,0 @@
-namespace Admin.NET.Core;
-
-/// <summary>
-/// StackExchangeRedisOptions 配置选项
-/// </summary>
-public sealed class StackExchangeRedisOptions : IConfigurableOptions
-{
-    /// <summary>
-    /// master名称
-    /// </summary>
-    public string ServiceName { get; set; }
-
-    /// <summary>
-    /// master访问密码
-    /// </summary>
-    public string Password { get; set; }
-
-    /// <summary>
-    /// 哨兵访问密码
-    /// </summary>
-    public string SentinelPassword { get; set; }
-
-    /// <summary>
-    /// 哨兵端口
-    /// </summary>
-    public List<string> EndPoints { get; set; }
-
-    /// <summary>
-    /// 默认库
-    /// </summary>
-    public int DefaultDb { get; set; }
-
-    /// <summary>
-    /// 主前缀
-    /// </summary>
-    public string MainPrefix { get; set; }
-
-    /// <summary>
-    /// SignalR前缀
-    /// </summary>
-    public string SignalRChannelPrefix { get; set; }
-}

Admin.NET/Admin.NET.Core/SignalR/SignalRSetup.cs

@@ -7,6 +7,7 @@
 // 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
 
+using Elasticsearch.Net;
 using Furion.Logging.Extensions;
 using Microsoft.AspNetCore.DataProtection;
 using StackExchange.Redis;
@@ -38,23 +39,33 @@ public static class SignalRSetup
         var clusterOpt = App.GetOptions<ClusterOptions>();
         if (clusterOpt.Enabled)
         {
-            // StackExchangeRedis 缓存
-            var redisOptions = App.GetOptions<StackExchangeRedisOptions>();
+            var redisOptions = clusterOpt.SentinelConfig;
+            ConnectionMultiplexer connection1;
+            if (clusterOpt.IsSentinel)
+            {
+                var redisConfig = new ConfigurationOptions
+                {
+                    AbortOnConnectFail = false,
+                    ServiceName = redisOptions.ServiceName,
+                    AllowAdmin = true,
+                    DefaultDatabase = redisOptions.DefaultDb,
+                    Password = redisOptions.Password
+                };
 
-            // 密钥存储（数据保护）
-            var redisConfig = new ConfigurationOptions
+                redisOptions.EndPoints.ForEach(o =>
+                {
+                    redisConfig.EndPoints.Add(o);
+                });
+                connection1 = ConnectionMultiplexer.Connect(redisConfig);
+            }
+            else
             {
-                AbortOnConnectFail = false,
-                ServiceName = redisOptions.ServiceName,
-                AllowAdmin = true,
-                DefaultDatabase = redisOptions.DefaultDb,
-                Password = redisOptions.Password
-            };
-            redisOptions.EndPoints.ForEach(o => redisConfig.EndPoints.Add(o));
-            var connection1 = ConnectionMultiplexer.Connect(redisConfig);
-            services.AddDataProtection().PersistKeysToStackExchangeRedis(connection1, "AdminNet:DataProtection-Keys");
+                connection1 = ConnectionMultiplexer.Connect(clusterOpt.SignalR.RedisConfiguration);
+            }
+            // 密钥存储（数据保护）
+            services.AddDataProtection().PersistKeysToStackExchangeRedis(connection1, clusterOpt.DataProtecteKey);
 
-            signalRBuilder.AddStackExchangeRedis(clusterOpt.SignalR.RedisConfiguration, options =>
+            signalRBuilder.AddStackExchangeRedis(options =>
             {
                 // 此处设置的ChannelPrefix并不会生效，如果两个不同的项目，且[程序集名+类名]一样，使用同一个redis服务，请注意修改 Hub/OnlineUserHub 的类名。
                 // 原因请参考下边链接：
@@ -63,16 +74,25 @@ public static class SignalRSetup
                 options.Configuration.ChannelPrefix = clusterOpt.SignalR.ChannelPrefix;
                 options.ConnectionFactory = async writer =>
                 {
-                    var config = new ConfigurationOptions
+                    ConnectionMultiplexer connection;
+                    if (clusterOpt.IsSentinel)
                     {
-                        AbortOnConnectFail = false,
-                        ServiceName = redisOptions.ServiceName,
-                        AllowAdmin = true,
-                        DefaultDatabase = redisOptions.DefaultDb,
-                        Password = redisOptions.Password
-                    };
-                    redisOptions.EndPoints.ForEach(o => config.EndPoints.Add(o));
-                    var connection = await ConnectionMultiplexer.ConnectAsync(config, writer);
+                        var config = new ConfigurationOptions
+                        {
+                            AbortOnConnectFail = false,
+                            ServiceName = redisOptions.ServiceName,
+                            AllowAdmin = true,
+                            DefaultDatabase = redisOptions.DefaultDb,
+                            Password = redisOptions.Password
+                        };
+                        redisOptions.EndPoints.ForEach(o => config.EndPoints.Add(o));
+                        connection = await ConnectionMultiplexer.ConnectAsync(config, writer);
+                    }
+                    else
+                    {
+                        connection = await ConnectionMultiplexer.ConnectAsync(clusterOpt.SignalR.RedisConfiguration);
+                    }
+
                     connection.ConnectionFailed += (_, e) =>
                     {
                         "连接 Redis 失败".LogError();

Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs

@@ -27,7 +27,6 @@ public static class ProjectOptions
         services.AddConfigurableOptions<SnowIdOptions>();
         services.AddConfigurableOptions<CacheOptions>();
         services.AddConfigurableOptions<ClusterOptions>();
-        services.AddConfigurableOptions<StackExchangeRedisOptions>();
         services.AddConfigurableOptions<OSSProviderOptions>();
         services.AddConfigurableOptions<UploadOptions>();
         services.AddConfigurableOptions<WechatOptions>();