ErrorWhen Code Antis

.github/workflows/nuget-publish.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "8.0.200"
+          dotnet-version: "9.0.305"
       - name: Publish
         run: |
           version=`git describe --tags`

CoceSdk/CoceController.cs

@@ -1,14 +1,16 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using SimApi.Attributes;
-using SimApi.CoceSdk;
 using SimApi.Communications;
+using SimApi.Controllers;
 using SimApi.Helpers;
 
-namespace SimApi.Controllers;
+namespace SimApi.CoceSdk;
 
-public class SimApiCoceController(CoceApp coce,SimApiAuth auth) : SimApiBaseController
+public class CoceController(CoceApp coce, SimApiAuth auth, IServiceProvider sp) : SimApiBaseController
 {
     [HttpPost]
     public SimApiBaseResponse<ConfigResponse> GetConfig()
@@ -33,8 +35,9 @@ public class SimApiCoceController(CoceApp coce,SimApiAuth auth) : SimApiBaseCont
         {
             Id = data.UserId,
             Meta = meta,
-            Extra = groups
         };
+        var processor = sp.GetService<ICoceLoginProcessor>();
+        processor?.Process(loginItem, groups.ToArray());
         return new SimApiBaseResponse<string>(auth.Login(loginItem));
     }
 

CoceSdk/ICoceLoginProcessor.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using SimApi.Communications;
+
+namespace SimApi.CoceSdk;
+
+public interface ICoceLoginProcessor
+{
+    SimApiLoginItem Process(SimApiLoginItem loginItem, GroupInfo[] groups);
+}

Communications/SimApiBaseRequest.cs

@@ -1,13 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+namespace SimApi.Communications;
-
-namespace SimApi.Communications;
 
 /// <summary>
 /// 只有ID的请求
 /// </summary>
 public class SimApiIdOnlyRequest
 {
-    [Required] public int Id { get; set; }
+    public required int Id { get; set; }
 }
 
 /// <summary>
@@ -15,7 +13,7 @@ public class SimApiIdOnlyRequest
 /// </summary>
 public class SimApiStringIdOnlyRequest
 {
-    [Required] public string? Id { get; set; }
+    public required string Id { get; set; }
 }
 
 /// <summary>
@@ -24,7 +22,7 @@ public class SimApiStringIdOnlyRequest
 /// <typeparam name="T"></typeparam>
 public class SimApiOneFieldRequest<T>
 {
-    [Required] public T? Data { get; set; }
+    public required T Data { get; set; }
 }
 
 /// <summary>
@@ -32,6 +30,6 @@ public class SimApiOneFieldRequest<T>
 /// </summary>
 public class SimApiBasePageRequest
 {
-    [Required] public int Page { get; set; }
+    public required int Page { get; set; }
-    [Required] public int Count { get; set; }
+    public required int Count { get; set; }
 }

Communications/SimApiLoginItem.cs

@@ -7,8 +7,8 @@ namespace SimApi.Communications;
 /// </summary>
 public class SimApiLoginItem
 {
-    public string? Id { get; set; }
+    public string Id { get; set; } = null!;
-    public string[] Type { get; set; } = new[] { "user" };
+    public string[] Type { get; set; } = ["user"];
-    public Dictionary<string, string>? Meta { get; set; } = null;
+    public Dictionary<string, string> Meta { get; set; } = [];
-    public object? Extra { get; set; } = null;
+    public object? Extra { get; set; }
 };

Configurations/SimApiJobOptions.cs

@@ -0,0 +1,22 @@
+namespace SimApi.Configurations;
+
+public class SimApiJobOptions
+{
+    /// <summary>
+    /// WebUi地址,设置为null表示不启用
+    /// </summary>
+    public string? DashboardUrl { get; set; } = "/jobs";
+
+    public string DashboardAuthUser { get; set; } = "admin";
+    public string DashboardAuthPass { get; set; } = "Admin@123!";
+    public string? RedisConfiguration { get; set; }
+
+    public int? Database { get; set; } = null;
+    public SimApiJobServerConfig[] Servers { get; set; } = [new()];
+}
+
+public class SimApiJobServerConfig()
+{
+    public string[] Queues { get; set; } = ["default"];
+    public int WorkerNum { get; set; } = 50;
+}

