From e1f7c0eafa3ee608271192cf3520afe09db9a8ef Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Sun, 28 Jul 2024 19:36:58 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0redis?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B=E9=9B=86=E7=BE=A4=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=20=202=E3=80=81=E5=8D=87=E7=BA=A7furion=20v4.9.4.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Application/Configuration/Cache.json | 7 ++++---
 Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj           | 6 +++---
 Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs             | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/Admin.NET.Application/Configuration/Cache.json b/Admin.NET/Admin.NET.Application/Configuration/Cache.json
index de9969bd..a7f2b5f7 100644
--- a/Admin.NET/Admin.NET.Application/Configuration/Cache.json
+++ b/Admin.NET/Admin.NET.Application/Configuration/Cache.json
@@ -5,9 +5,10 @@
     "Prefix": "adminnet_", // 全局缓存前缀
     "CacheType": "Memory", // Memory、Redis
     "Redis": {
-      "Configuration": "server=127.0.0.1:6379;password=;db=5;", // Redis连接字符串
-      "Prefix": "adminnet_", // Redis前缀（目前没用）
-      "MaxMessageSize": "1048576" // 最大消息大小 默认1024 * 1024
+        "Configuration": "server=127.0.0.1:6379;password=;db=5;", // Redis连接字符串
+        "Prefix": "adminnet_", // Redis前缀（目前没用）
+        "MaxMessageSize": "1048576", // 最大消息大小 默认1024 * 1024
+        "AutoDetect": false // 自动检测集群节点 公有云Redis一般放在代理背后，主从架构，如果开启自动检测，将会自动识别主从，导致得到无法连接的内网主从库地址
     }
   },
   "Cluster": { // 集群配置
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 15079379..f8afdde0 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.7" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.7" />
-    <PackageReference Include="Furion.Pure" Version="4.9.4.7" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.4.8" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.4.8" />
+    <PackageReference Include="Furion.Pure" Version="4.9.4.8" />
     <PackageReference Include="Hardware.Info" Version="100.1.0.1" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
diff --git a/Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs b/Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs
index f9927d86..af590826 100644
--- a/Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs
+++ b/Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs
@@ -25,6 +25,9 @@ public static class CacheSetup
                 Configuration = cacheOptions.Redis.Configuration,
                 Prefix = cacheOptions.Redis.Prefix
             });
+            // 自动检测集群节点
+            redis.AutoDetect = App.GetConfig<bool>("Cache:Redis:AutoDetect", true);
+            // 最大消息大小
             if (cacheOptions.Redis.MaxMessageSize > 0)
                 redis.MaxMessageSize = cacheOptions.Redis.MaxMessageSize;