Просмотр исходного кода

😎1、增加Redis自动检测集群节点 2、升级Furion v4.9.4.8

zuohuaijun 1 год назад
Родитель
Сommit
dbefacb024

+ 2 - 1
Admin.NET/Admin.NET.Application/Configuration/Cache.json

@@ -7,7 +7,8 @@
     "Redis": {
     "Redis": {
       "Configuration": "server=127.0.0.1:6379;password=;db=5;", // Redis连接字符串
       "Configuration": "server=127.0.0.1:6379;password=;db=5;", // Redis连接字符串
       "Prefix": "adminnet_", // Redis前缀(目前没用)
       "Prefix": "adminnet_", // Redis前缀(目前没用)
-      "MaxMessageSize": "1048576" // 最大消息大小 默认1024 * 1024
+      "MaxMessageSize": "1048576", // 最大消息大小 默认1024 * 1024
+      "AutoDetect": false // 自动检测集群节点 公有云Redis一般放在代理背后,主从架构,如果开启自动检测,将会自动识别主从,导致得到无法连接的内网主从库地址
     }
     }
   },
   },
   "Cluster": { // 集群配置
   "Cluster": { // 集群配置

+ 4 - 4
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.14.6" />
     <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="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
@@ -37,7 +37,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1055" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1056" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
   </ItemGroup>

+ 3 - 0
Admin.NET/Admin.NET.Core/Cache/CacheSetup.cs

@@ -25,6 +25,9 @@ public static class CacheSetup
                 Configuration = cacheOptions.Redis.Configuration,
                 Configuration = cacheOptions.Redis.Configuration,
                 Prefix = cacheOptions.Redis.Prefix
                 Prefix = cacheOptions.Redis.Prefix
             });
             });
+            // 自动检测集群节点
+            redis.AutoDetect = App.GetConfig<bool>("Cache:Redis:AutoDetect", true);
+            // 最大消息大小
             if (cacheOptions.Redis.MaxMessageSize > 0)
             if (cacheOptions.Redis.MaxMessageSize > 0)
                 redis.MaxMessageSize = cacheOptions.Redis.MaxMessageSize;
                 redis.MaxMessageSize = cacheOptions.Redis.MaxMessageSize;