Configurations/SimApiOptions.cs

@@ -5,11 +5,12 @@ namespace SimApi.Configurations;
 
 public class SimApiOptions
 {
+    public string? RedisConfiguration { get; set; }
+
     /// <summary>
-    /// 启用全部Cors，对于开发前后分离的时候很有用。
+    /// 是否启用后台任务系统 *基于Hangfire
-    /// default: true
     /// </summary>
-    public bool EnableCors { get; set; } = true;
+    public bool EnableJob { get; set; }
 
     /// <summary>
     /// 启用SimApiAuth，一个简单的基于Header Token的认证方式。
@@ -17,13 +18,16 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiAuth { get; set; }
 
-
     /// <summary>
     /// 是否使用CoceSdk
     /// </summary>
     public bool EnableCoceSdk { get; set; }
 
-    public CoceAppSdkOption CoceSdkOptions { get; set; } = new();
+    /// <summary>
+    /// 开启S3兼容的存储系统。
+    /// default: false
+    /// </summary>
+    public bool EnableSimApiStorage { get; set; }
 
     /// <summary>
     /// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。
@@ -31,6 +35,20 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiDoc { get; set; }
 
+    /// <summary>
+    /// 是否启用Synapse
+    /// </summary>
+    public bool EnableSynapse { get; set; }
+
+    /// <summary>
+    /// 启用全部Cors，对于开发前后分离的时候很有用。
+    /// default: true
+    /// </summary>
+    public bool EnableCors { get; set; } = true;
+
+
+    public CoceAppSdkOption CoceSdkOptions { get; set; } = new();
+
     /// <summary>
     /// 启用异常拦截,启用后，所有的异常将被通过json反馈。
     /// default: true
@@ -42,11 +60,6 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiResponseFilter { get; set; } = true;
 
-    /// <summary>
-    /// 开启S3兼容的存储系统。
-    /// default: false
-    /// </summary>
-    public bool EnableSimApiStorage { get; set; }
 
     /// <summary>
     /// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
@@ -60,17 +73,18 @@ public class SimApiOptions
     /// </summary>
     public bool EnableLowerUrl { get; set; } = true;
 
+
     /// <summary>
     /// 启用格式化的 Console Logger
     /// default: false
     /// </summary>
-    public bool EnableLogger { get; set; }
+    public bool EnableLogger { get; set; } = true;
+
 
     /// <summary>
-    /// 是否启用Synapse
+    /// 配置Job
     /// </summary>
-    public bool EnableSynapse { get; set; }
+    public SimApiJobOptions SimApiJobOptions { get; set; } = new();
-
 
     /// <summary>
     /// Swagger文档相关配置，需要启用 EnableSimApiDoc
@@ -103,4 +117,9 @@ public class SimApiOptions
     {
         options?.Invoke(SimApiStorageOptions);
     }
+
+    public void ConfigureSimApiJob(Action<SimApiJobOptions>? options = null)
+    {
+        options?.Invoke(SimApiJobOptions);
+    }
 }

Controllers/SimApiBaseController.cs

@@ -1,4 +1,5 @@
-using SimApi.Communications;
+using System.Diagnostics.CodeAnalysis;
+using SimApi.Communications;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -53,7 +54,7 @@ public class SimApiBaseController : Controller
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
     /// <param name="message">错误描述</param>
