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

fix: 修复编译失败问题并优化代码格式

许俊杰 3 лет назад
Родитель
Сommit
19cb21bd35

+ 4 - 4
Admin.NET/Admin.NET.Application/Configuration/SignalRRedisDock.json

@@ -1,8 +1,8 @@
 {
     "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
-  "SignalRRedisDock": {
-    "Enabled": false,
-    "RedisConnectionString": "127.0.0.1:6379,connectRetry=3,syncTimeout=1000,connectTimeout=1000,defaultDatabase=2,ssl=false,writeBuffer=10240,abortConnect=False" // Redis连接字符串
-  }
+    "SignalRRedisDock": {
+        "Enabled": false,
+        "RedisConnectionString": "127.0.0.1:6379,connectRetry=3,syncTimeout=1000,connectTimeout=1000,defaultDatabase=2,ssl=false,writeBuffer=10240,abortConnect=False" // Redis连接字符串
+    }
 }

+ 15 - 26
Admin.NET/Admin.NET.Core/Hub/SignalRDockExtensions.cs

@@ -1,11 +1,7 @@
 using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Admin.NET.Core;
+
 public static class SignalRDockExtensions
 {
     /// <summary>
@@ -16,16 +12,16 @@ public static class SignalRDockExtensions
     /// <exception cref="ArgumentNullException"></exception>
     public static void AddSignalR_RedisDock(this IServiceCollection services, Func<string> delegateRedisConnectionString)
     {
-        var RedisConnectionString = delegateRedisConnectionString();
-        if (string.IsNullOrEmpty(RedisConnectionString))
-        {
-            throw new ArgumentNullException(nameof(RedisConnectionString));
-        }
+        var redisConnectionString = delegateRedisConnectionString();
+        if (string.IsNullOrEmpty(redisConnectionString))
+            throw new ArgumentNullException(nameof(redisConnectionString));
+
         services.AddSignalR(hubOptions =>
-        {
-            //SignalR 自己的 pinger ,客户端在定义的时间跨度内没有响应,它将触发OnDisconnectedAsync
-            hubOptions.KeepAliveInterval = TimeSpan.FromSeconds(5);
-        }).AddJsonProtocol()
+            {
+                // SignalR 自己的 pinger ,客户端在定义的时间跨度内没有响应,它将触发OnDisconnectedAsync
+                hubOptions.KeepAliveInterval = TimeSpan.FromSeconds(5);
+            })
+            .AddJsonProtocol()
             .AddMessagePackProtocol()
             // 支持MessagePack
             .AddStackExchangeRedis(options =>
@@ -39,23 +35,16 @@ public static class SignalRDockExtensions
                         // Password = "changeme",
                         ChannelPrefix = "__signalr_",
                     };
-                    //config.EndPoints.Add(IPAddress.Loopback, 0);
-                    //config.SetDefaultPorts();
+                    // config.EndPoints.Add(IPAddress.Loopback, 0);
+                    // config.SetDefaultPorts();
                     config.DefaultDatabase = 1;
-                    var connection = await ConnectionMultiplexer.ConnectAsync(RedisConnectionString, writer);
+                    var connection = await ConnectionMultiplexer.ConnectAsync(redisConnectionString, writer);
                     connection.ConnectionFailed += (_, e) =>
                     {
-                        ConsoleDebug.WriteLine("Connection to Redis failed.");
+                        Console.WriteLine("Connection to Redis failed.");
                     };
 
-                    if (connection.IsConnected)
-                    {
-                        ConsoleDebug.WriteLine("connected to Redis.");
-                    }
-                    else
-                    {
-                        ConsoleDebug.WriteLine("Did not connect to Redis");
-                    }
+                    Console.WriteLine(connection.IsConnected ? "connected to Redis." : "Did not connect to Redis");
 
                     return connection;
                 };

+ 1 - 1
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -36,7 +36,7 @@ public class Startup : AppStartup
         services.AddJwt<JwtHandler>(enableGlobalAuthorize: true);
         if (App.GetConfig<bool>("SignalRRedisDock:Enabled"))
         {
-            //redis底板 AddSignalR_RedisDock 需要在Addjwt后。在之前会导致JwtHandler失效
+            // redis底板 AddSignalR_RedisDock 需要在AddJwt后。在之前会导致JwtHandler失效
             services.AddSignalR_RedisDock(() => App.GetConfig<string>("SignalRRedisDock:RedisConnectionString"));
         }
         // 允许跨域