-    protected static void ErrorWhen(bool condition, int code = 400, string message = "")
+    protected static void ErrorWhen([DoesNotReturnIf(true)] bool condition, int code = 400, string message = "")
     {
         if (condition)
         {
@@ -68,7 +69,7 @@ public class SimApiBaseController : Controller
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
     /// <param name="message">错误描述</param>
-    protected static void ErrorWhenTrue(bool condition, int code = 400, string message = "")
+    protected static void ErrorWhenTrue([DoesNotReturnIf(true)] bool condition, int code = 400, string message = "")
     {
         ErrorWhen(condition, code, message);
     }
@@ -80,7 +81,7 @@ public class SimApiBaseController : Controller
     /// <param name="condition"></param>
     /// <param name="code"></param>
     /// <param name="message"></param>
-    protected static void ErrorWhenFalse(bool condition, int code = 400, string message = "")
+    protected static void ErrorWhenFalse([DoesNotReturnIf(false)] bool condition, int code = 400, string message = "")
     {
         ErrorWhen(!condition, code, message);
     }
@@ -91,7 +92,7 @@ public class SimApiBaseController : Controller
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
     /// <param name="message">错误描述</param>
-    protected static void ErrorWhenNull(object? condition, int code = 404, string message = "请求的资源不存在")
+    protected static void ErrorWhenNull([NotNull] object? condition, int code = 404, string message = "请求的资源不存在")
     {
         ErrorWhen(condition == null, code, message);
     }

Helpers/SimApiAuth.cs

@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.Extensions.Caching.Distributed;
 using SimApi.Communications;
@@ -25,6 +23,18 @@ public class SimApiAuth(IDistributedCache cache)
         return token;
     }
 
+    /// <summary>
+    /// 更新登陆信息
+    /// </summary>
+    /// <param name="loginItem"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public string Update(SimApiLoginItem loginItem, string token)
+    {
+        cache.SetString(token, JsonSerializer.Serialize(loginItem));
+        return token;
+    }
+
     /// <summary>
     /// 获取登陆信息
     /// </summary>
@@ -33,7 +43,7 @@ public class SimApiAuth(IDistributedCache cache)
     public SimApiLoginItem? GetLogin(string token)
     {
         var login = cache.GetString(token);
-        return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : default;
+        return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : null;
     }
 
     /// <summary>

Helpers/SimApiCache.cs

@@ -0,0 +1,32 @@
+using System.Text.Json;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace SimApi.Helpers;
+
+public class SimApiCache(IDistributedCache cache)
+{
+    private const string Prefix = "SimApi:Cache:";
+
+    public void Set(string key, object value, DistributedCacheEntryOptions? options = null)
+    {
+        if (options is not null)
+        {
+            cache.SetString(Prefix + key, SimApiUtil.Json(value), options);
+        }
+        else
+        {
+            cache.SetString(Prefix + key, SimApiUtil.Json(value));
+        }
+    }
+
+    public string? Get(string key)
+    {
+        return cache.GetString(Prefix + key);
+    }
+
+    public T? Get<T>(string key)
+    {
+        var data = cache.GetString(Prefix + key);
+        return data == null ? default : JsonSerializer.Deserialize<T>(data);
+    }
+}

Helpers/SimApiJobWebAuth.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Linq;
+using System.Text;
+using Hangfire.Dashboard;
+using Microsoft.AspNetCore.Http;
+
+namespace SimApi.Helpers;
+
+public class SimApiJobWebAuth(string user, string pass) : IDashboardAuthorizationFilter
+{
+    public bool Authorize(DashboardContext context)
+    {
+        var httpContext = context.GetHttpContext();
+        var authHeader = httpContext.Request.Headers["Authorization"].FirstOrDefault();
+        if (authHeader != null && authHeader.StartsWith("Basic "))
+        {
+            var encodedUsernamePassword = authHeader.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries)[1].Trim();
+            var decodedUsernamePassword = Encoding.UTF8.GetString(Convert.FromBase64String(encodedUsernamePassword));
+            var username = decodedUsernamePassword.Split(':', 2)[0];
+            var password = decodedUsernamePassword.Split(':', 2)[1];
+
+            if (username == user && password == pass)
+            {
+                return true;
+            }
+        }
+
+        httpContext.Response.StatusCode = 401;
+        httpContext.Response.Headers.WWWAuthenticate = "Basic realm=\"SimApiBasicAuth\"";
+        httpContext.Response.WriteAsync("").Wait();
+        return false;
+    }
+}

Helpers/SimApiUtil.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
@@ -7,6 +8,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Text.Unicode;
+using System.Xml.Serialization;
 
 namespace SimApi.Helpers;
 
@@ -22,9 +24,10 @@ public static class SimApiUtil
     /// </summary>
     public static JsonSerializerOptions JsonOption => new()
     {
+        // ReferenceHandler = ReferenceHandler.Preserve,
         Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        // DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
     };
 
     /// <summary>
@@ -62,12 +65,43 @@ public static class SimApiUtil
         return stringBuilder.ToString();
     }
 
+    /// <summary>
+    /// sha1加密字符串
+    /// </summary>
+    /// <param name="source">源字符串</param>
+    /// <param name="mode">加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位</param>
+    /// <returns></returns>
+    public static string Sha1(string source, string mode = "x2")
+    {
+        var hash = SHA1.HashData(Encoding.UTF8.GetBytes(source));
+        var sb = new StringBuilder(hash.Length * 2);
+        foreach (var b in hash)
+        {
+            sb.Append(b.ToString(mode));
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// 将XML字符串序列化为对象
+    /// </summary>
+    /// <param name="source"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static T XmlDeserialize<T>(string source)
+    {
+        var xmlConvertor = new XmlSerializer(typeof(T));
+        using var reader = new StringReader(source);
+        return (T)xmlConvertor.Deserialize(reader)!;
+    }
+
     /// <summary>
     /// 将对象序列化成JSON （控制台输出中文不会被编码）
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
-    public static string Json(object obj)
+    public static string Json(object? obj)
     {
         return JsonSerializer.Serialize(obj, JsonOption);
     }

SimApi.csproj

@@ -14,8 +14,8 @@
         <SynchReleaseVersion>false</SynchReleaseVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageVersion>5.0.2</PackageVersion>
-        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,10 +23,15 @@
         <Folder Include="Exceptions\"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Minio" Version="6.0.3" />
+        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
-        <PackageReference Include="MQTTnet" Version="4.3.6.1152" />
+        <PackageReference Include="Hangfire.Console" Version="1.4.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.7.1" />
+        <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.1" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.5" />
+        <PackageReference Include="Minio" Version="6.0.4" />
+        <PackageReference Include="MQTTnet" Version="5.0.1.1416" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
+        <PackageReference Include="System.Text.Json" Version="9.0.10" />
     </ItemGroup>
     <ProjectExtensions>
         <MonoDevelop>

SimApiExtensions.cs

@@ -3,6 +3,9 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
+using Hangfire;
+using Hangfire.Console;
+using Hangfire.Redis.StackExchange;
 using SimApi.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
@@ -29,6 +32,12 @@ public static class SimApiExtensions
     {
         var simApiOptions = new SimApiOptions();
         options?.Invoke(simApiOptions);
+        if (simApiOptions.RedisConfiguration != null)
+        {
+            builder.AddStackExchangeRedisCache(x => x.Configuration = simApiOptions.RedisConfiguration);
+            builder.AddSingleton<SimApiCache>();
+        }
+
         if (simApiOptions.EnableLogger)
         {
             builder.AddLogging(logger =>
@@ -49,6 +58,30 @@ public static class SimApiExtensions
             builder.AddSingleton<CoceApp>();
         }
 
+        if (simApiOptions.EnableJob)
+        {
+            builder.AddHangfire(x =>
+            {
+                var redisOption = new RedisStorageOptions();
+                if (simApiOptions.SimApiJobOptions.Database.HasValue)
+                {
+                    redisOption.Db = simApiOptions.SimApiJobOptions.Database.Value;
+                }
+
+                x.UseRedisStorage(simApiOptions.SimApiJobOptions.RedisConfiguration ??
+                                  simApiOptions.RedisConfiguration, redisOption);
+                x.UseConsole();
+            });
+            foreach (var server in simApiOptions.SimApiJobOptions.Servers)
+            {
+                builder.AddHangfireServer(hfs =>
+                {
+                    hfs.Queues = server.Queues;
+                    hfs.WorkerCount = server.WorkerNum;
+                });
+            }
+        }
+
         if (simApiOptions.EnableCors)
         {
             builder.AddCors(cors => cors.AddPolicy("any",
@@ -213,7 +246,11 @@ public static class SimApiExtensions
         if (simApiOptions.EnableSimApiResponseFilter)
         {
             builder.AddControllers(opt => opt.Filters.Add<SimApiResponseFilter>())
-                .AddJsonOptions(opt => opt.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase);
+                .AddXmlSerializerFormatters()
+                .AddJsonOptions(opt =>
+                {
+                    opt.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+                });
         }
 
         builder.AddSingleton(simApiOptions);
@@ -228,6 +265,11 @@ public static class SimApiExtensions
 
         logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
 
+        if (options.RedisConfiguration != null)
+        {
+            logger.LogInformation("开始配置 RedisCache ...");
+        }
+
         //请求一下检测存储错误
         if (options.EnableSimApiStorage)
         {
@@ -235,11 +277,6 @@ public static class SimApiExtensions
             builder.Services.GetService<SimApiStorage>();
         }
 
-        if (options.EnableSimApiResponseFilter)
-        {
-            logger.LogInformation("开始配置SimApiResponseFilter...");
-        }
-
         if (options.EnableCoceSdk)
         {
             logger.LogInformation("开始配置CoceAppSdk...\nApi入口: {ApiUrl}\nAuth入口:{AuthUrl}n\nAppId: {AppId}",
@@ -247,17 +284,17 @@ public static class SimApiExtensions
                 options.CoceSdkOptions.AppId);
         }
 
-        if (options.EnableLowerUrl)
-        {
-            logger.LogInformation("开始配置使用URL小写...");
-        }
-
         if (options.EnableSynapse)
         {
             var synapse = builder.Services.GetRequiredService<Synapse>();
             synapse.Init();
         }
 
+        if (options.EnableJob)
+        {
+            logger.LogInformation("开始配置 SimApiJob ...");
+        }
+
         return builder;
     }
 
@@ -269,10 +306,8 @@ public static class SimApiExtensions
     public static WebApplication UseSimApi(this WebApplication builder)
     {
         var options = builder.Services.GetRequiredService<SimApiOptions>();
-
         var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
-
+        UseSimApi((IHost)builder);
-        logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
         if (options.EnableForwardHeaders)
         {
             logger.LogInformation("开始配置ForwardedHeaders...");
@@ -285,27 +320,57 @@ public static class SimApiExtensions
             builder.UseCors("any");
         }
 
+        if (options.EnableSimApiResponseFilter)
+        {
+            logger.LogInformation("开始配置SimApiResponseFilter...");
+            builder.MapControllers();
+        }
+
         if (options.EnableSimApiAuth)
         {
             logger.LogInformation("开始配置SimApiAuth...");
             builder.UseMiddleware<SimApiAuthMiddleware>();
             builder.MapControllerRoute(name: "GetUserInfo", pattern: "/user/info",
-                defaults: new { controller = "SimApiCommon", action = "UserInfo" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "UserInfo"
+                });
             builder.MapControllerRoute(name: "CheckLogin", pattern: "/auth/check",
-                defaults: new { controller = "SimApiCommon", action = "CheckLogin" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "CheckLogin"
+                });
             builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout",
-                defaults: new { controller = "SimApiCommon", action = "Logout" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "Logout"
+                });
             if (options.EnableCoceSdk)
             {
                 logger.LogInformation("开始配置CoceAppSdk...\nApi入口: {ApiUrl}\nAuth入口:{AuthUrl}n\nAppId: {AppId}",
                     options.CoceSdkOptions.ApiEndpoint, options.CoceSdkOptions.AuthEndpoint,
                     options.CoceSdkOptions.AppId);
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/login",
-                    defaults: new { controller = "SimApiCoce", action = "Login" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "Login"
+                    });
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/user/groups",
-                    defaults: new { controller = "SimApiCoce", action = "ListGroups" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "ListGroups"
+                    });
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/config",
-                    defaults: new { controller = "SimApiCoce", action = "GetConfig" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "GetConfig"
+                    });
             }
         }
 
@@ -333,22 +398,22 @@ public static class SimApiExtensions
             builder.UseMiddleware<SimApiExceptionMiddleware>();
         }
 
-        //请求一下检测存储错误
-        if (options.EnableSimApiStorage)
-        {
-            logger.LogInformation("开始配置SimApiStorage...");
-            builder.Services.GetService<SimApiStorage>();
-        }
-
         if (options.EnableLowerUrl)
         {
             logger.LogInformation("开始配置使用URL小写...");
         }
 
-        if (options.EnableSynapse)
+        if (options is { EnableJob: true, SimApiJobOptions.DashboardUrl: not null })
         {
-            var synapse = builder.Services.GetRequiredService<Synapse>();
+            logger.LogInformation("开始配置 SimApiJob Web控制台...");
-            synapse.Init();
+            builder.UseHangfireDashboard(options.SimApiJobOptions.DashboardUrl, new DashboardOptions
+            {
+                Authorization =
+                [
+                    new SimApiJobWebAuth(options.SimApiJobOptions.DashboardAuthUser,
+                        options.SimApiJobOptions.DashboardAuthPass)
+                ]
+            });
         }
 
         return builder;

Synapse/EventServer.cs

@@ -19,39 +19,42 @@ public partial class Synapse
     {
         Client!.ApplicationMessageReceivedAsync += async e =>
         {
-            if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return;
+            await Task.Run(async () =>
-            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
+            {
-            var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty);
+                if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return;
-            logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
+                var reqBody = e.ApplicationMessage.ConvertPayloadToString();
-            var methods = EventRegistry
+                var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty);
-                .Where(x => Regex.IsMatch(eventName,
+                logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
-                    "^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
+                var methods = EventRegistry
-                .ToArray();
+                    .Where(x => Regex.IsMatch(eventName,
-            var tasks = methods.Select(method => Task.Run(() =>
+                        "^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
-                {
+                    .ToArray();
-                    var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+                var tasks = methods.Select(method => Task.Run(() =>
-                    var mt = callClass.GetType().GetMethod(method.Method!);
-                    try
                     {
-                        if (mt!.GetParameters().Length == 2)
+                        var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+                        var mt = callClass.GetType().GetMethod(method.Method!);
+                        try
                         {
-                            var pt = mt.GetParameters()[1].ParameterType;
+                            if (mt!.GetParameters().Length == 2)
-                            mt.Invoke(callClass, pt == typeof(string)
+                            {
-                                ? new object?[] { eventName, reqBody }
+                                var pt = mt.GetParameters()[1].ParameterType;
-                                : new object?[] { eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) });
+                                mt.Invoke(callClass, pt == typeof(string)
+                                    ? [eventName, reqBody]
+                                    : [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
+                            }
+                            else
+                            {
+                                mt.Invoke(callClass, new object[] { eventName });
+                            }
                         }
-                        else
+                        catch (Exception ex)
                         {
-                            mt.Invoke(callClass, new object[] { eventName });
+                            logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message, ex.StackTrace);
                         }
-                    }
+                    }))
-                    catch (Exception ex)
+                    .ToList();
-                    {
+                await Task.WhenAll(tasks);
-                        logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message, ex.StackTrace);
+            });
-                    }
-                }))
-                .ToList();
-            await Task.WhenAll(tasks);
         };
         SubEventServerTopic();
     }

Synapse/RpcClient.cs

@@ -1,20 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using MQTTnet;
-using MQTTnet.Packets;
 using SimApi.Communications;
 using SimApi.Helpers;
+using System.Collections.Concurrent;
 
 namespace SimApi;
 
 public partial class Synapse
 {
-    private Dictionary<string, TaskCompletionSource<string>> ResponseCompletionSources { get; } = new();
+    private ConcurrentDictionary<string, TaskCompletionSource<string>> ResponseCompletionSources { get; } = new();
 
     private string EventClientTopicPrefix => $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
 
@@ -27,7 +26,7 @@ public partial class Synapse
             var messageId = e.ApplicationMessage.Topic.Replace(EventClientTopicPrefix, string.Empty);
             if (!ResponseCompletionSources.TryGetValue(messageId, out var tcs)) return Task.CompletedTask;
             tcs.SetResult(reqBody);
-            ResponseCompletionSources.Remove(messageId);
+            ResponseCompletionSources.Remove(messageId, out _);
             return Task.CompletedTask;
         };
         SubRpcClientTopic();
@@ -43,6 +42,7 @@ public partial class Synapse
     private string? FireRpc(string app, string action, object? param, Dictionary<string, string>? headers = null,
         int? timeout = null)
     {
+        // 移除锁语句
         string paramJson;
         if (param is string strParam)
         {
@@ -56,7 +56,7 @@ public partial class Synapse
         var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
         var messageId = Guid.NewGuid().ToString();
         var tcs = new TaskCompletionSource<string>();
-        ResponseCompletionSources.Add(messageId, tcs);
+        ResponseCompletionSources.TryAdd(messageId, tcs);
         var messageBuilder = new MqttApplicationMessageBuilder()
             .WithTopic(topic)
             .WithPayload(paramJson)

Synapse/RpcServer.cs

@@ -20,91 +20,95 @@ public partial class Synapse
 
     private void RunRpcServer()
     {
-        Client!.ApplicationMessageReceivedAsync += e =>
+        Client!.ApplicationMessageReceivedAsync += async e =>
         {
-            if (!e.ApplicationMessage.Topic.StartsWith(RpcServerTopicPrefix)) return Task.CompletedTask;
+            await Task.Run(() =>
-            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
-            var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, string.Empty);
-            var appInfo = e.ApplicationMessage.ResponseTopic.Split(",");
-            logger.LogDebug(
-                "Synapse RPC Server Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
-                appInfo[2], appInfo[0], action, Options.AppName, reqBody);
-            SimApiBaseResponse res;
-            var method = RpcRegistry.FirstOrDefault(x => x.Key == action);
-            if (method == null)
             {
-                res = new SimApiBaseResponse(404, "method not found");
+                if (!e.ApplicationMessage.Topic.StartsWith(RpcServerTopicPrefix)) return;
-            }
+                var reqBody = e.ApplicationMessage.ConvertPayloadToString();
-            else
+                var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, string.Empty);
-            {
+                var appInfo = e.ApplicationMessage.ResponseTopic.Split(",");
-                var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+                logger.LogDebug(
-                var mt = callClass.GetType().GetMethod(method.Method!);
+                    "Synapse RPC Server Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
-                try
+                    appInfo[2], appInfo[0], action, Options.AppName, reqBody);
+                SimApiBaseResponse res;
+                var method = RpcRegistry.FirstOrDefault(x => x.Key == action);
+                if (method == null)
                 {
-                    var methodParams = mt!.GetParameters();
+                    res = new SimApiBaseResponse(404, "method not found");
-                    object? ret;
-                    switch (methodParams.Length)
-                    {
-                        case 1:
-                            var pt = mt.GetParameters()[0].ParameterType;
-                            var param = pt == typeof(string)
-                                ? [reqBody]
-                                : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
-                            ret = mt.Invoke(callClass, param);
-                            break;
-                        case 2:
-                            var headerData =
-                                e.ApplicationMessage.UserProperties.ToDictionary(x => x.Name, x => x.Value);
-                            var pt2 = mt.GetParameters()[0].ParameterType;
-                            var param2 = pt2 == typeof(string)
-                                ? [reqBody]
-                                : new[] { JsonSerializer.Deserialize(reqBody, pt2, SimApiUtil.JsonOption), headerData };
-                            ret = mt.Invoke(callClass, param2);
-                            break;
-                        default:
-                            ret = mt.Invoke(callClass, []);
-                            break;
-                    }
-
-                    res = new SimApiBaseResponse<object?>
-                    {
-                        Data = ret
-                    };
                 }
-                catch (TargetInvocationException ex)
+                else
                 {
-                    if (ex.InnerException is SimApiException ie)
+                    var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+                    var mt = callClass.GetType().GetMethod(method.Method!);
+                    try
                     {
-                        logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message);
+                        var methodParams = mt!.GetParameters();
-                        res = new SimApiBaseResponse(ie.Code, ie.Message);
+                        object? ret;
+                        switch (methodParams.Length)
+                        {
+                            case 1:
+                                var pt = mt.GetParameters()[0].ParameterType;
+                                var param = pt == typeof(string)
+                                    ? [reqBody]
+                                    : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
+                                ret = mt.Invoke(callClass, param);
+                                break;
+                            case 2:
+                                var headerData =
+                                    e.ApplicationMessage.UserProperties.ToDictionary(x => x.Name, x => x.Value);
+                                var pt2 = mt.GetParameters()[0].ParameterType;
+                                var param2 = pt2 == typeof(string)
+                                    ? [reqBody]
+                                    : new[]
+                                    {
+                                        JsonSerializer.Deserialize(reqBody, pt2, SimApiUtil.JsonOption), headerData
+                                    };
+                                ret = mt.Invoke(callClass, param2);
+                                break;
+                            default:
+                                ret = mt.Invoke(callClass, []);
+                                break;
+                        }
+
+                        res = new SimApiBaseResponse<object?>
+                        {
+                            Data = ret
+                        };
                     }
-                    else
+                    catch (TargetInvocationException ex)
                     {
-                        logger.LogError("Synapse RPC 方法异常: {Err}\n{Stack}", ex.Message, ex.StackTrace);
+                        if (ex.InnerException is SimApiException ie)
+                        {
+                            logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message);
+                            res = new SimApiBaseResponse(ie.Code, ie.Message);
+                        }
+                        else
+                        {
+                            logger.LogError("Synapse RPC 方法异常: {Err}\n{Stack}", ex.Message, ex.StackTrace);
+                            res = new SimApiBaseResponse(500, ex.Message);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogDebug("Synapse RPC调用失败: {Err}", ex.Message);
                         res = new SimApiBaseResponse(500, ex.Message);
                     }
                 }
-                catch (Exception ex)
-                {
-                    logger.LogDebug("Synapse RPC调用失败: {Err}", ex.Message);
-                    res = new SimApiBaseResponse(500, ex.Message);
-                }
-            }
 
-            var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
+                var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
-            var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{appInfo[2]}";
+                var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{appInfo[2]}";
-            var message = new MqttApplicationMessageBuilder()
+                var message = new MqttApplicationMessageBuilder()
-                .WithTopic(reply)
+                    .WithTopic(reply)
-                .WithPayload(returnJson)
+                    .WithPayload(returnJson)
-                .WithRetainFlag(false)
+                    .WithRetainFlag(false)
-                .Build();
+                    .Build();
-            if (!Client.IsConnected) return Task.CompletedTask;
+                if (!Client.IsConnected) return;
-            Client.PublishAsync(message, CancellationToken.None).Wait();
+                Client.PublishAsync(message, CancellationToken.None).Wait();
-            logger.LogDebug(
+                logger.LogDebug(
-                "Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
+                    "Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
-                appInfo[2], action, Options.AppName, appInfo[0], returnJson);
+                    appInfo[2], action, Options.AppName, appInfo[0], returnJson);
-
+            });
-            return Task.CompletedTask;
         };
         SubRpcServerTopic();
     }

Synapse/Synapse.cs

@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using MQTTnet;
-using MQTTnet.Client;
 using MQTTnet.Formatter;
 using SimApi.Attributes;
 using SimApi.Communications;
@@ -22,7 +21,7 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
 {
     private SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;
 
-    private MqttFactory MqttFactory { get; } = new();
+    private MqttClientFactory MqttFactory { get; } = new();
     public IMqttClient? Client { get; set; }
 
     private List<RegisterItem> EventRegistry { get; set; } = new();